From owner-svn-ports-all@freebsd.org Sun Dec 27 21:39:47 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B058A52137; Sun, 27 Dec 2015 21:39:47 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C6B361A63; Sun, 27 Dec 2015 21:39:46 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBRLdj78005528; Sun, 27 Dec 2015 21:39:45 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBRLdjXS005526; Sun, 27 Dec 2015 21:39:45 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201512272139.tBRLdjXS005526@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Sun, 27 Dec 2015 21:39:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404597 - in head/x11-toolkits/gtk30: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Dec 2015 21:39:47 -0000 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