svn commit: r404597 - in head/x11-toolkits/gtk30: . files

[Koop Mast]

Author: kwm
Date: Sun Dec 27 21:39:45 2015
New Revision: 404597
URL: https://svnweb.freebsd.org/changeset/ports/404597

Log:
  Enable lpr printing agian.
  
  While configure happily reported lpr is enabled and the module was
  installed. The print code wasn't configured to use lpr. The reason
  for this is that the configure of this code moved from the gtk/Makefile
  to configure. Remove the now obsolete sed line.
  
  Reported by:	dinoex@
  Tested by:	dinoex@

Added:
  head/x11-toolkits/gtk30/files/patch-configure   (contents, props changed)
Modified:
  head/x11-toolkits/gtk30/Makefile

Modified: head/x11-toolkits/gtk30/Makefile
==============================================================================
--- head/x11-toolkits/gtk30/Makefile	Sun Dec 27 20:40:36 2015	(r404596)
+++ head/x11-toolkits/gtk30/Makefile	Sun Dec 27 21:39:45 2015	(r404597)
@@ -5,7 +5,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	3.16.7
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMESUFFIX=	3
@@ -84,8 +84,6 @@ TYPEAHEAD_EXTRA_PATCHES=${FILESDIR}/extr
 post-patch:
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
-		${WRKSRC}/gtk/Makefile.in
 
 pre-configure:
 # .if !exists() evaluates too early before cairo has a chance to be installed

Added: head/x11-toolkits/gtk30/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/gtk30/files/patch-configure	Sun Dec 27 21:39:45 2015	(r404597)
@@ -0,0 +1,12 @@
+--- configure.orig	2015-12-27 22:02:19.433821000 +0100
++++ configure	2015-12-27 22:02:39.743841000 +0100
+@@ -26046,9 +26046,7 @@
+ if test "$have_cups" = "yes"; then
+   GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
+ fi
+-if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then
+   GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr"
+-fi
+ if test "$have_cloudprint" = "yes"; then
+   GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cloudprint"
+ fi