diff options
| -rw-r--r-- | print/cups-base/Makefile | 8 | ||||
| -rw-r--r-- | print/cups-base/pkg-plist | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index f7b2172d4450..7ceca4c50d0a 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -37,6 +37,7 @@ CONFIGURE_ARGS+= --localstatedir=/var \ --with-icondir=${PREFIX}/share/icons \ --with-menudir=${DESKTOPDIR} \ --with-domainsocket=${CUPS_SOCKET} \ + --with-cachedir=${CUPS_CACHEDIR} \ --with-pam-module="unix" \ --enable-ssl @@ -54,6 +55,7 @@ OPTIONS?= GNUTLS "Build with GNUTLS library" on \ XDG_OPEN "Build with XDG_OPEN as browser" off CUPS_ETCDIR= ${PREFIX}/etc/cups +CUPS_CACHEDIR?= /var/db/cups CUPS_SPOOLDIR= /var/spool/cups CUPS_SOCKET?= /var/run/cups.sock WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} @@ -74,7 +76,7 @@ CUPS_SUFFIX= -client CUPS_SUFFIX= -image LICENSE= LGPL21 .else -PORTREVISION= 3 +PORTREVISION= 2 CUPS_SUFFIX= -base CONFLICTS+= cupsddk-* .endif @@ -107,6 +109,7 @@ LIB_DEPENDS+= cups.2:${PORTSDIR}/${PKGCATEGORY}/cups-client \ BUILD_DEPENDS+= ${LOCALBASE}/lib/libcups.a:${PORTSDIR}/${PKGCATEGORY}/cups-client COMMENT2= Server USE_RC_SUBR= cupsd +PLIST_SUB+= CACHEDIR="${CUPS_CACHEDIR}" .if ${ARCH} == "ia64" BROKEN= stack-protector not supported on ia64 .endif @@ -377,8 +380,7 @@ post-install: ${INSTALL} -d ${CUPS_SPOOLDIR}/tmp/ ${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}/ ${CHMOD} -R g+w ${CUPS_SPOOLDIR}/ - ${INSTALL} -d /var/cache/cups/ - ${CHOWN} root:${CUPSGRP} /var/cache/cups/ + ${INSTALL} -d -m 775 -g ${CUPSGRP} ${CUPS_CACHEDIR} .endif .if defined(CUPS_CLIENT) diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist index 31ff053c0eba..1ecbe0caf3ec 100644 --- a/print/cups-base/pkg-plist +++ b/print/cups-base/pkg-plist @@ -3,15 +3,15 @@ @unexec if pw usershow cups; then pw userdel cups; fi @exec mkdir -p /var/spool/cups/tmp || true @exec chown -R root:daemon /var/spool/cups -@exec mkdir -p /var/cache/cups || true -@exec chown root:cups /var/cache/cups +@exec mkdir -p %%CACHEDIR%% || true +@exec chown root:cups %%CACHEDIR%% +@exec chmod 775 %%CACHEDIR%% @exec mkdir -p /var/log/cups || true @exec chown cups:daemon /var/log/cups @exec mkdir -p %D/etc/cups/ppd || true @exec mkdir -p %D/etc/cups/interfaces || true @unexec rm -rf /var/spool/cups 2>/dev/null || true -@unexec rm -rf /var/cache/cups 2>/dev/null || true -@unexec rmdir /var/cache 2>/dev/null || true +@unexec rm -rf %%CACHEDIR%% 2>/dev/null || true @unexec rmdir /var/log/cups 2>/dev/null || true @unexec rmdir /var/run/cups/certs 2>/dev/null || true @unexec rmdir /var/run/cups 2>/dev/null || true |