From bce5584e4cde120d49f688782f155f8fe1db39e4 Mon Sep 17 00:00:00 2001 From: dougb Date: Thu, 28 Feb 2002 05:31:24 +0000 Subject: Small tuneups: * Make patching silent, like standard ports * Use MANPREFIX for man pages * Add a patch to specify the right arguments to getgrouplist, by __FreeBSD_version --- dns/bind8/Makefile | 4 ++-- dns/bind8/files/patch-aa | 2 +- .../files/patch-port_freebsd_include_port_before.h | 25 ++++++++++++++++++++++ net/bind8/Makefile | 4 ++-- net/bind8/files/patch-aa | 2 +- .../files/patch-port_freebsd_include_port_before.h | 25 ++++++++++++++++++++++ 6 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 dns/bind8/files/patch-port_freebsd_include_port_before.h create mode 100644 net/bind8/files/patch-port_freebsd_include_port_before.h diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile index 5fa4246..6ab1075 100644 --- a/dns/bind8/Makefile +++ b/dns/bind8/Makefile @@ -33,8 +33,8 @@ MAN7= hostname.7 mailaddr.7 MAN8= named-bootconf.8 named-xfer.8 named.8 ndc.8 nslookup.8 \ nsupdate.8 -PATCH_ARGS= -d ${WRKDIR} -PATCH_DIST_ARGS= -d ${WRKDIR} +PATCH_ARGS= -s -d ${WRKDIR} +PATCH_DIST_ARGS= -s -d ${WRKDIR} post-install: .if !defined(NOPORTDOCS) diff --git a/dns/bind8/files/patch-aa b/dns/bind8/files/patch-aa index d4af4cb..7ed25b1 100644 --- a/dns/bind8/files/patch-aa +++ b/dns/bind8/files/patch-aa @@ -13,7 +13,7 @@ +'DESTBIN=${PREFIX}/bin' +'DESTSBIN=${PREFIX}/sbin' +'DESTEXEC=${PREFIX}/libexec' -+'DESTMAN=${PREFIX}/man' ++'DESTMAN=${MANPREFIX}/man' +'DESTHELP=${PREFIX}/share/misc' +'DESTETC=${PREFIX}/etc' 'DESTRUN=/var/run' diff --git a/dns/bind8/files/patch-port_freebsd_include_port_before.h b/dns/bind8/files/patch-port_freebsd_include_port_before.h new file mode 100644 index 0000000..59b9eac --- /dev/null +++ b/dns/bind8/files/patch-port_freebsd_include_port_before.h @@ -0,0 +1,25 @@ +--- src/port/freebsd/include/port_before.h.orig Wed Oct 31 23:29:21 2001 ++++ src/port/freebsd/include/port_before.h Tue Feb 26 21:50:52 2002 +@@ -15,6 +15,7 @@ + #define SETPWENT_VOID + #endif + ++#include + #include + + #define GROUP_R_RETURN struct group * +@@ -26,8 +27,14 @@ + #define GROUP_R_ENT_ARGS void + #define GROUP_R_OK gptr + #define GROUP_R_BAD NULL ++ ++#if defined(__FreeBSD_version) && __FreeBSD_version >= 500030 ++#define GETGROUPLIST_ARGS const char *name, gid_t basegid, gid_t *groups, \ ++ int *ngroups ++#else + #define GETGROUPLIST_ARGS const char *name, int basegid, int *groups, \ + int *ngroups ++#endif + + #define HOST_R_RETURN struct hostent * + #define HOST_R_SET_RETURN void diff --git a/net/bind8/Makefile b/net/bind8/Makefile index 5fa4246..6ab1075 100644 --- a/net/bind8/Makefile +++ b/net/bind8/Makefile @@ -33,8 +33,8 @@ MAN7= hostname.7 mailaddr.7 MAN8= named-bootconf.8 named-xfer.8 named.8 ndc.8 nslookup.8 \ nsupdate.8 -PATCH_ARGS= -d ${WRKDIR} -PATCH_DIST_ARGS= -d ${WRKDIR} +PATCH_ARGS= -s -d ${WRKDIR} +PATCH_DIST_ARGS= -s -d ${WRKDIR} post-install: .if !defined(NOPORTDOCS) diff --git a/net/bind8/files/patch-aa b/net/bind8/files/patch-aa index d4af4cb..7ed25b1 100644 --- a/net/bind8/files/patch-aa +++ b/net/bind8/files/patch-aa @@ -13,7 +13,7 @@ +'DESTBIN=${PREFIX}/bin' +'DESTSBIN=${PREFIX}/sbin' +'DESTEXEC=${PREFIX}/libexec' -+'DESTMAN=${PREFIX}/man' ++'DESTMAN=${MANPREFIX}/man' +'DESTHELP=${PREFIX}/share/misc' +'DESTETC=${PREFIX}/etc' 'DESTRUN=/var/run' diff --git a/net/bind8/files/patch-port_freebsd_include_port_before.h b/net/bind8/files/patch-port_freebsd_include_port_before.h new file mode 100644 index 0000000..59b9eac --- /dev/null +++ b/net/bind8/files/patch-port_freebsd_include_port_before.h @@ -0,0 +1,25 @@ +--- src/port/freebsd/include/port_before.h.orig Wed Oct 31 23:29:21 2001 ++++ src/port/freebsd/include/port_before.h Tue Feb 26 21:50:52 2002 +@@ -15,6 +15,7 @@ + #define SETPWENT_VOID + #endif + ++#include + #include + + #define GROUP_R_RETURN struct group * +@@ -26,8 +27,14 @@ + #define GROUP_R_ENT_ARGS void + #define GROUP_R_OK gptr + #define GROUP_R_BAD NULL ++ ++#if defined(__FreeBSD_version) && __FreeBSD_version >= 500030 ++#define GETGROUPLIST_ARGS const char *name, gid_t basegid, gid_t *groups, \ ++ int *ngroups ++#else + #define GETGROUPLIST_ARGS const char *name, int basegid, int *groups, \ + int *ngroups ++#endif + + #define HOST_R_RETURN struct hostent * + #define HOST_R_SET_RETURN void -- cgit v1.1