diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2011-03-07 20:43:15 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2011-03-07 20:43:15 +0000 |
| commit | 979cff51ce48ee9c99e9eb480c3ae19d92537f76 (patch) | |
| tree | 2fb57fd9821bb876c287db470ef0812cee509a7e /print | |
| parent | d8f224ac12f055066cab9663322367d01d6ff341 (diff) | |
| download | ports-979cff51ce48ee9c99e9eb480c3ae19d92537f76.tar.gz ports-979cff51ce48ee9c99e9eb480c3ae19d92537f76.zip | |
- preserve modified etc/pam.d/cups
PR: 155218
Sumbitted by: mm
Notes
Notes:
svn path=/head/; revision=270467
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups-base/Makefile | 6 | ||||
| -rw-r--r-- | print/cups-base/files/patch-conf-Makefile | 16 | ||||
| -rw-r--r-- | print/cups-base/pkg-plist | 4 |
3 files changed, 25 insertions, 1 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 80cc315301b9..88e47d3f77d8 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -362,6 +362,12 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N cd ${CUPS_ETCDIR}/; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi .endfor +.if defined(WITH_PAM) + @if [ ! -f ${PREFIX}/etc/pam.d/cups ]; then \ + ${CP} -p ${PREFIX}/etc/pam.d/cups.default \ + ${PREFIX}/etc/pam.d/cups ; \ + fi +.endif ${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKDIR}/ulpt-cupsd.conf ${EXAMPLESDIR}/ ${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${PREFIX}/sbin/ diff --git a/print/cups-base/files/patch-conf-Makefile b/print/cups-base/files/patch-conf-Makefile new file mode 100644 index 000000000000..73633ede5244 --- /dev/null +++ b/print/cups-base/files/patch-conf-Makefile @@ -0,0 +1,16 @@ +--- conf/Makefile.orig 2011-03-03 00:19:41.555484014 +0100 ++++ conf/Makefile 2011-03-03 00:20:17.791387420 +0100 +@@ -90,10 +90,10 @@ + done + -if test x$(PAMDIR) != x; then \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ +- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ +- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ ++ if test -r $(BUILDROOT)$(PAMDIR)/cups.default ; then \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.default.N ; \ + else \ +- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.default ; \ + fi ; \ + fi + diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist index f6deb9be5af0..7c26a5d4c95f 100644 --- a/print/cups-base/pkg-plist +++ b/print/cups-base/pkg-plist @@ -38,7 +38,9 @@ etc/cups/mime.types.N etc/cups/snmp.conf.N @exec if test ! -f %D/etc/cups/snmp.conf; then cp -p %D/etc/cups/snmp.conf.N %D/etc/cups/snmp.conf; fi @exec chgrp cups %D/etc/cups -%%WITH_PAMD%%etc/pam.d/cups +@unexec if cmp -s %D/etc/pam.d/cups.default %D/etc/pam.d/cups; then rm -f %D/etc/pam.d/cups ; fi +%%WITH_PAMD%%etc/pam.d/cups.default +@exec if [ ! -f %D/etc/pam.d/cups ] ; then cp -p %D/%F %B/cups; fi bin/cancel bin/cupstestdsc bin/cupstestppd |