Attachment 199168 Details for Bug 233164 – knot2 - metaports prepare

[patch] knot2 - metaports prepare

knot2.diff (text/plain), 3.63 KB, created by Leo Vandewoestijne on 2018-11-12 15:24:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Vandewoestijne

Created: 2018-11-12 15:24:07 UTC

Size: 3.63 KB

patch

obsolete

>diff -ru dns/knot2.orig/Makefile dns/knot2/Makefile
>--- dns/knot2.orig/Makefile     2018-11-12 13:40:53.828342000 +0000
>+++ dns/knot2/Makefile  2018-11-12 13:38:15.011628000 +0000
>@@ -3,7 +3,7 @@
> 
> PORTNAME=      knot
> DISTVERSION=   2.7.3
>-PORTREVISION=  1
>+PORTREVISION=  2
> CATEGORIES=    dns ipv6
> MASTER_SITES=  https://secure.nic.cz/files/knot-dns/ \
>                https://dns.company/downloads/knot-dns/
>@@ -18,7 +18,6 @@
> 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 +26,28 @@
> 
> 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 \
>+CONFIGURE_ARGS=        --enable-recvmmsg=no \
>                --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
>-               --enable-recvmmsg=no
>+
>+.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,7 +55,7 @@
> 
> PORTDOCS=      COPYING NEWS README
> 
>-OPTIONS_DEFINE=                        DNSTAP FASTPARSER IDN DOCS
>+OPTIONS_DEFINE=        DOCS DNSTAP
> 
> DNSTAP_DESC=                   dnstap support (see dnstap.info)
> DNSTAP_CONFIGURE_ENABLE=       dnstap
>@@ -57,24 +69,39 @@
> # in higher line count.  Ideally this bug should be fixed upstream.
> DNSTAP_CPPFLAGS=               -I${LOCALBASE}/include
> 
>+.if !defined(LIB_ONLY)
>+OPTIONS_DEFINE+=               IDN
>+IDN_CONFIGURE_WITH=            libidn
>+IDN_LIB_DEPENDS=               libidn2.so:dns/libidn2
>+.endif
>+
>+.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
>+OPTIONS_DEFINE+=               FASTPARSER MAXMINDDB
>+
> FASTPARSER_DESC=               Fast zone parser (demanding compilation)
> FASTPARSER_CONFIGURE_ENABLE=   fastparser
> 
>-IDN_CONFIGURE_WITH=            libidn
>-IDN_LIB_DEPENDS=               libidn.so:dns/libidn
>+MAXMINDDB_DESC=                        Enable MaxMind for geodb module
>+MAXMINDDB_LIB_DEPENDS=         libmaxminddb.so:net/libmaxminddb
>+MAXMINDDB_CONFIGURE_ENABLE=    maxminddb
>+.endif
> 
> 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>

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 233164: 199168