From a400c74b066f28158f81c6faacda9d7370bd364b Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Wed, 20 Jan 2016 13:02:56 +0000 Subject: [PATCH] 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 --- graphics/cairo/pkg-plist | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist index 790e29b3a8db..9967b4da831d 100644 --- a/graphics/cairo/pkg-plist +++ b/graphics/cairo/pkg-plist @@ -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