- update to 1.30.0

Tested by:	Erik Van Benschoten

- sort plist

- fix pre-install for user
Submitted by:	brian (Brian Somers)

print/cups-base/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.2.12
+PORTVERSION=	1.3.0
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
@@ -36,10 +36,12 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--localstatedir=/var			\
 			--disable-pam				\
 			--disable-slp				\
+			--disable-gssapi			\
 			--with-cups-user=${CUPSOWN}		\
 			--with-cups-group=${CUPSGRP}		\
 			--with-system-groups=${CUPSSYSGRP}	\
 			--with-docdir=${DOCSDIR}		\
+			--with-icondir=${PREFIX}/share/icons	\
 			--with-domainsocket=${CUPS_SOCKET}
 
 OPTIONS=	GNUTLS		"Build with GNUTLS library" on \
@@ -127,12 +129,15 @@ MAN8=	accept.${MAN8EXT} \
 	cups-driverd.${MAN8EXT} \
 	cups-lpd.${MAN8EXT} \
 	cups-polld.${MAN8EXT} \
+	cupsctl.${MAN8EXT} \
 	cupsd.${MAN8EXT} \
 	cupsenable.${MAN8EXT} \
+	cupsfilter.${MAN8EXT} \
 	lpadmin.${MAN8EXT} \
 	lpinfo.${MAN8EXT} \
 	lpmove.${MAN8EXT} \
 	lpc.${MAN8EXT}
+
 MLINKS=	accept.${MAN8EXT} reject.${MAN8EXT} \
 	cupsenable.${MAN8EXT} cupsdisable.${MAN8EXT}
 
@@ -147,7 +152,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|CXX="$$CC"||g ; s|-lpthreads.*;|${PTHREAD_LIBS};|g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
-pre-install:
+pre-su-install:
 	@${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 \
@@ -162,7 +167,8 @@ pre-install:
 
 post-install:
 	${INSTALL} -d ${CUPS_ETCDIR}/
-.for f in cupsd.conf mime.convs mime.types
+	${CP} -p ${WRKSRC}/conf/snmp.conf ${WRKSRC}/conf/snmp.conf.N
+.for f in cupsd.conf mime.convs mime.types snmp.conf
 	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N
 	cd ${CUPS_ETCDIR}/; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi
 .endfor

print/cups-base/distinfo

@@ -1,3 +1,3 @@
-MD5 (cups-1.2.12-source.tar.bz2) = d410658468384b5ba5d04a808f6157fe
-SHA256 (cups-1.2.12-source.tar.bz2) = b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f
-SIZE (cups-1.2.12-source.tar.bz2) = 3788301
+MD5 (cups-1.3.0-source.tar.bz2) = ae2855d5d1ab5b5fcbb8a2613cefec14
+SHA256 (cups-1.3.0-source.tar.bz2) = 55f974f3086e4a4cf438e7d69b6f08015ae86f5f208b16feca7614c3ff1b30da
+SIZE (cups-1.3.0-source.tar.bz2) = 4022669

print/cups-base/files/patch-CVE-2007-3387

@@ -1,23 +0,0 @@
---- pdftops/Stream.cxx.orig	2006-02-13 04:08:11.000000000 +0100
-+++ pdftops/Stream.cxx	2007-07-31 15:05:53.000000000 +0200
-@@ -411,15 +411,13 @@
-   ok = gFalse;
- 
-   nVals = width * nComps;
--  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
--      nComps >= INT_MAX / nBits ||
--      width >= INT_MAX / nComps / nBits ||
--      nVals * nBits + 7 < 0) {
--    return;
--  }
-   pixBytes = (nComps * nBits + 7) >> 3;
-   rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
--  if (rowBytes <= 0) {
-+  if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-+      nComps > gfxColorMaxComps ||
-+      nBits > 16 ||
-+      width >= INT_MAX / nComps ||      // check for overflow in nVals 
-+      nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes
-     return;
-   }
-   predLine = (Guchar *)gmalloc(rowBytes);

print/cups-base/files/patch-Makefile

@@ -1,11 +0,0 @@
---- Makefile.orig	Tue Aug 29 17:51:19 2006
-+++ Makefile	Sun Jan 14 10:44:39 2007
-@@ -141,8 +141,6 @@
- 	fi
- 	if test -d /usr/share/applications; then \
- 		echo Installing desktop icons...; \
--		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/applications; \
--		$(INSTALL_DATA) desktop/cups.desktop $(BUILDROOT)/usr/share/applications; \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps; \
- 		$(INSTALL_DATA) desktop/cups-16.png $(BUILDROOT)/usr/share/icons/hicolor/16x16/apps/cups.png; \
- 		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/32x32/apps; \