[Midnightbsd-cvs] mports [15489] U trunk/print/cups-base: Update cups to 1.5.4

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 21 16:52:05 EDT 2013 

Revision: 15489
          http://svnweb.midnightbsd.org/mports/?rev=15489
Author:   laffer1
Date:     2013-09-21 16:52:04 -0400 (Sat, 21 Sep 2013)
Log Message:
-----------
Update cups to 1.5.4

Modified Paths:
--------------
    trunk/print/cups-base/Makefile
    trunk/print/cups-base/distinfo
    trunk/print/cups-base/files/cupsd.in
    trunk/print/cups-base/files/patch-configure
    trunk/print/cups-base/files/ulpt-cupsd.conf.in
    trunk/print/cups-base/files/ulpt-cupsd.sh.in
    trunk/print/cups-base/pkg-plist

Added Paths:
-----------
    trunk/print/cups-base/files/patch-cups-request.c

Removed Paths:
-------------
    trunk/print/cups-base/files/patch-str3914

Property Changed:
----------------
    trunk/print/cups-base/distinfo
    trunk/print/cups-base/files/cupsd.in
    trunk/print/cups-base/files/patch-Makefile
    trunk/print/cups-base/files/patch-conf-Makefile
    trunk/print/cups-base/files/patch-configure
    trunk/print/cups-base/files/patch-cups.pam
    trunk/print/cups-base/files/ulpt-cupsd.conf.in
    trunk/print/cups-base/files/ulpt-cupsd.sh.in
    trunk/print/cups-base/pkg-plist

Modified: trunk/print/cups-base/Makefile
===================================================================
--- trunk/print/cups-base/Makefile	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/Makefile	2013-09-21 20:52:04 UTC (rev 15489)
@@ -1,9 +1,8 @@
 # $MidnightBSD$
-# $FreeBSD: ports/print/cups-base/Makefile,v 1.167 2011/10/19 17:31:07 dinoex Exp $
 
 PORTNAME=	cups
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.5.4
+PORTREVISION=	0
 DISTVERSIONSUFFIX=	-source
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
@@ -12,6 +11,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Common UNIX Printing System: ${COMMENT2}
+
 LICENSE=	gpl2
 
 CONFLICTS=	LPRng-[0-9]*
@@ -40,23 +40,11 @@
 			--with-pam-module="unix"		\
 			--enable-ssl
 
-OPTIONS?=	GNUTLS		"Build with GNUTLS instead of OpenSSL" on \
-		PHP		"Build PHP support" off \
-		PYTHON		"Build PYTHON support" off \
-		LIBPAPER	"Build with libpaper support" off \
-		DNSSD		"Build with DNS_SD (avahi) support" off \
-		PAM		"Build with PAM support" off \
-		LDAP		"Build with LDAP support" off \
-		DBUS		"Build with DBUS support" off \
-		LIBUSB		"Build with USB support" off \
-		GHOSTSCRIPT	"Build pdftops with GHOSTSCRIPT" on \
-		XPDF		"Build pdftops with XPDF" off \
-		XDG_OPEN	"Build with XDG_OPEN as browser" off
-
 CUPS_ETCDIR=	${PREFIX}/etc/cups
 CUPS_CACHEDIR?=	/var/db/cups
 CUPS_SPOOLDIR=	/var/spool/cups
 CUPS_SOCKET?=	/var/run/cups.sock
+CUPS_PDFTOPS?=	${LOCALBASE}/libexec/xpdf/pdftops
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 # file, dir ownership
@@ -69,23 +57,36 @@
 
 # UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
 .if defined(CUPS_CLIENT)
-LICENSE=	lgpl
+PORTREVISION=	0
+LICENSE=	lgpl2.1
 CUPS_SUFFIX=	-client
+OPTIONS_DEFINE=	GNUTLS
 .elif defined(CUPS_IMAGE)
+PORTREVISION=	0
 CUPS_SUFFIX=	-image
-LICENSE=	lgpl
+LICENSE=	lgpl2.1
+OPTIONS_DEFINE=	GNUTLS
 .else
+INSTALLS_ICONS=	yes
 PORTREVISION=	0
 CUPS_SUFFIX=	-base
-CONFLICTS+=	cupsddk-*
+OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM LDAP DBUS LIBUSB XDG_OPEN GHOSTSCRIPT XPDF AVAHI MDNSRESPONDER
+OPTIONS_DEFAULT=	LIBPAPER GHOSTSCRIPT
+NO_OPTIONS_SORT=	yes
 .endif
 
