diff options
| author | adam <adam@pkgsrc.org> | 2004-04-14 20:53:08 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2004-04-14 20:53:08 +0000 |
| commit | 6d7cff4796679ae3dbb8da219aa98d4a28a983b6 (patch) | |
| tree | 06ff79abba2c2ab0ededd3e8ae91d27f797c53a7 /sysutils | |
| parent | ef30871836a440827ea49ccf1ad64a9311422e11 (diff) | |
| download | pkgsrc-6d7cff4796679ae3dbb8da219aa98d4a28a983b6.tar.gz | |
Fixed build problems on Darwin
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/fam/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/fam/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-ak | 15 | ||||
| -rw-r--r-- | sysutils/fam/patches/patch-ap | 8 |
4 files changed, 25 insertions, 7 deletions
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile index c273eefcb35..01578d93911 100644 --- a/sysutils/fam/Makefile +++ b/sysutils/fam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/04/04 09:24:58 recht Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/14 20:53:08 adam Exp $ # DISTNAME= fam-2.7.0 @@ -19,8 +19,8 @@ USE_LIBTOOL= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_LANGUAGES= c c++ - CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -DNDEBUG" EGDIR= ${PREFIX}/share/examples/fam CONF_FILES= ${EGDIR}/fam.conf ${PKG_SYSCONFDIR}/fam.conf diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo index e5919b07f6f..00c443de574 100644 --- a/sysutils/fam/distinfo +++ b/sysutils/fam/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2004/03/29 15:39:11 minskim Exp $ +$NetBSD: distinfo,v 1.11 2004/04/14 20:53:08 adam Exp $ SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8 Size (fam-2.7.0.tar.gz) = 301974 bytes @@ -12,7 +12,8 @@ SHA1 (patch-ag) = fa5889ad6d93af72d7efe83784caf61b2ac39d6a SHA1 (patch-ah) = d7763198df76d1f0783342a8961b59879e8e1241 SHA1 (patch-ai) = b80aafbb3849fc8c828b6829d8975b910e4d0fd5 SHA1 (patch-aj) = 7aa752e629ad32925ec58cbe1532e8c9bd454a24 +SHA1 (patch-ak) = 48ddfcf9b7562832402a464437ca485249d371a1 SHA1 (patch-ao) = 64827309bf91a2018629e28fef20109dde3fbf01 -SHA1 (patch-ap) = b8084876217ca0b8510175ca753a6bbe9378438e +SHA1 (patch-ap) = 256910675fad9922c0bca47c5b080eb96b51fe1d SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b SHA1 (patch-ax) = 7bb6bd577377c22138d887e1568328a231f04c57 diff --git a/sysutils/fam/patches/patch-ak b/sysutils/fam/patches/patch-ak new file mode 100644 index 00000000000..6b19173096f --- /dev/null +++ b/sysutils/fam/patches/patch-ak @@ -0,0 +1,15 @@ +$NetBSD: patch-ak,v 1.5 2004/04/14 20:53:08 adam Exp $ + +--- src/Log.c++.orig Wed Apr 14 22:44:49 2004 ++++ src/Log.c++ +@@ -28,9 +28,9 @@ + #include <stdlib.h> + #include <string.h> + #include <syslog.h> ++#include <sys/time.h> + #include <sys/resource.h> + #include <sys/stat.h> +-#include <sys/time.h> + #include <sys/types.h> + #include <unistd.h> + #ifdef HAVE_AUDIT diff --git a/sysutils/fam/patches/patch-ap b/sysutils/fam/patches/patch-ap index cae3260914e..ad67ae1fa2b 100644 --- a/sysutils/fam/patches/patch-ap +++ b/sysutils/fam/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.3 2004/03/28 22:00:05 minskim Exp $ +$NetBSD: patch-ap,v 1.4 2004/04/14 20:53:08 adam Exp $ ---- src/mntent_compat.c++.orig Sun May 12 19:37:49 2002 +--- src/mntent_compat.c++.orig Wed Apr 14 22:41:20 2004 +++ src/mntent_compat.c++ -@@ -0,0 +1,174 @@ +@@ -0,0 +1,176 @@ +/* + * Copyright (c) 1980, 1989, 1993, 1994 + * The Regents of the University of California. All rights reserved. @@ -106,7 +106,9 @@ $NetBSD: patch-ap,v 1.3 2004/03/28 22:00:05 minskim Exp $ + if (flags & MNT_NODEV) res = catopt(res, "nodev"); + if (flags & MNT_UNION) res = catopt(res, "union"); + if (flags & MNT_ASYNC) res = catopt(res, "async"); ++#ifdef MNT_NOATIME + if (flags & MNT_NOATIME) res = catopt(res, "noatime"); ++#endif +#ifdef MNT_NOCLUSTERR + if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr"); +#endif |