Date: Fri, 23 Jun 2006 19:01:15 +0400 (MSD) From: Sergey Akifyev <asa@agava.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Udo.Schweigert@siemens.com, ahze@FreeBSD.org Subject: ports/99371: [maintainer] fix serious installation bugs in cups-base Message-ID: <20060623150115.A06D130915@agava.mipt.ru> Resent-Message-ID: <200606231510.k5NFANpe066957@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99371 >Category: ports >Synopsis: [maintainer] fix serious installation bugs in cups-base >Confidential: no >Severity: critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Jun 23 15:10:22 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Sergey Akifyev >Release: XXX >Organization: AGAVA Software Ltd. >Environment: XXX >Description: * Fixes problems with updating CUPS installation (Udo Schweigert) * Fixes conflict with PHP5 when WITH_PHP is not enabled >How-To-Repeat: >Fix: --- cups-base.diff begins here --- diff -ruN cups-base.orig/Makefile cups-base/Makefile --- cups-base.orig/Makefile Fri Jun 23 10:02:42 2006 +++ cups-base/Makefile Fri Jun 23 18:50:41 2006 @@ -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 @@ .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 @@ 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 -ruN cups-base.orig/pkg-install cups-base/pkg-install --- cups-base.orig/pkg-install Fri Jun 23 10:02:42 2006 +++ cups-base/pkg-install Fri Jun 23 18:42:12 2006 @@ -11,9 +11,9 @@ 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 --- cups-base.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060623150115.A06D130915>