Date: Sun, 8 Dec 2013 19:49:52 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335933 - in head/dns: bind96 bind98 bind99 Message-ID: <201312081949.rB8JnqWA020680@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Dec 8 19:49:52 2013 New Revision: 335933 URL: http://svnweb.freebsd.org/changeset/ports/335933 Log: bind(96,98,99): Couple OSVERSION with OPSYS OSVERSION is platform-specific and must be used with OPSYS. Approved by: maintainer (erwin) Modified: head/dns/bind96/Makefile head/dns/bind98/Makefile head/dns/bind99/Makefile Modified: head/dns/bind96/Makefile ============================================================================== --- head/dns/bind96/Makefile Sun Dec 8 19:48:49 2013 (r335932) +++ head/dns/bind96/Makefile Sun Dec 8 19:49:52 2013 (r335933) @@ -135,14 +135,14 @@ CONFIGURE_ARGS+= --disable-threads .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 IGNORE= REPLACE_BASE option not supported on this release .endif PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -153,7 +153,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -221,7 +221,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/NSEC3-NOTES ${WRKSRC}/README* ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \ Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Sun Dec 8 19:48:49 2013 (r335932) +++ head/dns/bind98/Makefile Sun Dec 8 19:49:52 2013 (r335933) @@ -163,14 +163,14 @@ CONFIGURE_ARGS+= --without-gssapi .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 IGNORE= REPLACE_BASE option is not supported on this release .endif PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -181,7 +181,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -258,7 +258,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \ Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Sun Dec 8 19:48:49 2013 (r335932) +++ head/dns/bind99/Makefile Sun Dec 8 19:49:52 2013 (r335933) @@ -170,14 +170,14 @@ CONFIGURE_ARGS+= --without-gssapi .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 IGNORE= REPLACE_BASE option is not supported on this release .endif PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -188,7 +188,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -269,7 +269,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000100 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312081949.rB8JnqWA020680>