From owner-svn-ports-all@freebsd.org  Wed Jan 20 13:02:57 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 6C11EA89DC9;
 Wed, 20 Jan 2016 13:02:57 +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 3F5771BF5;
 Wed, 20 Jan 2016 13:02:57 +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 u0KD2uXN050901;
 Wed, 20 Jan 2016 13:02:56 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0KD2uaj050900;
 Wed, 20 Jan 2016 13:02:56 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201601201302.u0KD2uaj050900@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Wed, 20 Jan 2016 13:02:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r406748 - head/graphics/cairo
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jan 2016 13:02:57 -0000

Author: kwm
Date: Wed Jan 20 13:02:56 2016
New Revision: 406748
URL: https://svnweb.freebsd.org/changeset/ports/406748

Log:
  Fix packaging of cairo in poudriere when the glib option is disabled.
  
  cairo-sphinx doesn't have a disable switch, but it checks for the
  present of glib. Add the sphinx plist files under the GLIB option,
  so that when sphinx plist entries are consistent, regardless if
  glib is installed or not.
  
  PR:		195187

Modified:
  head/graphics/cairo/pkg-plist

Modified: head/graphics/cairo/pkg-plist
==============================================================================
--- head/graphics/cairo/pkg-plist	Wed Jan 20 12:17:15 2016	(r406747)
+++ head/graphics/cairo/pkg-plist	Wed Jan 20 13:02:56 2016	(r406748)
@@ -1,4 +1,4 @@
-bin/cairo-sphinx
+%%GLIB%%bin/cairo-sphinx
 bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
@@ -20,10 +20,10 @@ lib/cairo/cairo-fdr.a
 lib/cairo/cairo-fdr.so
 lib/cairo/cairo-fdr.so.0
 lib/cairo/cairo-fdr.so.0.0.0
-lib/cairo/cairo-sphinx.a
-lib/cairo/cairo-sphinx.so
-lib/cairo/cairo-sphinx.so.0
-lib/cairo/cairo-sphinx.so.0.0.0
+%%GLIB%%lib/cairo/cairo-sphinx.a
+%%GLIB%%lib/cairo/cairo-sphinx.so
+%%GLIB%%lib/cairo/cairo-sphinx.so.0
+%%GLIB%%lib/cairo/cairo-sphinx.so.0.0.0
 lib/cairo/libcairo-trace.a
 lib/cairo/libcairo-trace.so
 lib/cairo/libcairo-trace.so.0