From 9e8dc5d0158b131dde2b701d2c63c6d55e5fced5 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Sun, 15 Oct 2000 15:45:59 +0000 Subject: [PATCH] Fix the breakage regarding bsd.gnome.mk variables. Submitted by: Yasuhiro Fukuma (MAINTAINER) --- x11-toolkits/ruby-gtk/Makefile | 10 ++++++---- x11-toolkits/ruby-gtk/pkg-plist | 12 ++++++------ x11-toolkits/ruby-gtk2/Makefile | 10 ++++++---- x11-toolkits/ruby-gtk2/pkg-plist | 12 ++++++------ 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile index 2770845e6ae8..6d058af5a6b4 100644 --- a/x11-toolkits/ruby-gtk/Makefile +++ b/x11-toolkits/ruby-gtk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 0.23 +PORTVERSION= 0.23 CATEGORIES= x11-toolkits ruby MASTER_SITES= http://www.ruby-lang.org/gtk/download/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -23,16 +23,18 @@ USE_XLIB= yes USE_GTK= yes WANT_IMLIB= yes +CONFIGURE_ARGS= ${CONFIG_CMD} INSTALL_TARGET= site-install .include .if defined(HAVE_IMLIB) USE_IMLIB= yes +PLIST_SUB+= IMLIB:="" +CONFIG_CMD= ${IMLIB_CONFIG} .else -PLIST= ${WRKDIR}/PLIST -pre-install: - @${SED} -e '/gdkimlib/d' ${PKGDIR}/pkg-plist > ${PLIST} +PLIST_SUB+= IMLIB:="@comment " +CONFIG_CMD= ${GTK_CONFIG} .endif post-configure: diff --git a/x11-toolkits/ruby-gtk/pkg-plist b/x11-toolkits/ruby-gtk/pkg-plist index bcd4aa4b3a75..29bad1241393 100644 --- a/x11-toolkits/ruby-gtk/pkg-plist +++ b/x11-toolkits/ruby-gtk/pkg-plist @@ -11,12 +11,12 @@ %%RUBY_EXAMPLESDIR%%/gtk/browser/rbbr_rb.rb %%RUBY_EXAMPLESDIR%%/gtk/browser/rbdump.rb @dirrm %%RUBY_EXAMPLESDIR%%/gtk/browser -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample1.rb -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample2.rb -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample3.rb -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample4.rb -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample5.rb -@dirrm %%RUBY_EXAMPLESDIR%%/gtk/gdkimlib +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample1.rb +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample2.rb +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample3.rb +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample4.rb +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample5.rb +%%IMLIB:%%@dirrm %%RUBY_EXAMPLESDIR%%/gtk/gdkimlib @dirrm %%RUBY_EXAMPLESDIR%%/gtk %%RUBY_DOCDIR%%/gtk/Gdk.html %%RUBY_DOCDIR%%/gtk/GdkImlib.html diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile index 2770845e6ae8..6d058af5a6b4 100644 --- a/x11-toolkits/ruby-gtk2/Makefile +++ b/x11-toolkits/ruby-gtk2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gtk -PORTVERSION= 0.23 +PORTVERSION= 0.23 CATEGORIES= x11-toolkits ruby MASTER_SITES= http://www.ruby-lang.org/gtk/download/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -23,16 +23,18 @@ USE_XLIB= yes USE_GTK= yes WANT_IMLIB= yes +CONFIGURE_ARGS= ${CONFIG_CMD} INSTALL_TARGET= site-install .include .if defined(HAVE_IMLIB) USE_IMLIB= yes +PLIST_SUB+= IMLIB:="" +CONFIG_CMD= ${IMLIB_CONFIG} .else -PLIST= ${WRKDIR}/PLIST -pre-install: - @${SED} -e '/gdkimlib/d' ${PKGDIR}/pkg-plist > ${PLIST} +PLIST_SUB+= IMLIB:="@comment " +CONFIG_CMD= ${GTK_CONFIG} .endif post-configure: diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist index bcd4aa4b3a75..29bad1241393 100644 --- a/x11-toolkits/ruby-gtk2/pkg-plist +++ b/x11-toolkits/ruby-gtk2/pkg-plist @@ -11,12 +11,12 @@ %%RUBY_EXAMPLESDIR%%/gtk/browser/rbbr_rb.rb %%RUBY_EXAMPLESDIR%%/gtk/browser/rbdump.rb @dirrm %%RUBY_EXAMPLESDIR%%/gtk/browser -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample1.rb -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample2.rb -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample3.rb -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample4.rb -%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample5.rb -@dirrm %%RUBY_EXAMPLESDIR%%/gtk/gdkimlib +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample1.rb +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample2.rb +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample3.rb +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample4.rb +%%IMLIB:%%%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample5.rb +%%IMLIB:%%@dirrm %%RUBY_EXAMPLESDIR%%/gtk/gdkimlib @dirrm %%RUBY_EXAMPLESDIR%%/gtk %%RUBY_DOCDIR%%/gtk/Gdk.html %%RUBY_DOCDIR%%/gtk/GdkImlib.html