diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2002-07-12 09:25:47 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2002-07-12 09:25:47 +0000 |
| commit | 4edc6d14f125d8da7d8a64791f5edc8c81b7dd1b (patch) | |
| tree | a2175355d52145ef67e3ff307602861db264ec04 /dns | |
| parent | Update to 1.2.0. (diff) | |
* Further improve the lot of those who use this port to replace the
base BIND by correcting the path to named.conf in the man pages, and
adding -base as a PKGNAMESUFFIX to make things really obvious.
* Remove man page install from under NOPORTDOCS. Thanks to mi@
for this one.
* Finally beat the CFLAGS issue into submission in a manner that's
not terribly elegant, but does survive the "creative" sub-make
architecture that they use to build stuff. This method will
(hopefully) have the pleasant side effect of not forcing patch-aa
to be regenerated quite so often.
Notes
Notes:
svn path=/head/; revision=62849
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/bind8/Makefile | 18 | ||||
| -rw-r--r-- | dns/bind8/files/patch-aa | 5 |
2 files changed, 15 insertions, 8 deletions
diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile index 3221c410c700..8ca3dfb78ff2 100644 --- a/dns/bind8/Makefile +++ b/dns/bind8/Makefile @@ -24,7 +24,11 @@ DIST_SUBDIR= bind-${PORTVERSION} MAINTAINER= DougB@FreeBSD.org .if defined(PORT_REPLACES_BASE_BIND8) +PKGNAMESUFFIX= -base PREFIX= /usr +BIND_DESTETC= /etc/namedb +.else +BIND_DESTETC= ${PREFIX}/etc .endif WRKSRC= ${WRKDIR}/src @@ -42,18 +46,22 @@ PATCH_ARGS= -s -d ${WRKDIR} PATCH_DIST_ARGS= -s -d ${WRKDIR} post-patch: -.if defined(PORT_REPLACES_BASE_BIND8) - @${SED} -e "s#\'DESTETC=.*#'DESTETC=/etc/namedb'#" \ + @${SED} -e "s#\'DESTETC=.*#'DESTETC=${BIND_DESTETC}'#" \ + -e "s#-O2 -g#${CFLAGS}#" \ ${WRKSRC}/port/freebsd/Makefile.set > \ ${WRKSRC}/port/freebsd/Makefile.set.sed @${MV} ${WRKSRC}/port/freebsd/Makefile.set.sed \ ${WRKSRC}/port/freebsd/Makefile.set -.endif +.for file in named.conf.5 named.8 + @${SED} -e "s#/etc/named.conf#${BIND_DESTETC}/named.conf#g" \ + ${WRKDIR}/doc/man/${file} > ${WRKDIR}/doc/man/${file}.sed + @${MV} ${WRKDIR}/doc/man/${file}.sed ${WRKDIR}/doc/man/${file} +.endfor post-install: + cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \ + ${MAKEFILE} clean all ${INSTALL_TARGET} .if !defined(NOPORTDOCS) - @(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \ - ${MAKEFILE} clean all ${INSTALL_TARGET}) @${MKDIR} ${PREFIX}/share/doc/bind8/html ${INSTALL_DATA} ${WRKDIR}/doc/html/*.html ${PREFIX}/share/doc/bind8/html ${CP} -Rp ${WRKDIR}/src/conf ${PREFIX}/share/doc/bind8/ diff --git a/dns/bind8/files/patch-aa b/dns/bind8/files/patch-aa index 1ca8d1e4343f..e2684edb625d 100644 --- a/dns/bind8/files/patch-aa +++ b/dns/bind8/files/patch-aa @@ -1,15 +1,14 @@ --- src/port/freebsd/Makefile.set.orig Sun Jun 23 17:32:49 2002 -+++ src/port/freebsd/Makefile.set Fri Jun 28 16:55:49 2002 ++++ src/port/freebsd/Makefile.set Fri Jul 12 00:41:45 2002 @@ -1,12 +1,14 @@ 'CC=cc' --'CDEBUG=-O2 -g -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat' + 'CDEBUG=-O2 -g -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat' -'DESTBIN=/usr/bin' -'DESTSBIN=/usr/sbin' -'DESTEXEC=/usr/libexec' -'DESTMAN=/usr/share/man' -'DESTHELP=/usr/share/misc' -'DESTETC=/etc' -+'CDEBUG=${CFLAGS} -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat' +'DESTBIN=${PREFIX}/bin' +'DESTSBIN=${PREFIX}/sbin' +'DESTEXEC=${PREFIX}/libexec' |