Date: Wed, 3 Mar 2010 00:53:37 -0800 From: Garrett Cooper <gcooper@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org, freebsd-bugs@freebsd.org Subject: Re: conf/144442: [PATCH] remove unnecessary group and passwd entries for new DESTDIRS // mergemaster Message-ID: <364299f41003030053r658d4b5la1121bddbee8cb53@mail.gmail.com> In-Reply-To: <201003030800.o2380CFK085387@freefall.freebsd.org> References: <201003030757.o237vbCB060056@www.freebsd.org> <201003030800.o2380CFK085387@freefall.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
Might help if I actually provided the patch. Heh.
Cheers,
-Garrett
[-- Attachment #2 --]
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
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?364299f41003030053r658d4b5la1121bddbee8cb53>