svn commit: r485677 - head/dns/knot2
Steve Wills
swills at FreeBSD.org
Fri Nov 23 15:35:08 UTC 2018
Author: swills
Date: Fri Nov 23 15:35:06 2018
New Revision: 485677
URL: https://svnweb.freebsd.org/changeset/ports/485677
Log:
dns/knot2: Upgrade to 2.7.4
While here, improve options deps
PR: 233199
Submitted by: Leo Vandewoestijne <freebsd at dns.company> (maintainer)
Modified:
head/dns/knot2/Makefile (contents, props changed)
head/dns/knot2/distinfo (contents, props changed)
head/dns/knot2/pkg-plist (contents, props changed)
Modified: head/dns/knot2/Makefile
==============================================================================
--- head/dns/knot2/Makefile Fri Nov 23 15:23:35 2018 (r485676)
+++ head/dns/knot2/Makefile Fri Nov 23 15:35:06 2018 (r485677)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= knot
-DISTVERSION= 2.7.3
-PORTREVISION= 1
+DISTVERSION= 2.7.4
CATEGORIES= dns ipv6
MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \
https://dns.company/downloads/knot-dns/
@@ -18,7 +17,6 @@ NOT_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386 on FreeBSD >= 11.2
LIB_DEPENDS= libgnutls.so:security/gnutls \
- libidn2.so:dns/libidn2 \
liblmdb.so:databases/lmdb \
libnettle.so:security/nettle \
liburcu.so:sysutils/liburcu
@@ -27,15 +25,28 @@ CONFLICTS= knot-1.* knot1-[0-6].*
USES= alias compiler:c11 libedit libtool localbase ncurses pkgconfig python tar:xz
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-rundir=/var/run/knot \
- --with-storage=/var/db/knot \
- --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
- --enable-recvmmsg=no
+CONFIGURE_ARGS= --enable-recvmmsg=no \
+ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+
+.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
+CONFIGURE_ARGS+= --with-rundir=/var/run/knot \
+ --with-storage=/var/db/knot
+USE_RC_SUBR= ${PORTNAME}
+SUB_FILES= pkg-message
+.endif
+
+.if defined(UTILS_ONLY) || defined(LIB_ONLY)
+CONFIGURE_ARGS+= --disable-daemon \
+ --disable-modules
+.endif
+
+.if defined(LIB_ONLY)
+CONFIGURE_ARGS+= --disable-utilities
+.endif
+
USE_LDCONFIG= yes
LLD_UNSAFE= yes
INSTALL_TARGET= install-strip
-USE_RC_SUBR= ${PORTNAME}
-SUB_FILES= pkg-message
USERS= knot
GROUPS= knot
@@ -43,8 +54,16 @@ SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}"
PORTDOCS= COPYING NEWS README
-OPTIONS_DEFINE= DNSTAP FASTPARSER IDN DOCS
+OPTIONS_DEFINE= DNSTAP DOCS
+.if !defined(LIB_ONLY)
+OPTIONS_DEFINE+= IDN
+.endif
+
+.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
+OPTIONS_DEFINE+= FASTPARSER MAXMINDDB
+.endif
+
DNSTAP_DESC= dnstap support (see dnstap.info)
DNSTAP_CONFIGURE_ENABLE= dnstap
DNSTAP_CONFIGURE_WITH= module-dnstap=yes
@@ -61,20 +80,28 @@ FASTPARSER_DESC= Fast zone parser (demanding compilat
FASTPARSER_CONFIGURE_ENABLE= fastparser
IDN_CONFIGURE_WITH= libidn
-IDN_LIB_DEPENDS= libidn.so:dns/libidn
+IDN_LIB_DEPENDS= libidn2.so:dns/libidn2
+MAXMINDDB_DESC= Enable MaxMind for geodb module
+MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
+MAXMINDDB_CONFIGURE_ENABLE= maxminddb
+
post-patch:
+.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
${WRKSRC}/src/Makefile.in
@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \
${WRKSRC}/src/Makefile.in
@${RM} -r ${WRKSRC}/src/zscanner/scanner.c
+.endif
post-install:
+.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \
${STAGEDIR}${ETCDIR}/knot.conf.sample
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
@${MKDIR} ${STAGEDIR}/var/run/knot ${STAGEDIR}/var/db/knot
+.endif
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>
Modified: head/dns/knot2/distinfo
==============================================================================
--- head/dns/knot2/distinfo Fri Nov 23 15:23:35 2018 (r485676)
+++ head/dns/knot2/distinfo Fri Nov 23 15:35:06 2018 (r485677)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539588047
-SHA256 (knot-2.7.3.tar.xz) = 8717c0f34e441e96bc32bc93b48333ea9c094c5075f91575e40ac30fcf6692df
-SIZE (knot-2.7.3.tar.xz) = 1146456
+TIMESTAMP = 1542114322
+SHA256 (knot-2.7.4.tar.xz) = acebe2fbcd8f67b0cb8969376114855316fe831df08321b795147502a5e9fd74
+SIZE (knot-2.7.4.tar.xz) = 1148652
Modified: head/dns/knot2/pkg-plist
==============================================================================
--- head/dns/knot2/pkg-plist Fri Nov 23 15:23:35 2018 (r485676)
+++ head/dns/knot2/pkg-plist Fri Nov 23 15:35:06 2018 (r485677)
@@ -96,5 +96,5 @@ sbin/keymgr
sbin/kjournalprint
sbin/knotc
sbin/knotd
- at dir /var/db/knot
- at dir /var/run/knot
+ at dir(knot,knot,750) /var/db/knot
+ at dir(knot,knot,750) /var/run/knot
More information about the svn-ports-head
mailing list