- Update to 1.1.23

- Build with GNUTLS isntead of OpenSSL by default to fix FireFox issues
- Fixed man languages
- Change maintainer e-mail
- Pass maintainership of print/cups to submitter

PR:		ports/76337
Submitted by:	Sergey Akifyev <asa(at)agava.com> (maintainer of cups-base and cups-lpr)

10 files changed, 20 insertions, 95 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 724eadf..c57077f 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -14,13 +14,13 @@ PORTEPOCH=	${CUPS_PORTEPOCH}
 CATEGORIES=	print
 MASTER_SITES=	${CUPS_MASTER_SITES}
 
-MAINTAINER=	asa@gascom.ru
+MAINTAINER=	asa@agava.com
 COMMENT=	The Common UNIX Printing System: headers, libs, & daemons
 
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
-MANLANG=	""
+MANLANG=	"" es fr
 
 post-patch:
 	@${REINPLACE_CMD} -e '/SILENT/d' \
diff --git a/print/cups-base/files/manpages.mk b/print/cups-base/files/manpages.mk
index 23d459d..f0e2210 100644
--- a/print/cups-base/files/manpages.mk
+++ b/print/cups-base/files/manpages.mk
@@ -1,6 +1,5 @@
 MAN1+=	backend.1
 MAN1+=	cups-config.1
-MAN1+=	cupstestppd.1
 MAN1+=	filter.1
 MAN5+=	classes.conf.5
 MAN5+=	cupsd.conf.5
@@ -9,5 +8,4 @@ MAN5+=	mime.types.5
 MAN5+=	printers.conf.5
 MAN8+=	cups-lpd.8
 MAN8+=	cups-polld.8
-MAN8+=	cupsaddsmb.8
 MAN8+=	cupsd.8
