svn commit: r319651 - in head/print/cups-base: . files

[Eitan Adler]

Author: eadler
Date: Sun Jun  2 12:14:24 2013
New Revision: 319651
URL: http://svnweb.freebsd.org/changeset/ports/319651

Log:
  - Fix typo w.r.t. XDG_OPEN option
  - Add a a backported patch from cups 1.6 which fixes an issue with regard to a timed out TCP connection. it should be
  deleted once the port is updated to 1.6.
  - Pet portlint a bit
  - remove unused CONFLICTS line
  
  PR:		178987
  Submitted by:	"r4721 at tormail.org" <r4721 at tormail.org>
  PR:		179194
  Submitted by:	Sayetsky Anton <vsjcfm at gmail.com>
  Approved by:	c.petrik.sosa at gmail.com (maintainer)

Added:
  head/print/cups-base/files/patch-cups-request.c   (contents, props changed)
Modified:
  head/print/cups-base/Makefile

Modified: head/print/cups-base/Makefile
==============================================================================
--- head/print/cups-base/Makefile	Sun Jun  2 11:54:07 2013	(r319650)
+++ head/print/cups-base/Makefile	Sun Jun  2 12:14:24 2013	(r319651)
@@ -69,7 +69,6 @@ OPTIONS_DEFINE=	GNUTLS
 .else
 PORTREVISION=	1
 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
@@ -78,7 +77,7 @@ NO_OPTIONS_SORT=	yes
 LIBUSB_DESC=		USB support
 GHOSTSCRIPT_DESC=	Build pdftops with GHOSTSCRIPT
 XPDF_DESC=		Build pdftops with XPDF
-XDG_OPEN=		Build with XDG_OPEN as browser
+XDG_OPEN_DESC=		Build with XDG_OPEN as browser
 
 .include <bsd.port.options.mk>
 

Added: head/print/cups-base/files/patch-cups-request.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/cups-base/files/patch-cups-request.c	Sun Jun  2 12:14:24 2013	(r319651)
@@ -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;
++      }
++    }
+   }
+ 
+  /*