diff options
| author | dougb <dougb@FreeBSD.org> | 2009-09-01 01:31:43 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2009-09-01 01:31:43 +0000 |
| commit | 04ca87c0eb1a52195493a449f073b14857258689 (patch) | |
| tree | adf8ec7c974d6b58dca9867bc984bdc0a0cf9f0b | |
| parent | ff06dcae9f8c51dda0e92ea529ced0b410e6511f (diff) | |
| download | FreeBSD-ports-04ca87c0eb1a52195493a449f073b14857258689.zip FreeBSD-ports-04ca87c0eb1a52195493a449f073b14857258689.tar.gz | |
The new LINKS OPTION is not only useless it's harmful when combined
with the REPLACE_BASE option so if the latter is defined don't try
to make the LINKS.
Problem pointed out by: Chris Wopat <me@falz.net>
| -rw-r--r-- | dns/bind9/Makefile | 4 | ||||
| -rw-r--r-- | dns/bind94/Makefile | 4 | ||||
| -rw-r--r-- | dns/bind95/Makefile | 4 | ||||
| -rw-r--r-- | dns/bind96/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile index 5e0182d..17cf9a3 100644 --- a/dns/bind9/Makefile +++ b/dns/bind9/Makefile @@ -52,7 +52,7 @@ CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl .endif -.if !defined(WITHOUT_LINKS) +.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) PLIST_SUB+= LINKS="" .else PLIST_SUB+= LINKS="@comment " @@ -146,7 +146,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/README ${DOCSDIR}/ .endif -.if !defined(WITHOUT_LINKS) +.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) ${MKDIR} /var/named${PREFIX}/etc .for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc .for FILE in named.conf rndc.key diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile index 006a380..d2c67ad 100644 --- a/dns/bind94/Makefile +++ b/dns/bind94/Makefile @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl .endif -.if !defined(WITHOUT_LINKS) +.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) PLIST_SUB+= LINKS="" .else PLIST_SUB+= LINKS="@comment " @@ -222,7 +222,7 @@ post-install: ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/README ${DOCSDIR}/ .endif -.if !defined(WITHOUT_LINKS) +.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) ${MKDIR} /var/named${PREFIX}/etc .for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc .for FILE in named.conf rndc.key diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile index 013950a..eb31179 100644 --- a/dns/bind95/Makefile +++ b/dns/bind95/Makefile @@ -88,7 +88,7 @@ LIB_DEPENDS+= idnkit.1:${PORTSDIR}/dns/idnkit CONFIGURE_ARGS+= --without-idn .endif -.if !defined(WITHOUT_LINKS) +.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) PLIST_SUB+= LINKS="" .else PLIST_SUB+= LINKS="@comment " @@ -217,7 +217,7 @@ post-install: ${WRKSRC}/README ${WRKSRC}/README.idnkit \ ${DOCSDIR}/ .endif -.if !defined(WITHOUT_LINKS) +.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) ${MKDIR} /var/named${PREFIX}/etc .for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc .for FILE in named.conf rndc.key diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile index 4f44bab..821e067 100644 --- a/dns/bind96/Makefile +++ b/dns/bind96/Makefile @@ -87,7 +87,7 @@ LIB_DEPENDS+= idnkit.1:${PORTSDIR}/dns/idnkit CONFIGURE_ARGS+= --without-idn .endif -.if !defined(WITHOUT_LINKS) +.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) PLIST_SUB+= LINKS="" .else PLIST_SUB+= LINKS="@comment " @@ -218,7 +218,7 @@ post-install: ${WRKSRC}/README.pkcs11 \ ${DOCSDIR}/ .endif -.if !defined(WITHOUT_LINKS) +.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) ${MKDIR} /var/named${PREFIX}/etc .for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc .for FILE in named.conf rndc.key |
