Attachment 87269 Details for Bug 123853 – unbound-1.0.0.patch

[patch] unbound-1.0.0.patch

unbound-1.0.0.patch (text/plain), 4.95 KB, created by Tomoyuki Sakurai on 2008-05-21 10:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomoyuki Sakurai

Created: 2008-05-21 10:40:01 UTC

Size: 4.95 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/dns/unbound/Makefile /usr/home/cherry/svk/ports/dns/unbound/Makefile
>--- /usr/ports/dns/unbound/Makefile	2008-05-07 20:33:37.000000000 +0900
>+++ /usr/home/cherry/svk/ports/dns/unbound/Makefile	2008-05-21 18:30:14.000000000 +0900
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	unbound
>-PORTVERSION=	0.11
>-PORTREVISION=	2
>+PORTVERSION=	1.0.0
> CATEGORIES=	dns
> MASTER_SITES=	http://unbound.net/downloads/
> 
>@@ -15,10 +14,15 @@
> COMMENT=	A validating, recursive, and caching DNS resolver
> 
> USE_GMAKE=	yes
>+USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
>+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
> USE_LDCONFIG=	yes
> 
> USE_RC_SUBR=	unbound
>+PORTDOCS=	CREDITS Changelog FEATURES LICENSE README README.svn \
>+	README.tests TODO plan requirements.txt
> 
> MAN1=		unbound-host.1
> MAN3=		libunbound.3
>@@ -35,9 +39,19 @@
> 
> .if defined(WITH_LIBEVENT)
> LIB_DEPENDS+=	event:${PORTSDIR}/devel/libevent
>-CONFIGURE_ARGS+=	--with-libevent=${PREFIX}
>+CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE}
>+.else
>+CONFIGURE_ARGS+=	--with-libevent=no
> .endif
> 
>+# XXX broken, ldns in ports doesn't have ldns_buffer_copy()
>+# XXX use bundled ldns for now
>+# .if defined(WITH_LDNS)
>+# LIB_DEPENDS+=	ldns:${PORTSDIR}/dns/ldns
>+# CONFIGURE_ARGS+=	--with-ldns=${LOCALBASE}
>+# .else
>+# CONFIGURE_ARGS+=	--without-ldns
>+# .endif
> post-patch:
> 	@${REINPLACE_CMD} -e 's#/usr/local/etc/unbound/unbound.pid#/var/run/unbound/unbound.pid#' ${WRKSRC}/doc/example.conf ${WRKSRC}/doc/unbound.conf.5
> 
>@@ -46,5 +60,11 @@
> 
> post-install:
> 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>+.if !defined(NOPORTDOCS)
>+	${MKDIR} ${DOCSDIR}
>+.for F in ${PORTDOCS}
>+	( cd ${WRKSRC}/doc && ${INSTALL_DATA} ${F} ${DOCSDIR}/ )
>+.endfor
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/dns/unbound/distinfo /usr/home/cherry/svk/ports/dns/unbound/distinfo
>--- /usr/ports/dns/unbound/distinfo	2008-04-29 16:35:14.000000000 +0900
>+++ /usr/home/cherry/svk/ports/dns/unbound/distinfo	2008-05-21 18:30:14.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (unbound-0.11.tar.gz) = 2d698050a9ffd492b0abd37b5000680f
>-SHA256 (unbound-0.11.tar.gz) = f6c44ccae56398273c1f03485f2e2b8e4b612663d501d89c82c8cf9f23422d9f
>-SIZE (unbound-0.11.tar.gz) = 3543955
>+MD5 (unbound-1.0.0.tar.gz) = 05b7532c26e6005f7575d04fc44fb893
>+SHA256 (unbound-1.0.0.tar.gz) = 48e27905cb2cbde604252fbdd19dcd915a3b970c55f2ba2a033dac02048de1fe
>+SIZE (unbound-1.0.0.tar.gz) = 3554571
>diff -ruN --exclude=CVS /usr/ports/dns/unbound/files/patch-Makefile.in /usr/home/cherry/svk/ports/dns/unbound/files/patch-Makefile.in
>--- /usr/ports/dns/unbound/files/patch-Makefile.in	2008-05-14 20:31:30.000000000 +0900
>+++ /usr/home/cherry/svk/ports/dns/unbound/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2008-04-23 10:47:48.000000000 +0400
>-+++ Makefile.in	2008-04-25 18:42:04.000000000 +0400
>-@@ -273,7 +273,7 @@
>- 	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound.conf.5 $(mandir)/man5
>- 	$(INSTALL) -c -m 644 $(srcdir)/doc/unbound-host.1 $(mandir)/man1
>- 	$(INSTALL) -c -m 644 $(srcdir)/doc/libunbound.3 $(mandir)/man3
>--	if test ! -e $(configfile); then $(INSTALL) -d `dirname $(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(configfile); fi
>-+	$(INSTALL) -d `dirname $(configfile)`; $(INSTALL) -c -m 644 $(srcdir)/doc/example.conf $(configfile).sample
>- 	$(LIBTOOL) --mode=install cp $(srcdir)/libunbound/unbound.h $(includedir)/unbound.h
>- 	$(LIBTOOL) --mode=install cp libunbound.la $(libdir)
>- 	$(LIBTOOL) --mode=finish $(libdir)
>diff -ruN --exclude=CVS /usr/ports/dns/unbound/files/patch-configure /usr/home/cherry/svk/ports/dns/unbound/files/patch-configure
>--- /usr/ports/dns/unbound/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>+++ /usr/home/cherry/svk/ports/dns/unbound/files/patch-configure	2008-05-21 18:30:14.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- 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
>diff -ruN --exclude=CVS /usr/ports/dns/unbound/pkg-plist /usr/home/cherry/svk/ports/dns/unbound/pkg-plist
>--- /usr/ports/dns/unbound/pkg-plist	2008-04-29 16:35:14.000000000 +0900
>+++ /usr/home/cherry/svk/ports/dns/unbound/pkg-plist	2008-05-21 18:30:14.000000000 +0900
>@@ -1,6 +1,6 @@
> etc/unbound/unbound.conf.sample
> include/unbound.h
>-lib/libunbound-0.11.so
>+lib/libunbound.so.0
> lib/libunbound.so
> lib/libunbound.la
> lib/libunbound.a

Actions: View | Diff

Attachments on bug 123853: 87269