Date: Sun, 24 Nov 2013 10:37:01 +0100 From: John Marino <freebsd.contact@marino.st> To: Erwin Lansing <erwin@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, owner-ports-committers@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r334593 - in head/dns: bind96 bind96/files bind98 bind98/files bind99 bind99/files Message-ID: <5291C8BD.3070109@marino.st> In-Reply-To: <2DEEB271-4795-4DF0-8F85-30316BA3070F@FreeBSD.org> References: <201311221341.rAMDfY3g002148@svn.freebsd.org> <01490d316b5dd7f01f1c843871542666@secure.marino.st> <2DEEB271-4795-4DF0-8F85-30316BA3070F@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------080705050105090900010207 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit On 11/22/2013 15:23, Erwin Lansing wrote: > > On 22 Nov 2013, at 15:18, John Marino (FreeBSD) > <freebsd.contact@marino.st> wrote: > >> On 2013-11-22 14:41, Erwin Lansing wrote: >>> Author: erwin Date: Fri Nov 22 13:41:34 2013 New Revision: >>> 334593 URL: http://svnweb.freebsd.org/changeset/ports/334593 >>> Log: Fix startup script. PR: 184159 [1] Submitted by: Pawel >>> Biernacki <pawel.biernacki@gmail.com> [1], Trond Endrestoel >>> <Trond.Endrestol@ximalas.info> (private email) Modified: >>> head/dns/bind96/Makefile head/dns/bind96/files/named >>> head/dns/bind98/Makefile head/dns/bind98/files/named >>> head/dns/bind99/Makefile head/dns/bind99/files/named >> >> Hi Erwin, > > Hi John, > >> I was hoping you would have also combined OSVERSION with OPSYS == >> FreeBSD as we talked about on IRC last week. Are you still >> planning on doing that? > > I'm still fighting off jetlag after returning from the ICANN48 > conference in Buenos Aires. Committing a working rc script was > clearly higher on my todo list, as I'm sure you'll understand. > Please send me a prefab patch for testing, that will make things > easier for me and certainly will speed things up. I do not have > anything against adding those on principle, just haven't had the time > yet, so any help is much appreciated. > > Cheers, Erwin Hi Erwin, I have attached a diff with the proposed changes covering all three ports. It's pretty straight-forward. John --------------080705050105090900010207 Content-Type: text/plain; charset=windows-1252; name="fix-bind.diff.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="fix-bind.diff.txt" Index: dns/bind96/Makefile =================================================================== --- dns/bind96/Makefile (revision 334713) +++ dns/bind96/Makefile (working copy) @@ -135,7 +135,7 @@ .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 IGNORE= REPLACE_BASE option not supported on this release .endif PKGNAMESUFFIX= -base @@ -142,7 +142,7 @@ PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -153,7 +153,7 @@ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -221,7 +221,7 @@ ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/NSEC3-NOTES ${WRKSRC}/README* ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \ Index: dns/bind98/Makefile =================================================================== --- dns/bind98/Makefile (revision 334713) +++ dns/bind98/Makefile (working copy) @@ -162,7 +162,7 @@ .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 IGNORE= REPLACE_BASE option is not supported on this release .endif PKGNAMESUFFIX= -base @@ -169,7 +169,7 @@ PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -180,7 +180,7 @@ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -257,7 +257,7 @@ ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \ Index: dns/bind99/Makefile =================================================================== --- dns/bind99/Makefile (revision 334713) +++ dns/bind99/Makefile (working copy) @@ -169,7 +169,7 @@ .endif .if ${PORT_OPTIONS:MREPLACE_BASE} -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 IGNORE= REPLACE_BASE option is not supported on this release .endif PKGNAMESUFFIX= -base @@ -176,7 +176,7 @@ PREFIX= /usr BIND_DESTETC= /etc/namedb .else -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 BIND_DESTETC= ${PREFIX}/etc/namedb .else BIND_DESTETC= ${PREFIX}/etc @@ -187,7 +187,7 @@ --sysconfdir=${BIND_DESTETC} PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 PLIST_SUB+= NOBASE="" .else PLIST_SUB+= NOBASE="@comment " @@ -268,7 +268,7 @@ ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/ .endif -.if ${OSVERSION} >= 1000500 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500 .for FILE in named named.conf ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \ --------------080705050105090900010207--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5291C8BD.3070109>