diff --git a/print/cups-base/files/patch-hpgl-input.c b/print/cups-base/files/patch-hpgl-input.c
deleted file mode 100644
index 9483b57..0000000
--- a/print/cups-base/files/patch-hpgl-input.c
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: hpgl-input.c
-===================================================================
-RCS file: /development/cvs/cups/filter/hpgl-input.c,v
-retrieving revision 1.16
-diff -u -r1.16 hpgl-input.c
---- filter/hpgl-input.c	25 Feb 2004 20:14:52 -0000	1.16
-+++ filter/hpgl-input.c	16 Dec 2004 19:38:12 -0000
-@@ -54,7 +54,8 @@
- 		ch,		/* Current char */
- 		done,		/* Non-zero when the current command is read */
- 		i;		/* Looping var */
--  char		buf[262144];	/* String buffer */
-+  char		buf[262144],	/* String buffer */
-+		*bufptr;	/* Pointer into buffer */
-   static param_t p[MAX_PARAMS];	/* Parameter buffer */
- 
- 
-@@ -128,9 +129,12 @@
- 
-   if (strcasecmp(name, "LB") == 0)
-   {
--    for (i = 0; (ch = getc(fp)) != StringTerminator; i ++)
--      buf[i] = ch;
--    buf[i] = '\0';
-+    bufptr = buf;
-+    while ((ch = getc(fp)) != StringTerminator)
-+      if (bufptr < (buf + sizeof(buf) - 1))
-+        *bufptr++ = ch;
-+    *bufptr = '\0';
-+
-     p[num_params].type         = PARAM_STRING;
-     p[num_params].value.string = strdup(buf);
-     num_params ++;
-@@ -155,11 +159,12 @@
-   }
-   else if (strcasecmp(name, "PE") == 0)
-   {
--    for (i = 0; i < (sizeof(buf) - 1); i ++)
--      if ((buf[i] = getc(fp)) == ';')
--        break;
-+    bufptr = buf;
-+    while ((ch = getc(fp)) != ';')
-+      if (bufptr < (buf + sizeof(buf) - 1))
-+        *bufptr++ = ch;
-+    *bufptr = '\0';
- 
--    buf[i] = '\0';
-     p[num_params].type         = PARAM_STRING;
-     p[num_params].value.string = strdup(buf);
-     num_params ++;
diff --git a/print/cups-base/files/patch-man-Makefile.common b/print/cups-base/files/patch-man-Makefile.common
index cb91a51..c5cc7a6 100644
--- a/print/cups-base/files/patch-man-Makefile.common
+++ b/print/cups-base/files/patch-man-Makefile.common
@@ -1,9 +1,10 @@
---- man/Makefile.common.orig	Thu May 27 11:51:30 2004
-+++ man/Makefile.common	Sun Nov 14 17:14:24 2004
-@@ -29,57 +29,16 @@
+--- man/Makefile.common.orig	Thu May 27 22:51:30 2004
++++ man/Makefile.common	Mon Jan 24 13:28:43 2005
+@@ -28,58 +28,16 @@
+ 
  MAN1	=	backend.man \
  		cups-config.man \
- 		cupstestppd.man \
+-		cupstestppd.man \
 -		filter.man \
 -		lp.man \
 -		lpoptions.man \
@@ -20,7 +21,7 @@
  		printers.conf.man
 -MAN8	=	accept.man \
 -		cupsaddsmb.man \
-+MAN8	=	cupsaddsmb.man \
++MAN8	=	\
  		cups-lpd.man \
  		cups-polld.man \
 -		cupsd.man \
diff --git a/print/cups-base/files/patch-pdftops-Gfx.cc b/print/cups-base/files/patch-pdftops-Gfx.cc
deleted file mode 100644
index 5ec60d9..0000000
--- a/print/cups-base/files/patch-pdftops-Gfx.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ruN pdftops/Gfx.cxx /home/josef//temp/pdftops/Gfx.cxx
---- pdftops/Gfx.cxx	Fri Apr  9 22:18:31 2004
-+++ /home/josef//temp/pdftops/Gfx.cxx	Fri Dec 24 20:21:32 2004
-@@ -2655,7 +2655,9 @@
-     haveMask = gFalse;
-     dict->lookup("Mask", &maskObj);
-     if (maskObj.isArray()) {
--      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-+      for (i = 0;
-+	  i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-+	  ++i) {
- 	maskObj.arrayGet(i, &obj1);
- 	maskColors[i] = obj1.getInt();
- 	obj1.free();
-diff -ruN pdftops/GfxState.cxx /home/josef//temp/pdftops/GfxState.cxx
---- pdftops/GfxState.cxx	Mon Feb  2 23:41:09 2004
-+++ /home/josef//temp/pdftops/GfxState.cxx	Fri Dec 24 20:21:32 2004
-@@ -708,6 +708,11 @@
-   }
-   nCompsA = obj2.getInt();
-   obj2.free();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "ICCBased color space with too many (%d > %d) components",
-+    nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   if (dict->lookup("Alternate", &obj2)->isNull() ||
-       !(altA = GfxColorSpace::parse(&obj2))) {
-     switch (nCompsA) {
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 3639033..334295f 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -1,6 +1,6 @@
 @exec /bin/echo "===>" Stopping cupsd ...
 @exec /usr/bin/killall cupsd || true
-@exec /bin/rm -fr %D/etc/cups/certs/* 2>/dev/null || true
+@exec /bin/rmdir %D/etc/cups/certs/* > /dev/null 2>&1 || true
 bin/cups-config
 @unexec if cmp -s %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; then rm -f %D/etc/cups/classes.conf; fi
 etc/cups/classes.conf.N
diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile
index 2c2f462..a98614a 100644
--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@@ -14,12 +14,12 @@ PORTEPOCH=	${CUPS_PORTEPOCH}
 CATEGORIES=	print
 MASTER_SITES=	${CUPS_MASTER_SITES}
 
-MAINTAINER=	asa@gascom.ru
+MAINTAINER=	asa@agava.com
 COMMENT=	The CUPS BSD and system V compatibility binaries (lp* commands)
 
 USE_REINPLACE=	yes
 
-MANLANG=	""
+MANLANG=	"" es fr
 
 .ifndef CUPS_OVERWRITE_BASE
 PKGINSTALL=	nonexistent
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 0dff075..78f6157 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	asa@agava.com
 COMMENT=	The Common UNIX Printing System: Metaport to install complete system
 
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common
index 0a52302..01ec650 100644
--- a/print/cups/Makefile.common
+++ b/print/cups/Makefile.common
@@ -9,7 +9,7 @@ CUPS_MASTER_SITES=\
   ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
   ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
 
-CUPS_VERSION=	1.1.22
+CUPS_VERSION=	1.1.23
 CUPS_REVISION=	0
 CUPS_PORTVER=	${CUPS_VERSION}.${CUPS_REVISION}
 CUPS_PORTREV=	0
@@ -72,6 +72,11 @@ CONFIGURE_ARGS+=	--localstatedir=/var		\
 			--with-docdir=${CUPS_DOCSDIR}	\
 			--with-rcdir=${CUPS_RCDIR}
 
+.if !defined(WITHOUT_GNUTLS)
+CONFIGURE_ARGS+=	--enable-gnutls
+LIB_DEPENDS+=		gnutls-openssl.12:${PORTSDIR}/security/gnutls
+.endif
+
 CONFIGURE_ARGS+=	CPPFLAGS="-I.. -I${LOCALBASE}/include"
 CONFIGURE_ARGS+=	DSOFLAGS="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib"
 CONFIGURE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 8ae69ef4..67d487f 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,2 +1,2 @@
-MD5 (cups-1.1.22-source.tar.bz2) = fe0a1b0fedccfe8b2e35e0cea1e5f0a9
-SIZE (cups-1.1.22-source.tar.bz2) = 8527045
+MD5 (cups-1.1.23-source.tar.bz2) = 4ce09b1dce09b6b9398af0daae9adf63
+SIZE (cups-1.1.23-source.tar.bz2) = 8705521