OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Aug-2003 23:05:50
Branch: HEAD Handle: 2003083122055000
Modified files:
openpkg-src/openpkg rpm.patch.porting
Log:
adjust fts.c/rpmrpc.c patches for other BSDs
Summary:
Revision Changes Path
1.13 +4 -4 openpkg-src/openpkg/rpm.patch.porting
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.12 -r1.13 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 28 Aug 2003 08:21:45 -0000 1.12
+++ openpkg-src/openpkg/rpm.patch.porting 31 Aug 2003 21:05:50 -0000 1.13
@@ -356,7 +356,7 @@
# define _STAT_VER 0
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
+#endif
-+#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+# define __errno_location() (&errno)
+# define stat64 stat
+# define _STAT_VER 0
@@ -396,7 +396,7 @@
return rc;
}
-+#if !defined(__FreeBSD__) && !defined(sun)
++#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) &&
!defined(__OpenBSD__)
+
struct __dirstream {
int fd; /* File descriptor. */
@@ -435,7 +435,7 @@
/[EMAIL PROTECTED]@*/
static int ftpmagicdir = 0x8440291;
-#define ISFTPMAGIC(_dir) (!memcmp((_dir), &ftpmagicdir, sizeof(ftpmagicdir)))
-+#if !defined(__FreeBSD__) && !defined(sun)
++#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) &&
!defined(__OpenBSD__)
+#define SETFTPMAGIC(_dir) ((_dir)->fd) = ftpmagicdir
+#define ISFTPMAGIC(_dir) ((_dir)->fd == ftpmagicdir)
+#else
@@ -581,7 +581,7 @@
mydir->offset = i;
-+#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ dp->d_ino = i + 1;
+ dp->d_reclen = 0;
+ dp->d_type = av[i].type;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
