summaryrefslogtreecommitdiff
path: root/print/cups
diff options
context:
space:
mode:
Diffstat (limited to 'print/cups')
-rw-r--r--print/cups/Makefile22
-rw-r--r--print/cups/PLIST6
2 files changed, 12 insertions, 16 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index d5809027424..713b1938340 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2010/05/21 10:05:20 sbd Exp $
+# $NetBSD: Makefile,v 1.156 2010/05/23 09:44:12 sbd Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -82,6 +82,7 @@ BUILD_DEFS+= VARBASE
DOCDIR= ${PREFIX}/share/doc/cups
EGDIR= ${PREFIX}/share/examples/cups
+MIMEDIR= ${PREFIX}/share/cups/mime
PKG_SYSCONFSUBDIR= cups
CUPS_CONFDIR= ${PKG_SYSCONFDIR}
CUPS_LOGDIR= ${VARBASE}/log/cups
@@ -93,8 +94,7 @@ PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user
PKG_SHELL.${CUPS_USER}= ${SH}
CONF_FILES= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf
-CONF_FILES+= ${EGDIR}/mime.convs ${CUPS_CONFDIR}/mime.convs
-CONF_FILES+= ${EGDIR}/mime.types ${CUPS_CONFDIR}/mime.types
+CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf
RCD_SCRIPTS= cupsd
OWN_DIRS= ${CUPS_CONFDIR}
@@ -125,7 +125,7 @@ SUBST_MESSAGE.rpathfix= Adding rpath to cups-config.
SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
SUBST_STAGE.rpathfix= post-patch
-INSTALLATION_DIRS= ${DOCDIR} ${EGDIR}
+INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR}
INSTALL_ENV+= DSTROOT=${DESTDIR:Q}
pre-configure:
@@ -139,15 +139,11 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/$${file} \
${DESTDIR}${DOCDIR}/$${file}; \
done
- set -e; cd ${WRKSRC}/conf; for file in *.conf mime.convs mime.types; do \
- case $${file} in \
- pam.conf) \
- ;; \
- *) \
- ${INSTALL_DATA} $${file} \
- ${DESTDIR}${EGDIR}/$${file}; \
- ;; \
- esac; \
+ set -e; cd ${WRKSRC}/conf; for file in cupsd.conf snmp.conf ; do \
+ ${INSTALL_DATA} $${file} ${DESTDIR}${EGDIR}/$${file}; \
+ done
+ set -e; cd ${WRKSRC}/conf; for file in mime.convs mime.types; do \
+ ${INSTALL_DATA} $${file} ${DESTDIR}${MIMEDIR}/$${file}; \
done
.if !empty(PKG_OPTIONS:Mpam)
${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR}
diff --git a/print/cups/PLIST b/print/cups/PLIST
index 18c4d12d78e..552fa2b3c98 100644
--- a/print/cups/PLIST
+++ b/print/cups/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2010/05/21 10:05:20 sbd Exp $
+@comment $NetBSD: PLIST,v 1.31 2010/05/23 09:44:12 sbd Exp $
bin/cancel
bin/cups-config
bin/cupstestdsc
@@ -207,6 +207,8 @@ share/cups/fonts/Monospace
share/cups/fonts/Monospace-Bold
share/cups/fonts/Monospace-BoldOblique
share/cups/fonts/Monospace-Oblique
+share/cups/mime/mime.convs
+share/cups/mime/mime.types
share/cups/ppdc/epson.h
share/cups/ppdc/escp.h
share/cups/ppdc/font.defs
@@ -957,8 +959,6 @@ share/doc/cups/robots.txt
share/doc/cups/ru/index.html
${PLIST.pam}share/examples/cups/cups.pam
share/examples/cups/cupsd.conf
-share/examples/cups/mime.convs
-share/examples/cups/mime.types
share/examples/cups/snmp.conf
share/examples/rc.d/cupsd
share/locale/da/cups_da.po