RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   25-Jul-2007 18:48:08
  Branch: HEAD                             Handle: 2007072517480700

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               fts.c rpmdav.c rpmdav.h

  Log:
    Port RPM 5 to DragonFly BSD 1.8.1 (a FreeBSD 4 derivative BSD).

  Summary:
    Revision    Changes     Path
    1.1520      +1  -0      rpm/CHANGES
    1.21        +1  -1      rpm/rpmio/fts.c
    2.43        +3  -1      rpm/rpmio/rpmdav.c
    2.17        +1  -1      rpm/rpmio/rpmdav.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.1519 -r1.1520 CHANGES
  --- rpm/CHANGES	25 Jul 2007 16:46:15 -0000	1.1519
  +++ rpm/CHANGES	25 Jul 2007 16:48:07 -0000	1.1520
  @@ -1,4 +1,5 @@
   4.5 -> 5.0:
  +    - rse: ported to DragonFly BSD (1.8.1)
       - rse: add the necessary Autoconf glue for using the ancient (and nowadays resurrected by POSIX) insque(3)
       - rse: ported to IBM AIX (5.3)
       - rse: ported to Mac OS X (10.4), aka Darwin (8.10)
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/fts.c
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 fts.c
  --- rpm/rpmio/fts.c	25 Jul 2007 06:04:12 -0000	1.20
  +++ rpm/rpmio/fts.c	25 Jul 2007 16:48:07 -0000	1.21
  @@ -66,7 +66,7 @@
   #   define _STAT_VER		0
   #   define __fxstat64(_stat_ver, _fd, _sbp)	fstat((_fd), (_sbp))
   #endif
  -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
  +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
   #   define __errno_location()  (&errno)
   #   define stat64              stat
   #   define __fxstat64(_stat_ver, _fd, _sbp)    fstat((_fd), (_sbp))
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.c
  ============================================================================
  $ cvs diff -u -r2.42 -r2.43 rpmdav.c
  --- rpm/rpmio/rpmdav.c	25 Jul 2007 05:50:01 -0000	2.42
  +++ rpm/rpmio/rpmdav.c	25 Jul 2007 16:48:07 -0000	2.43
  @@ -1608,10 +1608,12 @@
       /* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */
   /*@-type@*/
       dp->d_ino = i + 1;		/* W2DO? */
  +#if !defined(__DragonFly__)
       dp->d_reclen = 0;		/* W2DO? */
  +#endif
   
   #if !(defined(hpux) || defined(__hpux) || defined(sun) || defined(RPM_OS_AIX))
  -#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) && !defined(__FreeBSD__) && !defined(__NetBSD__)
  +#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
       dp->d_off = 0;		/* W2DO? */
   #endif
   /*@-boundsread@*/
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmdav.h
  ============================================================================
  $ cvs diff -u -r2.16 -r2.17 rpmdav.h
  --- rpm/rpmio/rpmdav.h	25 Jul 2007 16:41:29 -0000	2.16
  +++ rpm/rpmio/rpmdav.h	25 Jul 2007 16:48:07 -0000	2.17
  @@ -32,7 +32,7 @@
   typedef struct __dirstream *	AVDIR;
   typedef struct __dirstream *	DAVDIR;
   #else
  -# if defined(__FreeBSD__) || defined(__NetBSD__)
  +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
   typedef struct __dirstream *	AVDIR;
   typedef struct __dirstream *	DAVDIR;
   #else	/* __FreeBSD__ */
  @@ .