From f6f179ea62cce91fbf68a18e217c4cc2ccf35e87 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 11 Jan 2010 16:35:16 +0000 Subject: [PATCH] - Fix plist for !WITH_AGG case --- graphics/gnash-devel/Makefile | 3 +++ graphics/gnash-devel/pkg-plist | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile index de983652bf15..c0fdb4de5fc1 100644 --- a/graphics/gnash-devel/Makefile +++ b/graphics/gnash-devel/Makefile @@ -168,7 +168,9 @@ CONFIGURE_ARGS+= --enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,` .if defined(WITH_AGG) && !defined(WITH_OPENGL) && !defined(WITH_CAIRO) LIB_DEPENDS+= agg.2:${PORTSDIR}/graphics/agg CONFIGURE_ARGS+= --enable-renderer=agg +PLIST_SUB+= AGG="" .elif !defined(WITH_AGG) && defined(WITH_OPENGL) && !defined(WITH_CAIRO) +PLIST_SUB+= AGG="@comment " . if defined(WITH_KDE4) IGNORE= doesn't support OpenGL renderer with KDE4 gui yet. Please rerun 'make config' and select different renderer or disable KDE4 GUI . endif @@ -178,6 +180,7 @@ LIB_DEPENDS+= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext . endif CONFIGURE_ARGS+= --enable-renderer=ogl .elif !defined(WITH_AGG) && !defined(WITH_OPENGL) && defined(WITH_CAIRO) +PLIST_SUB+= AGG="@comment " . if defined(WITH_KDE) || defined(WITH_KDE4) IGNORE= doesn't support Cairo renderer with KDE/KDE4 gui. Please rerun 'make config' and select different renderer or disable KDE/KDE4 GUIs . endif diff --git a/graphics/gnash-devel/pkg-plist b/graphics/gnash-devel/pkg-plist index 2df96a71cf76..cba7cab2199e 100644 --- a/graphics/gnash-devel/pkg-plist +++ b/graphics/gnash-devel/pkg-plist @@ -257,9 +257,9 @@ etc/gnashrc.dist lib/gnash/libgnashamf-%%GNASHVER%%.so lib/gnash/libgnashamf.la lib/gnash/libgnashamf.so -lib/gnash/libgnashagg.la -lib/gnash/libgnashagg.so -lib/gnash/libgnashagg.so.0 +%%AGG%%lib/gnash/libgnashagg.la +%%AGG%%lib/gnash/libgnashagg.so +%%AGG%%lib/gnash/libgnashagg.so.0 lib/gnash/libgnashbase.la lib/gnash/libgnashbase.so lib/gnash/libgnashbase.so.0