Import of pkgsrc-2015Q1

net/unbound/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2014/03/12 16:16:00 pettai Exp $
+# $NetBSD: Makefile,v 1.36 2015/03/19 22:37:06 pettai Exp $
 
-DISTNAME=	unbound-1.4.22
+DISTNAME=	unbound-1.5.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.unbound.net/downloads/
 
@@ -9,13 +9,14 @@ HOMEPAGE=	http://www.unbound.net/
 COMMENT=	DNS resolver and recursive server
 LICENSE=	modified-bsd
 
-BUILD_DEFS+=	VARBASE
+BUILD_DEFS+=	VARBASE UNBOUND_USER UNBOUND_GROUP
+FILES_SUBST+=	UNBOUND_USER=${UNBOUND_USER} UNBOUND_GROUP=${UNBOUND_GROUP}
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
 CONFIGURE_ARGS+=	--with-libexpat=${BUILDLINK_PREFIX.expat}
-CONFIGURE_ARGS+=	--with-pidfile=${VARBASE}/run/unbound.pid
+CONFIGURE_ARGS+=	--with-pidfile=${VARBASE}/run/unbound/unbound.pid
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 CONFIGURE_ARGS+=	--enable-allsymbols
 

net/unbound/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.23 2014/03/12 16:16:00 pettai Exp $
+$NetBSD: distinfo,v 1.27 2015/03/19 22:37:06 pettai Exp $
 
-SHA1 (unbound-1.4.22.tar.gz) = a56e31e2f3a2fefa3caaad9200dd943d174ca81e
-RMD160 (unbound-1.4.22.tar.gz) = e9b4ded75308ac2f2ed9ae6783e29411428626fc
-Size (unbound-1.4.22.tar.gz) = 4735801 bytes
+SHA1 (unbound-1.5.3.tar.gz) = 9ae0d8270df4591559d54ee4d61c550526521ca3
+RMD160 (unbound-1.5.3.tar.gz) = 37c7b000aee6ca260467b83168f4dd13b1bffc4f
+Size (unbound-1.5.3.tar.gz) = 4821300 bytes

net/unbound/files/unbound.sh

@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: unbound.sh,v 1.2 2009/11/24 01:08:06 roy Exp $
+# $NetBSD: unbound.sh,v 1.4 2015/03/19 22:37:06 pettai Exp $
 #
 # PROVIDE: unbound
 # REQUIRE: DAEMON
@@ -12,8 +12,26 @@ name="unbound"
 rcvar=${name}
 
 command=@PREFIX@/sbin/${name}
-pidfile=/var/run/${name}.pid
+pidfile=/var/run/${name}/${name}.pid
+required_files="@PKG_SYSCONFDIR@/unbound.conf"
 extra_commands="reload"
+start_precmd="unbound_precmd"
 
-load_rc_config ${name}
-run_rc_command "$1"
+unbound_precmd()
+{
+	if [ ! -d @VARBASE@/run/unbound ]; then
+		@MKDIR@ @VARBASE@/run/unbound
+		@CHMOD@ 0750 @VARBASE@/run/unbound
+		@CHOWN@ @UNBOUND_USER@:@UNBOUND_GROUP@ @VARBASE@/run/unbound
+	fi
+}
+
+unbound_flags=${unbound_flags:-""}
+
+if [ -f /etc/rc.subr ]; then
+	load_rc_config ${name}
+	run_rc_command "$1"
+else
+	echo -n " ${name}"
+	${command} ${nsd_flags}
+fi