diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-02-27 06:04:39 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-02-27 06:04:39 +0000 |
| commit | b5601bdde62e58f2ea2cff077290db6d23641997 (patch) | |
| tree | 794bc9cc1b1801eb0c6cf854ab1dec1bf2d26a00 /devel | |
| parent | BUMP portrevision (diff) | |
- Make extconf.rb use libglade-config to search the new location of
the libglade header files.
- Properly LIB_DEPENDS on libglade.
Submitted by: olgeni
Notes
Notes:
svn path=/head/; revision=55300
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ruby-libglade/Makefile | 3 | ||||
| -rw-r--r-- | devel/ruby-libglade/files/patch-extconf.rb | 12 | ||||
| -rw-r--r-- | devel/ruby-libglade2/Makefile | 3 | ||||
| -rw-r--r-- | devel/ruby-libglade2/files/patch-extconf.rb | 12 |
4 files changed, 20 insertions, 10 deletions
diff --git a/devel/ruby-libglade/Makefile b/devel/ruby-libglade/Makefile index b5d8f9ce6697..6766bd725592 100644 --- a/devel/ruby-libglade/Makefile +++ b/devel/ruby-libglade/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel ruby gnome MASTER_SITES= http://beta4.com/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -17,6 +17,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/devel/ruby-libglade/files/patch-extconf.rb b/devel/ruby-libglade/files/patch-extconf.rb index 834c84d47b5c..1ae3d336a9e9 100644 --- a/devel/ruby-libglade/files/patch-extconf.rb +++ b/devel/ruby-libglade/files/patch-extconf.rb @@ -1,6 +1,6 @@ ---- extconf.rb.orig Mon Jun 25 07:08:39 2001 -+++ extconf.rb Tue Jun 26 06:06:49 2001 -@@ -1,5 +1,13 @@ +--- extconf.rb.orig Mon Jun 25 00:08:39 2001 ++++ extconf.rb Mon Feb 25 14:02:41 2002 +@@ -1,5 +1,17 @@ require 'mkmf' +glib_config = with_config("glib-config", "glib-config") @@ -11,10 +11,14 @@ +$CFLAGS += " " + %x(#{gtk_config} --cflags).chomp +$LDFLAGS += " " + %x(#{gtk_config} --libs).chomp + ++libglade_config = with_config("libglade-config", "libglade-config") ++$CFLAGS += " " + %x(#{libglade_config} --cflags).chomp ++$LDFLAGS += " " + %x(#{libglade_config} --libs).chomp ++ $objs = ["rbglade.o"] dir_config("glade") -@@ -16,5 +24,3 @@ +@@ -16,5 +28,3 @@ end create_makefile("lglade") diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile index b5d8f9ce6697..6766bd725592 100644 --- a/devel/ruby-libglade2/Makefile +++ b/devel/ruby-libglade2/Makefile @@ -7,7 +7,7 @@ PORTNAME= libglade PORTVERSION= 1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel ruby gnome MASTER_SITES= http://beta4.com/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -17,6 +17,7 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk +LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade USE_RUBY= yes USE_RUBY_EXTCONF= yes diff --git a/devel/ruby-libglade2/files/patch-extconf.rb b/devel/ruby-libglade2/files/patch-extconf.rb index 834c84d47b5c..1ae3d336a9e9 100644 --- a/devel/ruby-libglade2/files/patch-extconf.rb +++ b/devel/ruby-libglade2/files/patch-extconf.rb @@ -1,6 +1,6 @@ ---- extconf.rb.orig Mon Jun 25 07:08:39 2001 -+++ extconf.rb Tue Jun 26 06:06:49 2001 -@@ -1,5 +1,13 @@ +--- extconf.rb.orig Mon Jun 25 00:08:39 2001 ++++ extconf.rb Mon Feb 25 14:02:41 2002 +@@ -1,5 +1,17 @@ require 'mkmf' +glib_config = with_config("glib-config", "glib-config") @@ -11,10 +11,14 @@ +$CFLAGS += " " + %x(#{gtk_config} --cflags).chomp +$LDFLAGS += " " + %x(#{gtk_config} --libs).chomp + ++libglade_config = with_config("libglade-config", "libglade-config") ++$CFLAGS += " " + %x(#{libglade_config} --cflags).chomp ++$LDFLAGS += " " + %x(#{libglade_config} --libs).chomp ++ $objs = ["rbglade.o"] dir_config("glade") -@@ -16,5 +24,3 @@ +@@ -16,5 +28,3 @@ end create_makefile("lglade") |