There is a typo in XDG_OPEN description. Fix: Patch attached with submission follows:
Maintainer of print/cups-base, Please note that PR ports/179194 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/179194 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
These stupid changes should not require maintainer approval.
Responsible Changed From-To: freebsd-ports-bugs->eadler I'll take it.
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@tormail.org" <r4721@tormail.org> PR: 179194 Submitted by: Sayetsky Anton <vsjcfm@gmail.com> Approved by: c.petrik.sosa@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; ++ } ++ } + } + + /* _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed. Thanks!