From f8db91e2105a1507b3a1225deedd42426aee2b47 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 6 May 2006 09:11:09 +0000 Subject: [PATCH] Use the new GTK2_VERSION macro. --- graphics/librsvg2/Makefile | 5 +--- graphics/librsvg2/pkg-plist | 12 +++++----- x11-themes/gtk-engines2/Makefile | 1 - x11-themes/gtk-engines2/pkg-plist | 40 +++++++++++++++---------------- x11-toolkits/libgnomeui/Makefile | 1 - x11-toolkits/libgnomeui/pkg-plist | 8 +++---- 6 files changed, 31 insertions(+), 36 deletions(-) diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 298378998967..b877fcba3e84 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ popt.0:${PORTSDIR}/devel/popt \ croco-${CROCO_VERSION}.3:${PORTSDIR}/textproc/libcroco -RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2 +RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmetal.so:${PORTSDIR}/x11-themes/gtk-engines2 USE_BZIP2= yes USE_GMAKE= yes @@ -39,9 +39,6 @@ CONFIGURE_ARGS= --with-svgz \ --enable-gtk-theme CROCO_VERSION= 0.6 -GTK_VERSION= 2.4.0 - -PLIST_SUB= GTK_VERSION=${GTK_VERSION} MAN1= rsvg.1 diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index b7c27e69cacb..82ac9dc7a828 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -8,12 +8,12 @@ include/librsvg-2/librsvg/rsvg.h %%PLUGIN%%lib/browser_plugins/libmozsvgdec.a %%PLUGIN%%lib/browser_plugins/libmozsvgdec.la %%PLUGIN%%lib/browser_plugins/libmozsvgdec.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.a -lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so -lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.a -lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.la -lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.a +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsvg.so +lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.a +lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.la +lib/gtk-2.0/%%GTK2_VERSION%%/loaders/svg_loader.so lib/librsvg-2.a lib/librsvg-2.la lib/librsvg-2.so diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index cf36d87a9bf9..4cae27b87f43 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -24,7 +24,6 @@ USE_X_PREFIX= yes USE_REINPLACE= yes GNU_CONFIGURE= yes USE_GNOME= gnomehack gtk20 -PLIST_SUB= GTK_VERSION="2.4.0" .if defined(WITH_ANIMATION) CFLAGS+= -DHAVE_ANIMATION=1 diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index e474e545f2b5..746a8eaf455a 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -1,23 +1,23 @@ -lib/gtk-2.0/%%GTK_VERSION%%/engines/libclearlooks.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libclearlooks.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.la -lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libclearlooks.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcrux-engine.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libcrux-engine.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libhcengine.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libhcengine.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libindustrial.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libindustrial.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/liblighthouseblue.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/liblighthouseblue.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmetal.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmetal.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmist.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libmist.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libredmond95.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libredmond95.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.so +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.la +lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.so libdata/pkgconfig/gtk-engines-2.pc share/themes/Clearlooks/gtk-2.0/gtkrc share/themes/Crux/gtk-2.0/gtkrc diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index df7a132312bd..287d54b755f8 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -30,6 +30,5 @@ USE_AUTOTOOLS= libtool:15 USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -PLIST_SUB= GTK_VERSION="2.4.0" .include diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index 100cd660f7c3..0d3e21f2136b 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -49,9 +49,9 @@ include/libgnomeui-2.0/libgnomeui/gnome-window-icon.h include/libgnomeui-2.0/libgnomeui/gnome-window.h include/libgnomeui-2.0/libgnomeui/gnometypebuiltins.h include/libgnomeui-2.0/libgnomeui/libgnomeui.h -lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.a -lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.la -lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so +lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.a +lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.la +lib/gtk-2.0/%%GTK2_VERSION%%/filesystems/libgnome-vfs.so lib/libglade/2.0/libgnome.a lib/libglade/2.0/libgnome.la lib/libglade/2.0/libgnome.so @@ -256,6 +256,6 @@ share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz @dirrm %%DOCSDIR%% -@dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems +@dirrm lib/gtk-2.0/%%GTK2_VERSION%%/filesystems @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0