Make unbound an individual package

Ensure we keep all tags from mtrees when creating the METALOG

etc/Makefile

@@ -269,7 +269,7 @@ distribution:
 	    ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
 .if ${MK_UNBOUND} != "no"
 	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
-		${INSTALL_SYMLINK} ${TAG_ARGS} ../var/unbound ${DESTDIR}/etc/unbound; \
+		${INSTALL_SYMLINK} -T package=unbound ../var/unbound ${DESTDIR}/etc/unbound; \
 	fi
 .endif
 .if ${MK_SENDMAIL} != "no"
@@ -377,12 +377,11 @@ distrib-dirs: ${MTREES:N/*}
 		shift; \
 		d=$$1; \
 		test "$$d" == "/" && d=""; \
-		d=$d; \
+		d=$$d; \
 		shift; \
-		test -d $$d || mkdir -p $$d; \
-		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
+		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \
 		    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
-		${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \
+		${MTREE_CMD:N-W} -C -f $$m -K all | sed s#^\.#.$$d# | \
 		    ${METALOG.add} ; \
 	done; true
 .endif

etc/mtree/BSD.var.dist

@@ -97,8 +97,8 @@
         vi.recover      mode=01777
         ..
     ..
-    unbound         uname=unbound gname=unbound mode=0755
-        conf.d          uname=unbound gname=unbound mode=0755
+    unbound         uname=unbound gname=unbound mode=0755 tags=package=unbound
+        conf.d          uname=unbound gname=unbound mode=0755 tags=package=unbound
         ..
     ..
     yp

etc/rc.d/Makefile

@@ -2,6 +2,8 @@
 
 .include <src.opts.mk>
 
+FILESGROUPS=	FILES
+
 FILES=	DAEMON \
 	FILESYSTEMS \
 	LOGIN \
@@ -121,7 +123,6 @@ FILES=	DAEMON \
 	tmp \
 	${_ubthidhci} \
 	ugidfw \
-	${_unbound} \
 	${_utx} \
 	var \
 	watchdogd \
@@ -268,7 +269,8 @@ FILES+=		timed
 .endif
 
 .if ${MK_UNBOUND} != "no"
-_unbound=	local_unbound
+FILESGROUPS+=	UNBOUND
+UNBOUND+=	local_unbound
 .endif
 
 .if ${MK_UTMPX} != "no"
@@ -287,4 +289,8 @@ FILES+=		wpa_supplicant
 FILESDIR=	/etc/rc.d
 FILESMODE=	${BINMODE}
 
+UNBOUNDDIR=	/etc/rc.d
+UNBOUNDMODE=	${BINMODE}
+UNBOUNDPACKAGE=	unbound
+
 .include <bsd.prog.mk>

release/packages/unbound/+MANIFEST

@@ -0,0 +1,14 @@
+name = "FreeBSD-unbound"
+origin = "base"
+version = "%VERSION%"
+comment = "Validating, recursive, and caching DNS resolver"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD4CLAUSE ]
+desc = <<EOD
+Unbound is a recursive-only caching DNS server which can perform DNSSEC
+validation of results
+EOD

usr.sbin/unbound/Makefile.inc

@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 NO_WERROR= true
+PACKAGE=	unbound
 
 .include "../Makefile.inc"