[Midnightbsd-cvs] CVS Commit: print/cups-base: 1.2.10

[laffer1 at midnightbsd.org]

Log Message:
-----------
1.2.10

Modified Files:
--------------
    mports/print/cups-base:
        Makefile (r1.7 -> r1.8)
        distinfo (r1.4 -> r1.5)
        pkg-plist (r1.3 -> r1.4)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/print/cups-base/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lprint/cups-base/pkg-plist -Lprint/cups-base/pkg-plist -u -r1.3 -r1.4
--- print/cups-base/pkg-plist
+++ print/cups-base/pkg-plist
@@ -1,8 +1,15 @@
 @comment $MidnightBSD$
+ at exec if ! pw groupshow cups 2>/dev/null; then pw groupadd cups -g 193; fi
+ at exec if ! pw usershow cups 2>/dev/null; then pw useradd cups -g cups -u 193 -h - -d /nonexistent -s /usr/sbin/nologin -c "CUPS Owner"; fi
+ at unexec if pw usershow cups; then pw userdel cups; fi
 @exec mkdir -p /var/spool/cups/tmp || true
 @exec chown -R root:daemon /var/spool/cups
- at exec mkdir %D/etc/cups/ppd || true
- at exec mkdir %D/etc/cups/interfaces || true
+ at exec mkdir -p /var/cache/cups || true
+ at exec chown root:cups /var/cache/cups
+ at exec mkdir -p /var/log/cups || true
+ at exec chown cups:daemon /var/log/cups
+ at exec mkdir -p %D/etc/cups/ppd || true
+ at exec mkdir -p %D/etc/cups/interfaces || true
 @unexec rm -rf /var/spool/cups 2>/dev/null || true
 @unexec rm -rf /var/cache/cups 2>/dev/null || true
 @unexec rmdir /var/cache 2>/dev/null || true
@@ -18,6 +25,7 @@
 @unexec if cmp -s %D/etc/cups/mime.types.N %D/etc/cups/mime.types; then rm -f %D/etc/cups/mime.types; fi
 etc/cups/mime.types.N
 @exec if test ! -f %D/etc/cups/mime.types; then cp -p %D/etc/cups/mime.types.N %D/etc/cups/mime.types; fi
+ at exec chgrp cups %D/etc/cups
 bin/cupstestdsc
 bin/lp
 bin/cancel
@@ -1353,7 +1361,7 @@
 @dirrm %%DATADIR%%/templates/pl
 @dirrm %%DATADIR%%/templates/sv
 @dirrm %%DATADIR%%/templates
- at exec  mkdir -p %%DATADIR%%/profiles
+ at exec  mkdir -p %D/%%DATADIR%%/profiles
 @dirrm %%DATADIR%%/profiles
 @dirrmtry %%DATADIR%%/model
 @dirrm %%DATADIR%%/fonts
@@ -1365,7 +1373,7 @@
 @dirrm libexec/cups/notifier
 @dirrm libexec/cups/monitor
 @dirrmtry libexec/cups/filter
- at exec mkdir -p libexec/cups/driver
+ at exec mkdir -p %D/libexec/cups/driver
 @dirrm libexec/cups/driver
 @dirrm libexec/cups/daemon
 @dirrm libexec/cups/cgi-bin
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/cups-base/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lprint/cups-base/Makefile -Lprint/cups-base/Makefile -u -r1.7 -r1.8
--- print/cups-base/Makefile
+++ print/cups-base/Makefile
@@ -7,9 +7,8 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.2.9
+PORTVERSION=	1.2.10
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
 PKGNAMESUFFIX=	-base${PKGNAMESUFFIX2}
@@ -68,6 +67,7 @@
 LIB_DEPENDS+=		gnutls-openssl.13:${PORTSDIR}/security/gnutls
 .else
 CONFIGURE_ARGS+=	--disable-gnutls --enable-openssl
+.include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
 
 .if defined(WITH_PHP)
@@ -145,9 +145,10 @@
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
 pre-install:
-	@${ECHO_MSG} "===>" Stopping cupsd ...
-	-killall cupsd || ${TRUE}
 	@${INSTALL} -d ${DESKTOPDIR}/
+	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
 
 post-install:
 	${INSTALL} -d ${CUPS_ETCDIR}/
@@ -163,5 +164,7 @@
 	${INSTALL} -d ${CUPS_SPOOLDIR}/tmp/
 	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}/
 	${CHMOD} -R g+w ${CUPS_SPOOLDIR}/
+	${INSTALL} -d /var/cache/cups/
+	${CHOWN} root:${CUPSGRP} /var/cache/cups/
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/print/cups-base/distinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lprint/cups-base/distinfo -Lprint/cups-base/distinfo -u -r1.4 -r1.5
--- print/cups-base/distinfo
+++ print/cups-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (cups-1.2.9-source.tar.bz2) = 73433d7e8c04b66702732928aaf087b8
-SHA256 (cups-1.2.9-source.tar.bz2) = 9764a76adf41d72ad4142df8f8a0117507092623a58212a463dfb8a2dced7f09
-SIZE (cups-1.2.9-source.tar.bz2) = 3617594
+MD5 (cups-1.2.10-source.tar.bz2) = aad696a480b618e61bc7dab11623d3ac
+SHA256 (cups-1.2.10-source.tar.bz2) = 601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36
+SIZE (cups-1.2.10-source.tar.bz2) = 3618084