From owner-svn-ports-head@freebsd.org  Mon Oct 17 19:45:30 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 375E5AF4187;
 Mon, 17 Oct 2016 19:45:30 +0000 (UTC)
 (envelope-from tijl@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 F02E4AA4;
 Mon, 17 Oct 2016 19:45:29 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9HJjTnQ096163;
 Mon, 17 Oct 2016 19:45:29 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9HJjT21096162;
 Mon, 17 Oct 2016 19:45:29 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201610171945.u9HJjT21096162@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Mon, 17 Oct 2016 19:45:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424143 - 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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Oct 2016 19:45:30 -0000

Author: tijl
Date: Mon Oct 17 19:45:28 2016
New Revision: 424143
URL: https://svnweb.freebsd.org/changeset/ports/424143

Log:
  Fix configure with CUPS 2.2.x.
  
  Reported by:	antoine

Modified:
  head/x11-toolkits/gtk30/files/patch-configure

Modified: head/x11-toolkits/gtk30/files/patch-configure
==============================================================================
--- head/x11-toolkits/gtk30/files/patch-configure	Mon Oct 17 18:31:00 2016	(r424142)
+++ head/x11-toolkits/gtk30/files/patch-configure	Mon Oct 17 19:45:28 2016	(r424143)
@@ -1,6 +1,15 @@
---- configure.orig	2015-12-27 22:02:19.433821000 +0100
-+++ configure	2015-12-27 22:02:39.743841000 +0100
-@@ -26046,9 +26046,7 @@
+--- configure.orig	2016-02-24 05:04:43 UTC
++++ configure
+@@ -25758,7 +25758,7 @@ fi
+     CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
+     CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
+ 
+-    if test $CUPS_API_MAJOR -gt 1 -o \
++    if test $CUPS_API_MAJOR -lt 1 -o \
+             $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
+       as_fn_error $? "CUPS >= 1.2 not found" "$LINENO" 5
+     fi
+@@ -26190,9 +26190,7 @@ fi
  if test "$have_cups" = "yes"; then
    GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
  fi