1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00

* Fixes problems with updating CUPS installation (Udo Schweigert)

* Fixes conflict with PHP5 when WITH_PHP is not enabled

PR:		99371
Submitted by:	maintainer
Tested by:	Beech Rintoul <beech@alaskaparadise.com>
This commit is contained in:
Ion-Mihai Tetcu 2006-06-24 08:14:19 +00:00
parent d5e35611a4
commit eb62356a3e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=166174
2 changed files with 8 additions and 5 deletions

View File

@ -9,7 +9,7 @@
PORTNAME= cups-base
PORTVERSION= 1.2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PORTVERSION}/ \
ftp://ftp.ntua.gr/pub/gnu/cups/${PORTVERSION}/ \
@ -72,6 +72,8 @@ LIB_DEPENDS+= gnutls-openssl.15:${PORTSDIR}/security/gnutls
.if defined(WITH_PHP)
CONFIGURE_ARGS+= --with-php
RUN_DEPENDS+= php:${PORTSDIR}/lang/php4
.else
CONFIGURE_ARGS+= --without-php
.endif
.if defined(WITH_PYTHON)
@ -147,10 +149,11 @@ pre-install:
post-install:
${MKDIR} ${CUPS_ETCDIR}
.ifdef CUPS_OVERWRITE_BASE
.if defined(CUPS_OVERWRITE_BASE)
${SH} ${PKGINSTALL} placeholder POST-INSTALL overwrite
.endif
.else
${SH} ${PKGINSTALL} placeholder POST-INSTALL
.endif
.for f in cupsd.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

View File

@ -11,9 +11,9 @@ REPLACES_BINARIES="/usr/bin/lpr
case $2 in
POST-INSTALL)
# Unshade binaries
if [ -n "${3}" ]; then
if [ "${3}" = "overwrite" ]; then
for FILE in ${REPLACES_BINARIES}; do
[ -e "${FILE}" ] && chmod 0 "${FILE}"
[ -e "${FILE}" ] && chmod -h 0 "${FILE}"
done
fi