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>
This commit is contained in:
parent
a55ae458aa
commit
7d86b05e82
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=240641
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user