-.include <bsd.port.pre.mk>
+LIBUSB_DESC=		USB support
+GHOSTSCRIPT_DESC=	Build pdftops with GHOSTSCRIPT
+XPDF_DESC=		Build pdftops with XPDF
+XDG_OPEN_DESC=		Build with XDG_OPEN as browser
 
+.include <bsd.mport.options.mk>
+
 .if defined(CUPS_CLIENT)
 COMMENT2=	Library cups
 INSTALL_WRKSRC=	${WRKSRC}/cups
 PLIST=		${MASTERDIR}/pkg-plist.client
+USES+=		iconv
 USE_LDCONFIG=	yes
 PKGMESSAGE=	${NONEXISTENT}
 DESCR=		${MASTERDIR}/pkg-descr.client
@@ -104,8 +105,8 @@
 PKGMESSAGE=	${NONEXISTENT}
 DESCR=		${MASTERDIR}/pkg-descr.image
 .else
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/${PKGCATEGORY}/cups-client
-LIB_DEPENDS+=	cupsimage.2:${PORTSDIR}/${PKGCATEGORY}/cups-image
+LIB_DEPENDS+=	cups:${PORTSDIR}/${PKGCATEGORY}/cups-client
+LIB_DEPENDS+=	cupsimage:${PORTSDIR}/${PKGCATEGORY}/cups-image
 # force build if old cups is installed.
 BUILD_DEPENDS+=	cups-client${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-client
 BUILD_DEPENDS+=	cups-image${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-image
@@ -122,17 +123,17 @@
 CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
 .endif
 
-.if defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS}
 CONFIGURE_ARGS+=	--disable-openssl --enable-gnutls
-LIB_DEPENDS+=		gcrypt.18:${PORTSDIR}/security/libgcrypt
-LIB_DEPENDS+=		gnutls.42:${PORTSDIR}/security/gnutls
-USE_PKGCONFIG=	yes
+LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
+USES+=		pkgconfig
 .else
 CONFIGURE_ARGS+=	--disable-gnutls --enable-openssl
 EXTENSIONS+=	openssl
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_PHP)
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPHP}
 CONFIGURE_ARGS+=	--with-php
 USE_PHP=		yes
 USE_PHP_BUILD=		yes
@@ -142,44 +143,51 @@
 PLIST_SUB+=		PHP="@comment "
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && !defined(WITHOUT_GHOSTSCRIPT)
-.if defined(WITH_XPDF)
-IGNORE=			pick ghostscript or xpdf, not both
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MGHOSTSCRIPT}
+.if ${PORT_OPTIONS:MXPDF}
+IGNORE=			You must select one and only one option to build pdftops
 .endif
 USE_GHOSTSCRIPT=	yes
 CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${LOCALBASE}/bin/gs
 PLIST_SUB+=		WITH_PDFTOPS=""
-.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_XPDF)
-BUILD_DEPENDS+=		pdftops:${PORTSDIR}/graphics/xpdf
-RUN_DEPENDS+=		pdftops:${PORTSDIR}/graphics/xpdf
-CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${LOCALBASE}/bin/pdftops
+.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MXPDF}
+BUILD_DEPENDS+=		${CUPS_PDFTOPS}:${PORTSDIR}/graphics/xpdf
+RUN_DEPENDS+=		${CUPS_PDFTOPS}:${PORTSDIR}/graphics/xpdf
+CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${CUPS_PDFTOPS}
 PLIST_SUB+=		WITH_PDFTOPS=""
 .else
 PLIST_SUB+=		WITH_PDFTOPS="@comment "
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_PYTHON)
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=	--with-python
 USE_PYTHON=		yes
 EXTENSIONS+=		python
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_LIBPAPER)
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBPAPER}
 CONFIGURE_ARGS+=	--enable-libpaper
-LIB_DEPENDS+=		paper.2:${PORTSDIR}/print/libpaper
+LIB_DEPENDS+=		paper:${PORTSDIR}/print/libpaper
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_DNSSD)
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER}
+.if ${PORT_OPTIONS:MAVAHI}
+IGNORE=			You must select one and only one option to build for Zeroconf
+.endif
+CONFIGURE_ARGS+=	--with-dnssd-includes=/usr/include
+PLIST_SUB+=		WITH_MDNSRESPONDER=""
+.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=	--enable-dnssd \
-			--with-dnssd-libs=${LOCALBASE}/lib/ \
-			--with-dnssd-includes=${LOCALBASE}/include/avahi-compat-libdns_sd/
+			--with-dnssd-libs=${LOCALBASE}/lib/
 LIB_DEPENDS+=		dns_sd:${PORTSDIR}/net/avahi-libdns
+CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include/avahi-compat-libdns_sd/
 BROKEN=			missing function, see http://www.avahi.org/ticket/303
 .else
 CONFIGURE_ARGS+=	--disable-dnssd
+PLIST_SUB+=		WITH_MDNSRESPONDER="@comment "
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_PAM)
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--enable-pam
 PLIST_SUB+=		WITH_PAMD=""
 .else
@@ -187,7 +195,7 @@
 PLIST_SUB+=		WITH_PAMD="@comment "
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_LDAP)
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--enable-ldap
 .else
@@ -194,8 +202,8 @@
 CONFIGURE_ARGS+=	--disable-ldap
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_DBUS)
-LIB_DEPENDS+=		dbus-1.3:${PORTSDIR}/devel/dbus
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MDBUS}
+LIB_DEPENDS+=		dbus-1:${PORTSDIR}/devel/dbus
 CONFIGURE_ARGS+=	--enable-dbus
 PLIST_SUB+=		WITH_DBUS=""
 .else
@@ -203,21 +211,23 @@
 PLIST_SUB+=		WITH_DBUS="@comment "
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_XDG_OPEN)
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MXDG_OPEN}
 RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
 .endif
 
-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && defined(WITH_LIBUSB)
-LIB_DEPENDS+=		usb:${PORTSDIR}/devel/libusb
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB}
+CPPFLAGS+=		-I/usr/include
+LDFLAGS+=		-L/usr/lib
 .else
 CONFIGURE_ARGS+=	--disable-libusb
 .endif
+CONFIGURE_ARGS+=	LIBS="-lssp_nonshared"
 
 .if defined(CUPS_CLIENT)
 MAN1=	cups-config.1
 .elif defined(CUPS_IMAGE)
 .else
-MAN1=	cancel.1 \
+MAN1+=	cancel.1 \
 	cupstestdsc.1 \
 	cupstestppd.1 \
 	ipptool.1 \
@@ -271,8 +281,14 @@
 .endif
 
 post-patch:
+.if ${ARCH} == "amd64"
 	@${REINPLACE_CMD} -e 's|@PIEFLAGS@||' ${WRKSRC}/Makedefs.in
-.if defined(WITH_XDG_OPEN)
+.endif
+.if ${PORT_OPTIONS:MMDNSRESPONDER}
+	@${REINPLACE_CMD} -e 's|Darwin|FreeBSD|' \
+		${WRKSRC}/backend/Makefile
+.endif
+.if  ${PORT_OPTIONS:MXDG_OPEN}
 	@${REINPLACE_CMD} -e 's|htmlview|xdg-open|' ${WRKSRC}/desktop/cups.desktop.in
 .endif
 	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
@@ -364,10 +380,10 @@
 .elif defined(CUPS_IMAGE)
 	${INSTALL_DATA} ${WRKSRC}/cups/raster.h ${PREFIX}/include/cups/
 .else
-.if !defined(WITHOUT_GHOSTSCRIPT) || defined(WITH_XPDF)
+.if  ${PORT_OPTIONS:MGHOSTSCRIPT} || ${PORT_OPTIONS:MXPDF}
 	${INSTALL_PROGRAM} ${WRKSRC}/filter/pdftops ${PREFIX}/libexec/cups/filter/
 .endif
-	${LN} -s ${PREFIX}/bin/lpr ${PREFIX}/bin/lpr-cups
+	${LN} -sf ${PREFIX}/bin/lpr ${PREFIX}/bin/lpr-cups
 	${INSTALL} -d ${CUPS_ETCDIR}/
 	${CP} -p ${WRKSRC}/conf/snmp.conf ${WRKSRC}/conf/snmp.conf.N
 .for f in cupsd.conf mime.convs mime.types snmp.conf
