Attachment #87269 for bug #123853

View | Details | Raw Unified | Return to bug 123853
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/home/cherry/svk/ports/dns/unbound/Makefile (-3 / +23 lines)
6	#	6	#
7		7
8	PORTNAME= unbound	8	PORTNAME= unbound
9	PORTVERSION= 0.11	9	PORTVERSION= 1.0.0
10	PORTREVISION= 2
11	CATEGORIES= dns	10	CATEGORIES= dns
12	MASTER_SITES= http://unbound.net/downloads/	11	MASTER_SITES= http://unbound.net/downloads/
13		12
Lines 15-24 Link Here
15	COMMENT= A validating, recursive, and caching DNS resolver	14	COMMENT= A validating, recursive, and caching DNS resolver
16		15
17	USE_GMAKE= yes	16	USE_GMAKE= yes
		17	USE_OPENSSL= yes
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
		19	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		20	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
19	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
20		22
21	USE_RC_SUBR= unbound	23	USE_RC_SUBR= unbound
		24	PORTDOCS= CREDITS Changelog FEATURES LICENSE README README.svn \
		25	README.tests TODO plan requirements.txt
22		26
23	MAN1= unbound-host.1	27	MAN1= unbound-host.1
24	MAN3= libunbound.3	28	MAN3= libunbound.3
Lines 35-43 Link Here
35		39
36	.if defined(WITH_LIBEVENT)	40	.if defined(WITH_LIBEVENT)
37	LIB_DEPENDS+= event:${PORTSDIR}/devel/libevent	41	LIB_DEPENDS+= event:${PORTSDIR}/devel/libevent
38	CONFIGURE_ARGS+= --with-libevent=${PREFIX}	42	CONFIGURE_ARGS+= --with-libevent=${LOCALBASE}
		43	.else
		44	CONFIGURE_ARGS+= --with-libevent=no
39	.endif	45	.endif
40		46
		47	# XXX broken, ldns in ports doesn't have ldns_buffer_copy()
		48	# XXX use bundled ldns for now
		49	# .if defined(WITH_LDNS)
		50	# LIB_DEPENDS+= ldns:${PORTSDIR}/dns/ldns
		51	# CONFIGURE_ARGS+= --with-ldns=${LOCALBASE}
		52	# .else
		53	# CONFIGURE_ARGS+= --without-ldns
		54	# .endif
41	post-patch:	55	post-patch:
42	@${REINPLACE_CMD} -e 's#/usr/local/etc/unbound/unbound.pid#/var/run/unbound/unbound.pid#' ${WRKSRC}/doc/example.conf ${WRKSRC}/doc/unbound.conf.5	56	@${REINPLACE_CMD} -e 's#/usr/local/etc/unbound/unbound.pid#/var/run/unbound/unbound.pid#' ${WRKSRC}/doc/example.conf ${WRKSRC}/doc/unbound.conf.5
43		57
Lines 46-50 Link Here
46		60
47	post-install:	61	post-install:
48	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	62	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
		63	.if !defined(NOPORTDOCS)
		64	${MKDIR} ${DOCSDIR}
		65	.for F in ${PORTDOCS}
		66	( cd ${WRKSRC}/doc && ${INSTALL_DATA} ${F} ${DOCSDIR}/ )
		67	.endfor
		68	.endif
49		69
50	.include <bsd.port.post.mk>	70	.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/usr/home/cherry/svk/ports/dns/unbound/distinfo (-3 / +3 lines)
1	MD5 (unbound-0.11.tar.gz) = 2d698050a9ffd492b0abd37b5000680f	1	MD5 (unbound-1.0.0.tar.gz) = 05b7532c26e6005f7575d04fc44fb893
2	SHA256 (unbound-0.11.tar.gz) = f6c44ccae56398273c1f03485f2e2b8e4b612663d501d89c82c8cf9f23422d9f	2	SHA256 (unbound-1.0.0.tar.gz) = 48e27905cb2cbde604252fbdd19dcd915a3b970c55f2ba2a033dac02048de1fe
3	SIZE (unbound-0.11.tar.gz) = 3543955	3	SIZE (unbound-1.0.0.tar.gz) = 3554571

Lines 1-11 Link Here

(-)/usr/home/cherry/svk/ports/dns/unbound/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig 2008-04-23 10:47:48.000000000 +0400
2	+++ Makefile.in 2008-04-25 18:42:04.000000000 +0400
3	@@ -273,7 +273,7 @@
4	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound.conf.5 $(mandir)/man5
5	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(mandir)/man1
6	$(INSTALL) -c -m 644 $(srcdir)/doc/libunbound.3 $(mandir)/man3
7	- if test ! -e $(configfile); then $(INSTALL) -d `dirname $(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(configfile); fi
8	+ $(INSTALL) -d `dirname $(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(configfile).sample
9	$(LIBTOOL) --mode=install cp $(srcdir)/libunbound/unbound.h $(includedir)/unbound.h
10	$(LIBTOOL) --mode=install cp libunbound.la $(libdir)
11	$(LIBTOOL) --mode=finish $(libdir)




--- configure.orig	2008-05-20 15:37:02.000000000 +0900
+++ configure	2008-05-21 17:26:09.000000000 +0900
@@ -3299,7 +3299,7 @@
 
 #
 # Determine configuration file
-ub_conf_file=${sysconfdir}/unbound/unbound.conf
+ub_conf_file=${sysconfdir}/unbound/unbound.conf.sample
 
 # Check whether --with-conf_file was given.
 if test "${with_conf_file+set}" = set; then
@@ -22125,7 +22125,7 @@
    withval="no"
 fi
 
-if test x_$withval == x_yes -o x_$withval != x_no; then
+if test x_$withval = x_yes -o x_$withval != x_no; then
         { echo "$as_me:$LINENO: checking for libevent" >&5
 echo $ECHO_N "checking for libevent... $ECHO_C" >&6; }
         if test x_$withval = x_ -o x_$withval = x_yes; then

Lines 1-6 Link Here

(-)/usr/home/cherry/svk/ports/dns/unbound/pkg-plist (-1 / +1 lines)
1	etc/unbound/unbound.conf.sample	1	etc/unbound/unbound.conf.sample
2	include/unbound.h	2	include/unbound.h
3	lib/libunbound-0.11.so	3	lib/libunbound.so.0
4	lib/libunbound.so	4	lib/libunbound.so
5	lib/libunbound.la	5	lib/libunbound.la
6	lib/libunbound.a	6	lib/libunbound.a

Return to bug 123853

Line 0 Link Here

(-)/usr/home/cherry/svk/ports/dns/unbound/files/patch-configure (+20 lines)
	1	--- configure.orig 2008-05-20 15:37:02.000000000 +0900
	2	+++ configure 2008-05-21 17:26:09.000000000 +0900
	3	@@ -3299,7 +3299,7 @@
	4
	5	#
	6	# Determine configuration file
	7	-ub_conf_file=${sysconfdir}/unbound/unbound.conf
	8	+ub_conf_file=${sysconfdir}/unbound/unbound.conf.sample
	9
	10	# Check whether --with-conf_file was given.
	11	if test "${with_conf_file+set}" = set; then
	12	@@ -22125,7 +22125,7 @@
	13	withval="no"
	14	fi
	15
	16	-if test x_$withval == x_yes -o x_$withval != x_no; then
	17	+if test x_$withval = x_yes -o x_$withval != x_no; then
	18	{ echo "$as_me:$LINENO: checking for libevent" >&5
	19	echo $ECHO_N "checking for libevent... $ECHO_C" >&6; }
	20	if test x_$withval = x_ -o x_$withval = x_yes; then