Revert r347356 and r347371

passwd related files need to be tagged as config file so pkg update
will attempt merging them when we install a new package.
We should use CONFS for that.
Revert for now until I come up with a better version of this patch as
it breaks pkgbase for users.

etc/Makefile

@@ -18,10 +18,15 @@ 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
@@ -58,20 +63,10 @@ distribution:
 	@echo "set DESTDIR before running \"make ${.TARGET}\""
 	@false
 .endif
-.if ${MK_SENDMAIL} != "no"
 	cd ${.CURDIR}; \
-	    ${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"\
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
-	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T "tags=package=runtime"\
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd ${DESTDIR}/etc;
 
 .if ${MK_TCSH} == "no"