Date: Fri, 25 Sep 2015 10:05:48 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397807 - in head/dns: bind-tools bind910 bind99 Message-ID: <201509251005.t8PA5mFr064147@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Sep 25 10:05:48 2015 New Revision: 397807 URL: https://svnweb.freebsd.org/changeset/ports/397807 Log: Fix build on -CURRENT. [1] - Force building with libedit - Bump PORTREVISION to account for accidental succesful builds PR: 203273 [1] Sponsored by: Absolight Modified: head/dns/bind-tools/Makefile head/dns/bind910/Makefile head/dns/bind99/Makefile Modified: head/dns/bind-tools/Makefile ============================================================================== --- head/dns/bind-tools/Makefile Fri Sep 25 08:56:10 2015 (r397806) +++ head/dns/bind-tools/Makefile Fri Sep 25 10:05:48 2015 (r397807) @@ -1,14 +1,6 @@ # $FreeBSD$ # Define PORTREVISION in ${MASTERDIR} -PKGNAMESUFFIX= -tools - -COMMENT= Command line tools from BIND: delv, dig, host, nslookup... - -CONFIGURE_ARGS+= --disable-shared - -CONFLICTS+= bind910-9.10.* - MASTERDIR= ${.CURDIR}/../../dns/bind910 DESCR= ${.CURDIR}/pkg-descr @@ -19,14 +11,4 @@ BIND_TOOLS_SLAVE= YES INSTALL_WRKSRC= ${WRKSRC}/bin -post-patch: - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ - -e 's#isc-config.sh installdirs#installdirs#' \ - -e 's#.*INSTALL.*isc-config.*##' \ - -e 's#.*INSTALL.*bind.keys.*##' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate \\#' \ - -e 's#^ .*check confgen ##' \ - ${WRKSRC}/bin/Makefile.in - .include "${MASTERDIR}/Makefile" Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Fri Sep 25 08:56:10 2015 (r397806) +++ head/dns/bind910/Makefile Fri Sep 25 10:05:48 2015 (r397807) @@ -5,18 +5,26 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here -PORTREVISION= 0 +PORTREVISION= 1 .else # dns/bind910 here -PORTREVISION= 0 +PORTREVISION= 1 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} -PKGNAMESUFFIX?= 910 +.if defined(BIND_TOOLS_SLAVE) +PKGNAMESUFFIX= -tools +.else +PKGNAMESUFFIX= 910 +.endif DISTNAME= ${PORTNAME}-${ISCVERSION} MAINTAINER= mat@FreeBSD.org -COMMENT?= BIND DNS suite with updated DNSSEC and DNS64 +.if defined(BIND_TOOLS_SLAVE) +COMMENT= Command line tools from BIND: delv, dig, host, nslookup... +.else +COMMENT= BIND DNS suite with updated DNSSEC and DNS64 +.endif LICENSE= ISCL @@ -40,7 +48,11 @@ CONFIGURE_ARGS+= --localstatedir=/var -- --disable-symtable \ --with-randomdev=/dev/random \ --with-libxml2=${LOCALBASE} \ + --with-readline=-ledit \ --sysconfdir=${ETCDIR} +.if defined(BIND_TOOLS_SLAVE) +CONFIGURE_ARGS+= --disable-shared +.endif ETCDIR= ${PREFIX}/etc/namedb CONFLICTS+= bind9*-9.[456789].* bind9*-sdb-9.[456789].* @@ -107,7 +119,9 @@ MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extr FETCHLIMIT_CONFIGURE_ENABLE= fetchlimit QUERYTRACE_CONFIGURE_ENABLE= querytrace -.if !defined(BIND_TOOLS_SLAVE) +.if defined(BIND_TOOLS_SLAVE) +CONFLICTS+= bind910-9.10.* +.else CONFLICTS+= bind-tools-9.* .endif # BIND_TOOLS_SLAVE @@ -221,16 +235,30 @@ PKGDEINSTALL= ${PKGINSTALL} PORTDOCS= * -.if !defined(BIND_TOOLS_SLAVE) post-patch: -.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ + @${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) + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \ + -e 's#isc-config.sh installdirs#installdirs#' \ + -e 's#.*INSTALL.*isc-config.*##' \ + -e 's#.*INSTALL.*bind.keys.*##' \ + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate \\#' \ + -e 's#^ .*check confgen ##' \ + ${WRKSRC}/bin/Makefile.in +.else +. 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' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} -.endfor +. endfor +.endif +.if !defined(BIND_TOOLS_SLAVE) .if ${PORTREVISION:N0} post-patch-PORTREVISION-on: @${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \ Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Fri Sep 25 08:56:10 2015 (r397806) +++ head/dns/bind99/Makefile Fri Sep 25 10:05:48 2015 (r397807) @@ -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 --d --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' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509251005.t8PA5mFr064147>