[Midnightbsd-cvs] mports: Makefile: Adjust cups base to solve some problems

[laffer1 at midnightbsd.org]

Log Message:
-----------
Adjust cups base to solve some problems

Modified Files:
--------------
    mports/print/cups-base:
        Makefile (r1.11 -> r1.12)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/cups-base/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -L print/cups-base/Makefile -L print/cups-base/Makefile -u -r1.11 -r1.12
--- print/cups-base/Makefile
+++ print/cups-base/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	cups
 PORTVERSION=	1.2.11
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
@@ -63,6 +63,12 @@
 
 .include <bsd.port.pre.mk>
 
+.if defined(CUPS_OVERWRITE_BASE)
+PLIST_SUB+=		OVERWRITE=""
+.else
+PLIST_SUB+=		OVERWRITE="@comment "
+.endif
+
 .if !defined(WITHOUT_GNUTLS)
 CONFIGURE_ARGS+=	--enable-gnutls --disable-openssl
 LIB_DEPENDS+=		gnutls-openssl.26:${PORTSDIR}/security/gnutls
@@ -150,14 +156,16 @@
 	if ! pw groupshow ${CUPSGRP}; then pw groupadd ${CUPSGRP} -g 193; fi
 	if ! pw usershow ${CUPSOWN}; then pw useradd ${CUPSOWN} -g ${CUPSGRP} -u 193 \
 		-h - -d ${NONEXISTENT} -s /usr/sbin/nologin -c "CUPS Owner"; fi
+.if defined(CUPS_OVERWRITE_BASE)
+	if test -e /usr/bin/lp; then chmod -h 0 /usr/bin/lp; fi
+	if test -e /usr/bin/lpq; then chmod -h 0 /usr/bin/lpq; fi
+	if test -e /usr/bin/lpr; then chmod -h 0 /usr/bin/lpr; fi
+	if test -e /usr/bin/lprm; then chmod -h 0 /usr/bin/lprm; fi
+	if test -e /usr/sbin/lpc; then chmod -h 0 /usr/sbin/lpc; fi
+.endif
 
 post-install:
 	${INSTALL} -d ${CUPS_ETCDIR}/
-.if defined(CUPS_OVERWRITE_BASE)
-	${SH} ${PKGINSTALL} placeholder POST-INSTALL overwrite
-.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