aboutsummaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorVolker Stolz <vs@FreeBSD.org>2004-08-12 13:38:26 +0000
committerVolker Stolz <vs@FreeBSD.org>2004-08-12 13:38:26 +0000
commitaf0214e2fe5fb048e4ece95568c0e83be9bdf784 (patch)
tree85376db5759c345d9962b6b3e88a7fc702e4dcbd /print
parent509afa1e6a34aa63a9cfc80b28e0b90c7f1897cd (diff)
Notes
Diffstat (limited to 'print')
-rw-r--r--print/cups-base/Makefile5
-rw-r--r--print/cups-base/pkg-plist8
2 files changed, 7 insertions, 6 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index e7ed8032e077..dc12c45851c0 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -40,13 +40,10 @@ pre-install:
post-install:
${MKDIR} ${CUPS_ETCDIR}
-.for f in classes.conf client.conf cupsd.conf printers.conf
+.for f in classes.conf client.conf cupsd.conf printers.conf mime.convs mime.types
${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N
cd ${CUPS_ETCDIR}; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi
.endfor # classes.conf client.conf cupsd.conf printers.conf
-.for f in mime.convs mime.types
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}
-.endfor # mime.convs mime.types
cd ${CUPS_RCDIR}; ${MV} cups cups.sh.sample
${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
${MKDIR} ${CUPS_SPOOLDIR} ${CUPS_SPOOLDIR}/tmp
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 669447dbdf71..bc237dbb0f63 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -11,8 +11,12 @@ etc/cups/client.conf.N
@unexec if cmp -s %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; then rm -f %D/etc/cups/cupsd.conf; fi
etc/cups/cupsd.conf.N
@exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi
-etc/cups/mime.convs
-etc/cups/mime.types
+@unexec if cmp -s %D/etc/cups/mime.convs.N %D/etc/cups/mime.convs; then rm -f %D/etc/cups/mime.convs; fi
+etc/cups/mime.convs.N
+@exec if test ! -f %D/etc/cups/mime.convs; then cp -p %D/etc/cups/mime.convs.N %D/etc/cups/mime.convs; fi
+@unexec if cmp -s %D/etc/cups/mime.types.N %D/etc/cups/mime.types; then rm -f %D/etc/cups/mime.types; fi
+etc/cups/mime.types.N
+@exec if test ! -f %D/etc/cups/mime.types; then cp -p %D/etc/cups/mime.types.N %D/etc/cups/mime.types; fi
@unexec if cmp -s %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; then rm -f %D/etc/cups/printers.conf; fi
etc/cups/printers.conf.N
@exec if test ! -f %D/etc/cups/printers.conf; then cp -p %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; fi