@@ -374,7 +390,7 @@
 	${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N
 	cd ${CUPS_ETCDIR}/; if test ! -f ${f}; then ${CP} -p ${f}.N ${f}; fi
 .endfor
-.if defined(WITH_PAM)
+.if  ${PORT_OPTIONS:MPAM}
 	@if [ ! -f ${PREFIX}/etc/pam.d/cups ]; then \
 		${CP} -p ${PREFIX}/etc/pam.d/cups.default \
 		${PREFIX}/etc/pam.d/cups ; \
@@ -389,4 +405,4 @@
 	${INSTALL} -d -m 775 -g ${CUPSGRP} ${CUPS_CACHEDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/print/cups-base/distinfo
===================================================================
--- trunk/print/cups-base/distinfo	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/distinfo	2013-09-21 20:52:04 UTC (rev 15489)
@@ -1,3 +1,2 @@
-SHA256 (cups-1.5.0-source.tar.bz2) = c6f99b68a558f4d626e9a5076d664f38e9925715dc541b07f0328c9aeb02ec33
-RMD160 (cups-1.5.0-source.tar.bz2) = e7be9b6b44428561609c59abaea8fa31a11aefff
-SIZE (cups-1.5.0-source.tar.bz2) = 4090210
+SHA256 (cups-1.5.4-source.tar.bz2) = 8023034e8b58eab1ad7279364e872270a77459f6fb59a84d03229cb1d2a6d0e5
+SIZE (cups-1.5.4-source.tar.bz2) = 9583002


Property changes on: trunk/print/cups-base/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.14
\ No newline at end of property
Modified: trunk/print/cups-base/files/cupsd.in
===================================================================
--- trunk/print/cups-base/files/cupsd.in	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/files/cupsd.in	2013-09-21 20:52:04 UTC (rev 15489)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/print/cups-base/files/cupsd.in,v 1.2 2010/03/27 00:14:32 dougb Exp $
+# $FreeBSD$
 #
 # PROVIDE: cupsd
 # REQUIRE: DAEMON
@@ -13,13 +13,13 @@
 
 . /etc/rc.subr
 
-name=cupsd
-rcvar=`set_rcvar`
+name="cupsd"
+rcvar="cupsd_enable"
 
-start_precmd=${name}_prestart
+start_precmd="${name}_prestart"
 
-command=%%PREFIX%%/sbin/cupsd
-extra_commands=reload
+command="%%PREFIX%%/sbin/cupsd"
+extra_commands="reload"
 
 cupsd_prestart()
 {


Property changes on: trunk/print/cups-base/files/cupsd.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/print/cups-base/files/patch-Makefile
===================================================================
--- trunk/print/cups-base/files/patch-Makefile	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/files/patch-Makefile	2013-09-21 20:52:04 UTC (rev 15489)

Property changes on: trunk/print/cups-base/files/patch-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/print/cups-base/files/patch-conf-Makefile
===================================================================
--- trunk/print/cups-base/files/patch-conf-Makefile	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/files/patch-conf-Makefile	2013-09-21 20:52:04 UTC (rev 15489)

Property changes on: trunk/print/cups-base/files/patch-conf-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/print/cups-base/files/patch-configure
===================================================================
--- trunk/print/cups-base/files/patch-configure	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/files/patch-configure	2013-09-21 20:52:04 UTC (rev 15489)
@@ -1,36 +1,28 @@
---- configure.orig	2011-07-25 22:19:20.000000000 +0200
-+++ configure	2011-08-25 06:04:32.000000000 +0200
-@@ -6259,6 +6259,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+#include <sys/param.h>
- #include <sys/ucred.h>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -8689,7 +8690,7 @@
+--- configure.orig	2012-07-27 22:57:23.000000000 +0200
++++ configure	2012-11-05 20:13:13.000000000 +0100
+@@ -566,6 +566,7 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
++#include <netinet/in.h>
+ #ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+@@ -5660,7 +5661,7 @@
  		CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
- 		CUPSDLIBS="$CUPSDLIBS `$PKGCONFIG --libs dbus-1`"
+ 		SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`"
  		DBUS_NOTIFIER="dbus"
 -		DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
 +		DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1` -pthread"
  		SAVELIBS="$LIBS"
  		LIBS="$LIBS $DBUS_NOTIFIERLIBS"
- 		{ echo "$as_me:$LINENO: checking for dbus_message_iter_init_append" >&5
-@@ -13524,6 +13525,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+#include <netinet/in.h>
- #include <resolv.h>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -17447,7 +17449,7 @@
+ 		ac_fn_c_check_func "$LINENO" "dbus_message_iter_init_append" "ac_cv_func_dbus_message_iter_init_append"
+@@ -8302,7 +8303,7 @@
  
  
  	if test x$ac_cv_header_pthread_h = xyes; then
 -				for flag in -lpthreads -lpthread -pthread; do
 +				for flag in -pthread; do
-         		{ echo "$as_me:$LINENO: checking for pthread_create using $flag" >&5
- echo $ECHO_N "checking for pthread_create using $flag... $ECHO_C" >&6; }
+         		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create using $flag" >&5
+ $as_echo_n "checking for pthread_create using $flag... " >&6; }
  			SAVELIBS="$LIBS"


Property changes on: trunk/print/cups-base/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/print/cups-base/files/patch-cups-request.c
===================================================================
--- trunk/print/cups-base/files/patch-cups-request.c	                        (rev 0)
+++ trunk/print/cups-base/files/patch-cups-request.c	2013-09-21 20:52:04 UTC (rev 15489)
@@ -0,0 +1,28 @@
+--- cups/request.c
++++ cups/request.c
+@@ -1004,6 +1004,25 @@
+       httpClose(cg->http);
+       cg->http = NULL;
+     }
++    else
++    {
++     /*
++      * Same server, see if the connection is still established...
++      */
++
++      char ch;				/* Connection check byte */
++
++      if (recv(cg->http->fd, &ch, 1, MSG_PEEK | MSG_DONTWAIT) < 0 &&
++          errno != EWOULDBLOCK)
++      {
++       /*
++        * Nope, close the connection...
++        */
++
++	httpClose(cg->http);
++	cg->http = NULL;
++      }
++    }
+   }
+ 
+  /*

Index: trunk/print/cups-base/files/patch-cups.pam
===================================================================
--- trunk/print/cups-base/files/patch-cups.pam	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/files/patch-cups.pam	2013-09-21 20:52:04 UTC (rev 15489)

Property changes on: trunk/print/cups-base/files/patch-cups.pam
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/print/cups-base/files/patch-str3914
===================================================================
--- trunk/print/cups-base/files/patch-str3914	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/files/patch-str3914	2013-09-21 20:52:04 UTC (rev 15489)
@@ -1,35 +0,0 @@
-Index: filter/image-gif.c
-===================================================================
---- filter/image-gif.c	(revision 9862)
-+++ filter/image-gif.c	(working copy)
-@@ -648,11 +648,13 @@
- 
-     if (code == max_code)
-     {
--      *sp++ = firstcode;
--      code  = oldcode;
-+      if (sp < (stack + 8192))
-+	*sp++ = firstcode;
-+
-+      code = oldcode;
-     }
- 
--    while (code >= clear_code)
-+    while (code >= clear_code && sp < (stack + 8192))
-     {
-       *sp++ = table[1][code];
-       if (code == table[0][code])
-@@ -661,9 +663,11 @@
-       code = table[0][code];
-     }
- 
--    *sp++ = firstcode = table[1][code];
--    code  = max_code;
-+    if (sp < (stack + 8192))
-+      *sp++ = firstcode = table[1][code];
- 
-+    code = max_code;
-+
-     if (code < 4096)
-     {
-       table[0][code] = oldcode;

Modified: trunk/print/cups-base/files/ulpt-cupsd.conf.in
===================================================================
--- trunk/print/cups-base/files/ulpt-cupsd.conf.in	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/files/ulpt-cupsd.conf.in	2013-09-21 20:52:04 UTC (rev 15489)
@@ -1,6 +1,6 @@
 # /usr/local/etc/devd/cups.conf
 #
-# $FreeBSD: ports/print/cups-base/files/ulpt-cupsd.conf.in,v 1.2 2011/02/09 20:43:15 lme Exp $
+# $FreeBSD$
 #
 # Tell cups to pause and unpause the printer when it arrives and departs.
 #


Property changes on: trunk/print/cups-base/files/ulpt-cupsd.conf.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/print/cups-base/files/ulpt-cupsd.sh.in
===================================================================
--- trunk/print/cups-base/files/ulpt-cupsd.sh.in	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/files/ulpt-cupsd.sh.in	2013-09-21 20:52:04 UTC (rev 15489)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: ports/print/cups-base/files/ulpt-cupsd.sh.in,v 1.1 2011/01/07 21:24:58 dinoex Exp $
+# $FreeBSD$
 
 usage() {
 	echo "$0: usage:" >&2


Property changes on: trunk/print/cups-base/files/ulpt-cupsd.sh.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/print/cups-base/pkg-plist
===================================================================
--- trunk/print/cups-base/pkg-plist	2013-09-21 18:52:27 UTC (rev 15488)
+++ trunk/print/cups-base/pkg-plist	2013-09-21 20:52:04 UTC (rev 15489)
@@ -10,8 +10,9 @@
 @exec chown cups:daemon /var/log/cups
 @exec mkdir -p %D/etc/cups/ppd || true
 @exec mkdir -p %D/etc/cups/interfaces || true
- at unexec rm -rf /var/spool/cups 2>/dev/null || true
 @unexec rm -rf %%CACHEDIR%% 2>/dev/null || true
+ at unexec rmdir /var/spool/cups/tmp 2>/dev/null || true
+ at unexec rmdir /var/spool/cups 2>/dev/null || true
 @unexec rmdir /var/log/cups 2>/dev/null || true
 @unexec rmdir /var/run/cups/certs 2>/dev/null || true
 @unexec rmdir /var/run/cups 2>/dev/null || true
@@ -83,6 +84,8 @@
 libexec/cups/backend/snmp
 libexec/cups/backend/socket
 libexec/cups/backend/usb
+%%WITH_MDNSRESPONDER%%libexec/cups/backend/dnssd
+%%WITH_MDNSRESPONDER%%libexec/cups/backend/mdns
 libexec/cups/cgi-bin/admin.cgi
 libexec/cups/cgi-bin/classes.cgi
 libexec/cups/cgi-bin/help.cgi
@@ -384,6 +387,146 @@
 %%DATADIR%%/templates/eu/test-page.tmpl
 %%DATADIR%%/templates/eu/trailer.tmpl
 %%DATADIR%%/templates/eu/users.tmpl
+%%DATADIR%%/templates/fr/add-class.tmpl
+%%DATADIR%%/templates/fr/add-printer.tmpl
+%%DATADIR%%/templates/fr/add-rss-subscription.tmpl
+%%DATADIR%%/templates/fr/admin.tmpl
+%%DATADIR%%/templates/fr/choose-device.tmpl
+%%DATADIR%%/templates/fr/choose-make.tmpl
+%%DATADIR%%/templates/fr/choose-model.tmpl
+%%DATADIR%%/templates/fr/choose-serial.tmpl
+%%DATADIR%%/templates/fr/choose-uri.tmpl
+%%DATADIR%%/templates/fr/class.tmpl
+%%DATADIR%%/templates/fr/class-added.tmpl
+%%DATADIR%%/templates/fr/class-confirm.tmpl
+%%DATADIR%%/templates/fr/class-deleted.tmpl
+%%DATADIR%%/templates/fr/class-jobs-header.tmpl
+%%DATADIR%%/templates/fr/class-modified.tmpl
+%%DATADIR%%/templates/fr/classes.tmpl
+%%DATADIR%%/templates/fr/classes-header.tmpl
+%%DATADIR%%/templates/fr/command.tmpl
+%%DATADIR%%/templates/fr/edit-config.tmpl
+%%DATADIR%%/templates/fr/error.tmpl
+%%DATADIR%%/templates/fr/error-op.tmpl
+%%DATADIR%%/templates/fr/header.tmpl
+%%DATADIR%%/templates/fr/help-header.tmpl
+%%DATADIR%%/templates/fr/help-trailer.tmpl
+%%DATADIR%%/templates/fr/help-printable.tmpl
+%%DATADIR%%/templates/fr/job-cancel.tmpl
+%%DATADIR%%/templates/fr/job-hold.tmpl
+%%DATADIR%%/templates/fr/job-move.tmpl
+%%DATADIR%%/templates/fr/job-moved.tmpl
+%%DATADIR%%/templates/fr/job-release.tmpl
+%%DATADIR%%/templates/fr/job-restart.tmpl
+%%DATADIR%%/templates/fr/jobs.tmpl
+%%DATADIR%%/templates/fr/jobs-header.tmpl
+%%DATADIR%%/templates/fr/list-available-printers.tmpl
+%%DATADIR%%/templates/fr/modify-class.tmpl
+%%DATADIR%%/templates/fr/modify-printer.tmpl
+%%DATADIR%%/templates/fr/norestart.tmpl
+%%DATADIR%%/templates/fr/option-boolean.tmpl
+%%DATADIR%%/templates/fr/option-conflict.tmpl
+%%DATADIR%%/templates/fr/option-header.tmpl
+%%DATADIR%%/templates/fr/option-pickmany.tmpl
+%%DATADIR%%/templates/fr/option-pickone.tmpl
+%%DATADIR%%/templates/fr/option-trailer.tmpl
+%%DATADIR%%/templates/fr/pager.tmpl
+%%DATADIR%%/templates/fr/printer.tmpl
+%%DATADIR%%/templates/fr/printer-accept.tmpl
+%%DATADIR%%/templates/fr/printer-added.tmpl
+%%DATADIR%%/templates/fr/printer-configured.tmpl
+%%DATADIR%%/templates/fr/printer-confirm.tmpl
+%%DATADIR%%/templates/fr/printer-default.tmpl
+%%DATADIR%%/templates/fr/printer-deleted.tmpl
+%%DATADIR%%/templates/fr/printer-jobs-header.tmpl
+%%DATADIR%%/templates/fr/printer-modified.tmpl
+%%DATADIR%%/templates/fr/printer-purge.tmpl
+%%DATADIR%%/templates/fr/printer-reject.tmpl
+%%DATADIR%%/templates/fr/printer-start.tmpl
+%%DATADIR%%/templates/fr/printer-stop.tmpl
+%%DATADIR%%/templates/fr/printers.tmpl
+%%DATADIR%%/templates/fr/printers-header.tmpl
+%%DATADIR%%/templates/fr/restart.tmpl
+%%DATADIR%%/templates/fr/samba-export.tmpl
+%%DATADIR%%/templates/fr/samba-exported.tmpl
+%%DATADIR%%/templates/fr/search.tmpl
+%%DATADIR%%/templates/fr/set-printer-options-header.tmpl
+%%DATADIR%%/templates/fr/set-printer-options-trailer.tmpl
+%%DATADIR%%/templates/fr/subscription-added.tmpl
+%%DATADIR%%/templates/fr/subscription-canceled.tmpl
+%%DATADIR%%/templates/fr/test-page.tmpl
+%%DATADIR%%/templates/fr/trailer.tmpl
+%%DATADIR%%/templates/fr/users.tmpl
+%%DATADIR%%/templates/hu/add-class.tmpl
+%%DATADIR%%/templates/hu/add-printer.tmpl
+%%DATADIR%%/templates/hu/add-rss-subscription.tmpl
+%%DATADIR%%/templates/hu/admin.tmpl
+%%DATADIR%%/templates/hu/choose-device.tmpl
+%%DATADIR%%/templates/hu/choose-make.tmpl
+%%DATADIR%%/templates/hu/choose-model.tmpl
+%%DATADIR%%/templates/hu/choose-serial.tmpl
+%%DATADIR%%/templates/hu/choose-uri.tmpl
+%%DATADIR%%/templates/hu/class.tmpl
+%%DATADIR%%/templates/hu/class-added.tmpl
+%%DATADIR%%/templates/hu/class-confirm.tmpl
+%%DATADIR%%/templates/hu/class-deleted.tmpl
+%%DATADIR%%/templates/hu/class-jobs-header.tmpl
+%%DATADIR%%/templates/hu/class-modified.tmpl
+%%DATADIR%%/templates/hu/classes.tmpl
+%%DATADIR%%/templates/hu/classes-header.tmpl
+%%DATADIR%%/templates/hu/command.tmpl
+%%DATADIR%%/templates/hu/edit-config.tmpl
+%%DATADIR%%/templates/hu/error.tmpl
+%%DATADIR%%/templates/hu/error-op.tmpl
+%%DATADIR%%/templates/hu/header.tmpl
+%%DATADIR%%/templates/hu/help-header.tmpl
+%%DATADIR%%/templates/hu/help-trailer.tmpl
+%%DATADIR%%/templates/hu/help-printable.tmpl
+%%DATADIR%%/templates/hu/job-cancel.tmpl
+%%DATADIR%%/templates/hu/job-hold.tmpl
+%%DATADIR%%/templates/hu/job-move.tmpl
+%%DATADIR%%/templates/hu/job-moved.tmpl
+%%DATADIR%%/templates/hu/job-release.tmpl
+%%DATADIR%%/templates/hu/job-restart.tmpl
+%%DATADIR%%/templates/hu/jobs.tmpl
+%%DATADIR%%/templates/hu/jobs-header.tmpl
+%%DATADIR%%/templates/hu/list-available-printers.tmpl
+%%DATADIR%%/templates/hu/modify-class.tmpl
+%%DATADIR%%/templates/hu/modify-printer.tmpl
+%%DATADIR%%/templates/hu/norestart.tmpl
+%%DATADIR%%/templates/hu/option-boolean.tmpl
+%%DATADIR%%/templates/hu/option-conflict.tmpl
+%%DATADIR%%/templates/hu/option-header.tmpl
+%%DATADIR%%/templates/hu/option-pickmany.tmpl
+%%DATADIR%%/templates/hu/option-pickone.tmpl
+%%DATADIR%%/templates/hu/option-trailer.tmpl
+%%DATADIR%%/templates/hu/pager.tmpl
+%%DATADIR%%/templates/hu/printer.tmpl
+%%DATADIR%%/templates/hu/printer-accept.tmpl
+%%DATADIR%%/templates/hu/printer-added.tmpl
+%%DATADIR%%/templates/hu/printer-configured.tmpl
+%%DATADIR%%/templates/hu/printer-confirm.tmpl
+%%DATADIR%%/templates/hu/printer-default.tmpl
+%%DATADIR%%/templates/hu/printer-deleted.tmpl
+%%DATADIR%%/templates/hu/printer-jobs-header.tmpl
+%%DATADIR%%/templates/hu/printer-modified.tmpl
+%%DATADIR%%/templates/hu/printer-purge.tmpl
+%%DATADIR%%/templates/hu/printer-reject.tmpl
+%%DATADIR%%/templates/hu/printer-start.tmpl
+%%DATADIR%%/templates/hu/printer-stop.tmpl
+%%DATADIR%%/templates/hu/printers.tmpl
+%%DATADIR%%/templates/hu/printers-header.tmpl
+%%DATADIR%%/templates/hu/restart.tmpl
+%%DATADIR%%/templates/hu/samba-export.tmpl
+%%DATADIR%%/templates/hu/samba-exported.tmpl
+%%DATADIR%%/templates/hu/search.tmpl
+%%DATADIR%%/templates/hu/set-printer-options-header.tmpl
+%%DATADIR%%/templates/hu/set-printer-options-trailer.tmpl
+%%DATADIR%%/templates/hu/subscription-added.tmpl
+%%DATADIR%%/templates/hu/subscription-canceled.tmpl
+%%DATADIR%%/templates/hu/test-page.tmpl
+%%DATADIR%%/templates/hu/trailer.tmpl
+%%DATADIR%%/templates/hu/users.tmpl
 %%DATADIR%%/templates/header.tmpl
 %%DATADIR%%/templates/help-header.tmpl
 %%DATADIR%%/templates/help-printable.tmpl
@@ -787,6 +930,8 @@
 %%DOCSDIR%%/de/index.html
 %%DOCSDIR%%/es/index.html
 %%DOCSDIR%%/eu/index.html
+%%DOCSDIR%%/fr/index.html
+%%DOCSDIR%%/hu/index.html
 %%DOCSDIR%%/help/accounting.html
 %%DOCSDIR%%/help/api-array.html
 %%DOCSDIR%%/help/api-cgi.html
@@ -890,8 +1035,20 @@
 %%DOCSDIR%%/images/wait.gif
 %%DOCSDIR%%/index.html
 %%DATADIR%%/ipptool/create-printer-subscription.test
+%%DATADIR%%/ipptool/color.jpg
+%%DATADIR%%/ipptool/document-a4.pdf
+%%DATADIR%%/ipptool/document-a4.ps
+%%DATADIR%%/ipptool/document-letter.pdf
+%%DATADIR%%/ipptool/document-letter.ps
+%%DATADIR%%/ipptool/gray.jpg
+%%DATADIR%%/ipptool/ipp-2.2.test
+%%DATADIR%%/ipptool/onepage-a4.pdf
+%%DATADIR%%/ipptool/onepage-a4.ps
+%%DATADIR%%/ipptool/onepage-letter.pdf
+%%DATADIR%%/ipptool/onepage-letter.ps
 %%DATADIR%%/ipptool/get-completed-jobs.test
 %%DATADIR%%/ipptool/get-jobs.test
+%%DATADIR%%/ipptool/get-printer-attributes.test
 %%DATADIR%%/ipptool/ipp-1.1.test
 %%DATADIR%%/ipptool/ipp-2.0.test
 %%DATADIR%%/ipptool/ipp-2.1.test
@@ -916,6 +1073,7 @@
 share/locale/eu/cups_eu.po
 share/locale/fi/cups_fi.po
 share/locale/fr/cups_fr.po
+share/locale/hu/cups_hu.po
 share/locale/id/cups_id.po
 share/locale/it/cups_it.po
 share/locale/ja/cups_ja.po
@@ -951,6 +1109,8 @@
 @dirrm %%DOCSDIR%%/eu
 @dirrm %%DOCSDIR%%/es
 @dirrm %%DOCSDIR%%/de
+ at dirrm %%DOCSDIR%%/fr
+ at dirrm %%DOCSDIR%%/hu
 @dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/templates/ru
@@ -960,7 +1120,9 @@
 @dirrm %%DATADIR%%/templates/id
 @dirrm %%DATADIR%%/templates/eu
 @dirrm %%DATADIR%%/templates/es
+ at dirrm %%DATADIR%%/templates/fr
 @dirrm %%DATADIR%%/templates/de
+ at dirrm %%DATADIR%%/templates/hu
 @dirrm %%DATADIR%%/templates
 @exec  mkdir -p %D/%%DATADIR%%/profiles
 @dirrm %%DATADIR%%/profiles


Property changes on: trunk/print/cups-base/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.9
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list