Attachment 67431 Details for Bug 99371 – cups-base.diff

[patch] cups-base.diff

cups-base.diff (text/plain), 1.42 KB, created by Sergey Akifyev on 2006-06-23 16:10:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Akifyev

Created: 2006-06-23 16:10:22 UTC

Size: 1.42 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 99371: 67431