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

Collapse All | Expand All

(-)Makefile (-24 / +22 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	unbound
4
PORTNAME=	unbound
5
PORTVERSION=	1.5.7
5
PORTVERSION=	1.5.8
6
CATEGORIES=	dns
6
CATEGORIES=	dns
7
MASTER_SITES=	http://unbound.net/downloads/
7
MASTER_SITES=	http://unbound.net/downloads/
8
8
Lines 27-42 Link Here
27
PORTDOCS=	CREDITS Changelog FEATURES LICENSE README README.svn \
27
PORTDOCS=	CREDITS Changelog FEATURES LICENSE README README.svn \
28
		README.tests TODO control_proto_spec.txt ietf67-design-02.odp \
28
		README.tests TODO control_proto_spec.txt ietf67-design-02.odp \
29
		ietf67-design-02.pdf requirements.txt
29
		ietf67-design-02.pdf requirements.txt
30
PLIST_SUB+=	PYTHON=${PYTHON} MUNIN=${MUNIN}
31
30
32
OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT FILTER_AAAA
31
OPTIONS_SUB=	yes
32
OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN_PLUGIN DOCS LIBEVENT FILTER_AAAA DNSTAP
33
OPTIONS_DEFAULT=THREADS ECDSA
33
OPTIONS_DEFAULT=THREADS ECDSA
34
34
35
LIBEVENT_DESC=	Build against libevent
35
LIBEVENT_DESC=	Build against libevent
36
GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
36
GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
37
ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
37
ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
38
MUNIN_DESC=	Install Munin plugin
38
MUNIN_PLUGIN_DESC=	Install Munin plugin
39
FILTER_AAAA_DESC=	Build with AAAA filter functionality (contrib)
39
FILTER_AAAA_DESC=	Build with AAAA filter functionality (contrib)
40
DNSTAP_DESC=	Enable dnstap logging support
40
41
41
.include <bsd.port.options.mk>
42
.include <bsd.port.options.mk>
42
43
Lines 51-59 Link Here
51
CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes LDFLAGS="-L${LOCALBASE}/lib"
52
CONFIGURE_ARGS+=--with-pyunbound=yes --with-pythonmodule=yes LDFLAGS="-L${LOCALBASE}/lib"
52
BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
53
BUILD_DEPENDS+=	swig:${PORTSDIR}/devel/swig13
53
STRIP_FILES+=	.libs/_unbound.so
54
STRIP_FILES+=	.libs/_unbound.so
54
PYTHON=
55
.else
56
PYTHON=		"@comment "
57
.endif
55
.endif
58
56
59
.if ${PORT_OPTIONS:MGOST}
57
.if ${PORT_OPTIONS:MGOST}
Lines 71-83 Link Here
71
CONFIGURE_ARGS+=--disable-ecdsa
69
CONFIGURE_ARGS+=--disable-ecdsa
72
.endif
70
.endif
73
71
74
.if ${PORT_OPTIONS:MMUNIN}
72
.if ${PORT_OPTIONS:MDNSTAP}
73
CONFIGURE_ARGS+=--enable-dnstap
74
LIB_DEPENDS+=	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
75
LIB_DEPENDS+=	libfstrm.so:${PORTSDIR}/devel/fstrm
76
.endif
77
78
.if ${PORT_OPTIONS:MMUNIN_PLUGIN}
75
SUB_FILES+=	pkg-message
79
SUB_FILES+=	pkg-message
76
MUNIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
80
MUNIN_PLUGIN_ALL=	hits queue memory by_type by_class by_opcode by_rcode \
77
		by_flags histogram
81
		by_flags histogram
78
MUNIN=
79
.else
80
MUNIN=		"@comment "
81
.endif
82
.endif
82
83
83
.if ${PORT_OPTIONS:MLIBEVENT}
84
.if ${PORT_OPTIONS:MLIBEVENT}
Lines 99-129 Link Here
99
	@${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \
100
	@${REINPLACE_CMD} -e 's|if test ! -e $$(DESTDIR)$$(configfile); then || ; \
100
		s|$$(configfile); fi|$$(configfile).sample|' \
101
		s|$$(configfile); fi|$$(configfile).sample|' \
101
		${WRKSRC}/Makefile.in
102
		${WRKSRC}/Makefile.in
102
.if ${PORT_OPTIONS:MFILTER_AAAA}
103
104
post-patch-FILTER_AAAA-on:
103
	${CAT} ${WRKSRC}/contrib/aaaa-filter-iterator.patch | ${PATCH} -d ${WRKSRC} -p1 -s
105
	${CAT} ${WRKSRC}/contrib/aaaa-filter-iterator.patch | ${PATCH} -d ${WRKSRC} -p1 -s
104
.endif
105
106
106
post-build:
107
post-build:
107
	@for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done
108
	@for s in ${STRIP_FILES}; do ${STRIP_CMD} ${WRKSRC}/$$s; done
108
109
109
post-install:
110
post-install-PYTHON-on:
110
.if ${PORT_OPTIONS:MPYTHON}
111
	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_unbound.so
111
	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_unbound.so
112
.endif
112
113
.if ${PORT_OPTIONS:MMUNIN}
113
post-install-MUNIN_PLUGIN-on:
114
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
114
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/munin/plugins
115
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/munin/plugins
115
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/munin/plugins
116
	@${INSTALL_SCRIPT} ${WRKDIR}/unbound-${PORTVERSION}/contrib/unbound_munin_\
116
	@${INSTALL_SCRIPT} ${WRKDIR}/unbound-${PORTVERSION}/contrib/unbound_munin_ \
117
		${STAGEDIR}${PREFIX}/share/munin/plugins/
117
		${STAGEDIR}${PREFIX}/share/munin/plugins/
118
	@for i in ${MUNIN_ALL}; do\
118
	@for i in ${MUNIN_PLUGIN_ALL}; do \
119
		${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_\
119
		${LN} -fs ${PREFIX}/share/munin/plugins/unbound_munin_ \
120
			${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i ;\
120
			${STAGEDIR}${PREFIX}/etc/munin/plugins/unbound_munin_$$i; done
121
	done
122
	@${ECHO_MSG}
121
	@${ECHO_MSG}
123
	@${ECHO_MSG} "============================================================="
122
	@${ECHO_MSG} "============================================================="
124
	@${CAT} ${WRKDIR}/pkg-message
123
	@${CAT} ${WRKDIR}/pkg-message
125
	@${ECHO_MSG} "============================================================="
124
	@${ECHO_MSG} "============================================================="
126
.endif
127
125
128
post-install-DOCS-on:
126
post-install-DOCS-on:
129
	${MKDIR} ${STAGEDIR}${DOCSDIR}
127
	${MKDIR} ${STAGEDIR}${DOCSDIR}
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (unbound-1.5.7.tar.gz) = 4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc4f92e463b3bee626eee731ca8
1
SHA256 (unbound-1.5.8.tar.gz) = 33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be
2
SIZE (unbound-1.5.7.tar.gz) = 4859573
2
SIZE (unbound-1.5.8.tar.gz) = 4895649
(-)pkg-plist (-12 / +12 lines)
Lines 1-6 Link Here
1
etc/unbound/unbound.conf.sample
1
@sample etc/unbound/unbound.conf.sample
2
include/unbound.h
2
include/unbound.h
3
lib/libunbound.so.2.3.10
3
lib/libunbound.so.2.4.0
4
lib/libunbound.so.2
4
lib/libunbound.so.2
5
lib/libunbound.so
5
lib/libunbound.so
6
lib/libunbound.a
6
lib/libunbound.a
Lines 51-64 Link Here
51
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
51
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
52
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
52
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
53
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
53
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unboundmodule.py
54
%%MUNIN%%etc/munin/plugins/unbound_munin_by_class
54
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_class
55
%%MUNIN%%etc/munin/plugins/unbound_munin_by_flags
55
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_flags
56
%%MUNIN%%etc/munin/plugins/unbound_munin_by_opcode
56
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_opcode
57
%%MUNIN%%etc/munin/plugins/unbound_munin_by_rcode
57
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_rcode
58
%%MUNIN%%etc/munin/plugins/unbound_munin_by_type
58
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_by_type
59
%%MUNIN%%etc/munin/plugins/unbound_munin_histogram
59
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_histogram
60
%%MUNIN%%etc/munin/plugins/unbound_munin_hits
60
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_hits
61
%%MUNIN%%etc/munin/plugins/unbound_munin_memory
61
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_memory
62
%%MUNIN%%etc/munin/plugins/unbound_munin_queue
62
%%MUNIN_PLUGIN%%etc/munin/plugins/unbound_munin_queue
63
%%MUNIN%%share/munin/plugins/unbound_munin_
63
%%MUNIN_PLUGIN%%share/munin/plugins/unbound_munin_
64
@dir(unbound,,) %%ETCDIR%%
64
@dir(unbound,,) %%ETCDIR%%

Return to bug 207948