diff options
| -rw-r--r-- | net/unbound/Makefile | 12 | ||||
| -rw-r--r-- | net/unbound/PLIST | 5 | ||||
| -rw-r--r-- | net/unbound/distinfo | 10 | ||||
| -rw-r--r-- | net/unbound/patches/patch-ac | 24 |
4 files changed, 32 insertions, 19 deletions
diff --git a/net/unbound/Makefile b/net/unbound/Makefile index 0d6dcc3c4a0..10db46ceeb7 100644 --- a/net/unbound/Makefile +++ b/net/unbound/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2008/10/09 01:31:35 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2008/12/17 18:14:01 joerg Exp $ -DISTNAME= unbound-1.0.2 +DISTNAME= unbound-1.1.1 CATEGORIES= net MASTER_SITES= http://www.unbound.net/downloads/ @@ -10,14 +10,13 @@ COMMENT= DNS resolver and recursive server PKG_DESTDIR_SUPPORT= user-destdir -# Strictly speaking this is tar in gzip in gzip, but using bsdtar is -# the easiest workaround. -EXTRACT_USING= bsdtar - GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= gmake +CONFIGURE_ARGS+= --with-ldns=${BUILDLINK_PREFIX.ldns} +CONFIGURE_ARGS+= --with-pidfile=${VARBASE}/run/unbound.pid + SUBST_CLASSES+= paths SUBST_STAGE.paths= post-configure SUBST_MESSAGE.paths= Fixing path names @@ -40,5 +39,6 @@ UNBOUND_GROUP?= unbound PKG_GROUPS= ${UNBOUND_GROUP} PKG_USERS= ${UNBOUND_USER}:${UNBOUND_GROUP} +.include "../../net/ldns/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/unbound/PLIST b/net/unbound/PLIST index 92afd77a5fd..63f7421bbfb 100644 --- a/net/unbound/PLIST +++ b/net/unbound/PLIST @@ -1,13 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/05/26 22:36:56 joerg Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/12/17 18:14:01 joerg Exp $ include/unbound.h lib/libunbound.la man/man1/unbound-host.1 man/man3/libunbound.3 man/man5/unbound.conf.5 man/man8/unbound-checkconf.8 +man/man8/unbound-control.8 man/man8/unbound.8 sbin/unbound sbin/unbound-checkconf +sbin/unbound-control +sbin/unbound-control-setup sbin/unbound-host share/examples/rc.d/unbound share/examples/unbound/unbound.conf diff --git a/net/unbound/distinfo b/net/unbound/distinfo index 49110331c4a..06686e87157 100644 --- a/net/unbound/distinfo +++ b/net/unbound/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2008/10/09 01:31:35 joerg Exp $ +$NetBSD: distinfo,v 1.3 2008/12/17 18:14:01 joerg Exp $ -SHA1 (unbound-1.0.2.tar.gz) = 93faa7b76cf7681b8c7b0c5187aaf84c36b6670b -RMD160 (unbound-1.0.2.tar.gz) = 1e942505468f6ae4061b208914e9b7feed6ecff1 -Size (unbound-1.0.2.tar.gz) = 3597275 bytes -SHA1 (patch-ac) = 05e1b84d9093ea6b2a5648117522fc288c611ba9 +SHA1 (unbound-1.1.1.tar.gz) = 8c80e892232a05459923826f266afb770d3f7d73 +RMD160 (unbound-1.1.1.tar.gz) = 08299a2f31a2a01c2d5819f63abc231015074af3 +Size (unbound-1.1.1.tar.gz) = 3754958 bytes +SHA1 (patch-ac) = 49d727258b41a3f7eafbed70173b24a3fd3a3e5e diff --git a/net/unbound/patches/patch-ac b/net/unbound/patches/patch-ac index 580e2c80811..b469f38af3a 100644 --- a/net/unbound/patches/patch-ac +++ b/net/unbound/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2008/10/09 01:31:35 joerg Exp $ +$NetBSD: patch-ac,v 1.3 2008/12/17 18:14:01 joerg Exp $ ---- Makefile.in.orig 2008-07-17 10:45:12.000000000 +0200 +--- Makefile.in.orig 2008-11-18 14:30:41.000000000 +0100 +++ Makefile.in -@@ -71,10 +71,9 @@ UNITTEST_SRC=$(patsubst $(srcdir)/%,%, \ +@@ -72,12 +72,11 @@ UNITTEST_SRC=$(patsubst $(srcdir)/%,%, \ testcode/readhex.c testcode/ldns-testpkts.c smallapp/worker_cb.c \ $(COMMON_SRC) UNITTEST_OBJ=$(addprefix $(BUILD),$(UNITTEST_SRC:.c=.lo)) $(COMPAT_OBJ) @@ -13,17 +13,20 @@ $NetBSD: patch-ac,v 1.2 2008/10/09 01:31:35 joerg Exp $ -CHECKCONF_SRC=smallapp/unbound-checkconf.c smallapp/worker_cb.c $(COMMON_SRC) +CHECKCONF_SRC=smallapp/unbound-checkconf.c smallapp/worker_cb.c CHECKCONF_OBJ=$(addprefix $(BUILD),$(CHECKCONF_SRC:.c=.lo)) $(COMPAT_OBJ) +-CONTROL_SRC=smallapp/unbound-control.c smallapp/worker_cb.c $(COMMON_SRC) ++CONTROL_SRC=smallapp/unbound-control.c smallapp/worker_cb.c + CONTROL_OBJ=$(addprefix $(BUILD),$(CONTROL_SRC:.c=.lo)) $(COMPAT_OBJ) HOST_SRC=smallapp/unbound-host.c HOST_OBJ=$(addprefix $(BUILD),$(HOST_SRC:.c=.lo)) $(COMPAT_OBJ) -@@ -149,17 +148,17 @@ else +@@ -153,21 +152,21 @@ else ldnslib= endif -unbound: $(DAEMON_OBJ) $(ldnslib) +unbound: $(DAEMON_OBJ) $(ldnslib) libunbound.la $(INFO) Link $@ -- $Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) $(LIBS) -+ $Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) libunbound.la $(LIBS) +- $Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) -lssl $(LIBS) ++ $Q$(LINK) -o $@ $(sort $(DAEMON_OBJ)) libunbound.la -lssl $(LIBS) -unbound-checkconf: $(CHECKCONF_OBJ) $(ldnslib) +unbound-checkconf: $(CHECKCONF_OBJ) $(ldnslib) libunbound.la @@ -31,7 +34,14 @@ $NetBSD: patch-ac,v 1.2 2008/10/09 01:31:35 joerg Exp $ - $Q$(LINK) -o $@ $(sort $(CHECKCONF_OBJ)) $(LIBS) + $Q$(LINK) -o $@ $(sort $(CHECKCONF_OBJ)) libunbound.la $(LIBS) - unbound-host: $(HOST_OBJ) libunbound.la $(ldnslib) +-unbound-control: $(CONTROL_OBJ) $(ldnslib) ++unbound-control: $(CONTROL_OBJ) $(ldnslib) libunbound.la + $(INFO) Link $@ +- $Q$(LINK) -o $@ $(sort $(CONTROL_OBJ)) -lssl $(LIBS) ++ $Q$(LINK) -o $@ $(sort $(CONTROL_OBJ)) libunbound.la -lssl $(LIBS) + +-unbound-host: $(HOST_OBJ) libunbound.la $(ldnslib) ++unbound-host: $(HOST_OBJ) libunbound.la $(ldnslib) libunbound.la $(INFO) Link $@ - $Q$(LINK) -o $@ $(sort $(HOST_OBJ)) -L. -L.libs -lunbound $(LIBS) + $Q$(LINK) -o $@ $(sort $(HOST_OBJ)) libunbound.la $(LIBS) |