conf/144442: [PATCH] remove unnecessary group and passwd entries for new DESTDIRS // mergemaster

Garrett Cooper gcooper at FreeBSD.org
Wed Mar 3 09:20:03 UTC 2010


    Might help if I actually provided the patch. Heh.
Cheers,
-Garrett
-------------- next part --------------
Index: head/etc/Makefile
===================================================================
--- head/etc/Makefile	(revision 204532)
+++ head/etc/Makefile	(working copy)
@@ -148,11 +148,51 @@
 PWD_MKDB_ENDIAN?=
 .endif
 
-distribution:
+${DESTDIR}/etc/group:
+	cd ${.CURDIR}; \
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.TARGET:T} ${.TARGET}
+.if ${MK_BIND} == "no"
+	sed -i "" -e ';^bind:;d' ${.TARGET}
+.endif
+.if ${MK_GAMES} == "no"
+	sed -i "" -e ';^games:;d' ${.TARGET}
+.endif
+.if ${MK_MAIL} == "no"
+	sed -i "" -e ';^mail:;d' ${.TARGET}
+.endif
+.if ${MK_MAN} == "no"
+	sed -i "" -e ';^man:;d' ${.TARGET}
+.endif
+.if ${MK_SENDMAIL} == "no"
+	sed -i "" -e ';^mailnull:;d' -e ';^ssmsp:;d' ${.TARGET}
+.endif
+
+${DESTDIR}/etc/master.passwd:
+	cd ${.CURDIR}; \
+	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 ${.TARGET:T} ${.TARGET}
+.if ${MK_BIND} == "no"
+	sed -i "" -e ';^bind:;d' ${.TARGET}
+.endif
+.if ${MK_GAMES} == "no"
+	sed -i "" -e ';^games:;d' ${.TARGET}
+.endif
+.if ${MK_MAIL} == "no"
+	sed -i "" -e ';^pop:;d' ${.TARGET}
+.endif
+.if ${MK_MAN} == "no"
+	sed -i "" -e ';^man:;d' ${.TARGET}
+.endif
+.if ${MK_SENDMAIL} == "no"
+	sed -i "" -e ';^mailnull:;d' -e ';^ssmsp:;d' ${.TARGET}
+.endif
+
+distribution: 
 .if !defined(DESTDIR)
 	@echo "set DESTDIR before running \"make ${.TARGET}\""
 	@false
 .endif
+	${MAKE} DESTDIR=${DESTDIR} ${DESTDIR}/etc/group
+	${MAKE} DESTDIR=${DESTDIR} ${DESTDIR}/etc/passwd
 	cd ${.CURDIR}; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
@@ -160,7 +200,7 @@
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
 		${BIN2} ${DESTDIR}/etc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
-		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+		nsmb.conf opieaccess ${DESTDIR}/etc;
 .if ${MK_TCSH} == "no"
 	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
 .endif


More information about the freebsd-bugs mailing list