d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r347356 and r347371

Browse Source 
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.
This commit is contained in:
Emmanuel Vadot 2019-05-13 12:38:33 +00:00
parent 740d4c7c9f
commit eb4c63f731
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=347522
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etc/Makefile
View File

@ -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"