1 files changed, 13 insertions, 7 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 4714b580cc82..b1d4f51a1b97 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -18,15 +18,10 @@ BIN1=	\
 	group \
 	login.access \
 	rc.bsdextended \
-	rc.firewall \
 	termcap.small
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_SENDMAIL} != "no"
-BIN1+=	rc.sendmail
-.endif
-
 .if ${MK_SENDMAIL} == "no"
 ETCMAIL=mailer.conf aliases
 .else
@@ -63,10 +58,20 @@ distribution:
 	@echo "set DESTDIR before running \"make ${.TARGET}\""
 	@false
 .endif
+.if ${MK_SENDMAIL} != "no"
 	cd ${.CURDIR}; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "tags=package=sendmail"\
+		rc.sendmail ${DESTDIR}/etc;
+.endif
+.if ${MK_IPFW} != "no"
+	cd ${.CURDIR}; \
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "tags=package=ipfw"\
+		rc.firewall ${DESTDIR}/etc;
+.endif
+	cd ${.CURDIR}; \
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T "tags=package=runtime"\
 		${BIN1} ${DESTDIR}/etc; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T "tags=package=runtime"\
 		master.passwd ${DESTDIR}/etc;
 
 .if ${MK_TCSH} == "no"
@@ -78,6 +83,7 @@ distribution:
 		echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
+
 	) | ${METALOG.add}
 .endif
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install