diff options
| author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-06-24 08:14:19 +0000 |
|---|---|---|
| committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2006-06-24 08:14:19 +0000 |
| commit | eb62356a3eca5d7e3dc36881aea116bbf54492ff (patch) | |
| tree | 3aa84989c67980705c0566066c292f9e16cf2412 | |
| parent | Last commit should read : (diff) | |
* 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>
Notes
Notes:
svn path=/head/; revision=166174
| -rw-r--r-- | print/cups-base/Makefile | 9 | ||||
| -rw-r--r-- | print/cups-base/pkg-install | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index d59dae9258b3..8735898d108c 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -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 diff --git a/print/cups-base/pkg-install b/print/cups-base/pkg-install index aa32fa690b53..98814ed9ff28 100644 --- a/print/cups-base/pkg-install +++ b/print/cups-base/pkg-install @@ -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 |