Attachment 161332 Details for Bug 203273 – a951c2a04c40c31451e7ecc930a88bac98e8cb26.diff

a951c2a04c40c31451e7ecc930a88bac98e8cb26.diff

a951c2a04c40c31451e7ecc930a88bac98e8cb26.diff (text/plain), 2.27 KB, created by Mathieu Arnold on 2015-09-24 10:15:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2015-09-24 10:15:35 UTC

Size: 2.27 KB

patch

obsolete

>commit a951c2a04c40c31451e7ecc930a88bac98e8cb26 (HEAD -> bind)
>Author: Mathieu Arnold <mat@mat.cc>
>Date:   2015-09-23 13:13:01 +0200
>
>    Try to fix linking with libedit on -CURRENT.
>
>diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
>index c4a2764..a0a9c8b 100644
>--- a/dns/bind910/Makefile
>+++ b/dns/bind910/Makefile
>@@ -40,6 +40,7 @@ CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
> 		--disable-symtable \
> 		--with-randomdev=/dev/random \
> 		--with-libxml2=${LOCALBASE} \
>+		--with-readline=-ledit \
> 		--sysconfdir=${ETCDIR}
> ETCDIR=		${PREFIX}/etc/namedb
> 
>@@ -221,8 +222,11 @@ PKGDEINSTALL=	${PKGINSTALL}
> 
> PORTDOCS=	*
> 
>-.if !defined(BIND_TOOLS_SLAVE)
> post-patch:
>+	@${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
>+		s|readline/history.h|histedit.h|' \
>+		${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c
>+.if !defined(BIND_TOOLS_SLAVE)
> .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
> 	rndc/rndc.8
> 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
>@@ -230,7 +234,9 @@ post-patch:
> 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
> 		${WRKSRC}/bin/${FILE}
> .endfor
>+.endif
> 
>+.if !defined(BIND_TOOLS_SLAVE)
> .if ${PORTREVISION:N0}
> post-patch-PORTREVISION-on:
> 	@${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \
>diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
>index 8ce2ae1..2aa5945 100644
>--- a/dns/bind99/Makefile
>+++ b/dns/bind99/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	bind
> PORTVERSION=	${ISCVERSION:S/-P/P/}
>-PORTREVISION=	0
>+PORTREVISION=	1
> CATEGORIES=	dns net ipv6
> MASTER_SITES=	ISC/bind9/${ISCVERSION}
> PKGNAMESUFFIX=	99
>@@ -34,6 +34,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
> 		--disable-symtable \
> 		--with-randomdev=/dev/random \
> 		--with-libxml2=${LOCALBASE} \
>+		--with-readline=-ledit \
> 		--sysconfdir=${ETCDIR}
> ETCDIR=		${PREFIX}/etc/namedb
> 
>@@ -194,6 +195,9 @@ PKGDEINSTALL=	${PKGINSTALL}
> PORTDOCS=	*
> 
> post-patch:
>+	@${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
>+		s|readline/history.h|histedit.h|' \
>+		${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c
> .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
> 	rndc/rndc.8
> 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \

Actions: View

Attachments on bug 203273: 161289 | 161290 | 161301 | 161306 | 161307 | 161332