View | Details | Raw Unified | Return to bug 242665 | Differences between
and this patch

Collapse All | Expand All

(-)dns/knot2/Makefile (-7 / +27 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/dns/knot2/Makefile 518954 2019-12-03 17:54:49Z pi $
2
# $FreeBSD: head/dns/knot2/Makefile 518954 2019-12-03 17:54:49Z pi $
3
3
4
PORTNAME=	knot
4
PORTNAME=	knot
5
DISTVERSION=	2.9.1
5
DISTVERSION=	2.9.2
6
CATEGORIES=	dns
6
CATEGORIES=	dns
7
MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
7
MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
8
		https://dns.company/downloads/knot-dns/
8
		https://dns.company/downloads/knot-dns/
Lines 16-28 Link Here
16
NOT_FOR_ARCHS=	i386
16
NOT_FOR_ARCHS=	i386
17
NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386
17
NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386
18
18
19
CONFLICTS=	knot-1.* knot1-[0-6].*
20
19
LIB_DEPENDS=	libgnutls.so:security/gnutls \
21
LIB_DEPENDS=	libgnutls.so:security/gnutls \
20
		liblmdb.so:databases/lmdb \
22
		liblmdb.so:databases/lmdb
21
		liburcu.so:sysutils/liburcu
22
23
23
CONFLICTS=	knot-1.* knot1-[0-6].*
24
BUILD_DEPENDS=	autoconf>=2.65:devel/autoconf
24
25
25
USES=		alias compiler:c11 libedit libtool localbase ncurses pkgconfig python tar:xz
26
USES=		alias libtool localbase pkgconfig tar:xz
27
26
GNU_CONFIGURE=	yes
28
GNU_CONFIGURE=	yes
27
CONFIGURE_ARGS=	--enable-recvmmsg=no \
29
CONFIGURE_ARGS=	--enable-recvmmsg=no \
28
		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
30
		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
Lines 32-37 Link Here
32
			--with-storage=/var/db/knot
34
			--with-storage=/var/db/knot
33
USE_RC_SUBR=	${PORTNAME}
35
USE_RC_SUBR=	${PORTNAME}
34
SUB_FILES=	pkg-message
36
SUB_FILES=	pkg-message
37
USES+=		libedit
38
LIB_DEPENDS+=	liburcu.so:sysutils/liburcu
35
.endif
39
.endif
36
40
37
.if defined(UTILS_ONLY) || defined(LIB_ONLY)
41
.if defined(UTILS_ONLY) || defined(LIB_ONLY)
Lines 44-50 Link Here
44
.endif
48
.endif
45
49
46
USE_LDCONFIG=	yes
50
USE_LDCONFIG=	yes
47
LLD_UNSAFE=	yes
48
INSTALL_TARGET=	install-strip
51
INSTALL_TARGET=	install-strip
49
52
50
USERS=		knot
53
USERS=		knot
Lines 79-90 Link Here
79
FASTPARSER_CONFIGURE_ENABLE=	fastparser
82
FASTPARSER_CONFIGURE_ENABLE=	fastparser
80
83
81
IDN_CONFIGURE_WITH=		libidn
84
IDN_CONFIGURE_WITH=		libidn
85
IDN_CONFIGURE_OFF=		--without-libidn
82
IDN_LIB_DEPENDS=		libidn2.so:dns/libidn2
86
IDN_LIB_DEPENDS=		libidn2.so:dns/libidn2
83
87
84
MAXMINDDB_DESC=			Enable MaxMind for geodb module
88
MAXMINDDB_DESC=			Enable MaxMind for geodb module
85
MAXMINDDB_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
89
MAXMINDDB_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
86
MAXMINDDB_CONFIGURE_ENABLE=	maxminddb
90
MAXMINDDB_CONFIGURE_ENABLE=	maxminddb
87
91
92
.include <bsd.port.pre.mk>
93
94
.if ${PORT_OPTIONS:MDOCS}
95
USES+=				python
96
.else
97
CONFIGURE_ARGS+=		--disable-documentation
98
.endif
99
100
# this part will be unused as long NOT_FOR_ARCHS (above) is present or uncommented.
101
#.if ${ARCH} == i386
102
# needed?
103
#EXTRA_PATCHES+=        ${FILESDIR}/extrapatch-src_libdnssec_Makefile.inc
104
# needed?
105
#BUILD_DEPENDS+=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
106
#.endif
107
88
post-patch:
108
post-patch:
89
.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
109
.if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
90
	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
110
	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
Lines 103-106 Link Here
103
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
123
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
104
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
124
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
105
125
106
.include <bsd.port.mk>
126
.include <bsd.port.post.mk>
(-)dns/knot2/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1574091844
1
TIMESTAMP = 1576799805
2
SHA256 (knot-2.9.1.tar.xz) = f19121956caa360c387923654f13e4c97b3fb9093d242e110d7e0916b8d8a04d
2
SHA256 (knot-2.9.2.tar.xz) = 298cdf33aa7589b50df7e5833694b24cd2de8b6d17cee7e1673873fe576db6ee
3
SIZE (knot-2.9.1.tar.xz) = 1212460
3
SIZE (knot-2.9.2.tar.xz) = 1181860
(-)dns/knot2/files/extrapatch-src_libdnssec_Makefile.inc (+11 lines)
Line 0 Link Here
1
--- src/libdnssec/Makefile.inc.orig	2020-01-22 14:27:02 UTC
2
+++ src/libdnssec/Makefile.inc
3
@@ -2,7 +2,7 @@ lib_LTLIBRARIES += libdnssec.la
4
 pkgconfig_DATA  += libdnssec.pc
5
 
6
 libdnssec_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(gnutls_CFLAGS)
7
-libdnssec_la_LDFLAGS  = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS)
8
+libdnssec_la_LDFLAGS  = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO)
9
 libdnssec_la_LIBADD   = libcontrib.la $(gnutls_LIBS)
10
 if ENABLE_PKCS11
11
 libdnssec_la_LIBADD  += $(pthread_LIBS)

Return to bug 242665