3 files changed, 39 insertions, 32 deletions

diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index 6766bd725592..dce569cd462e 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	libglade
-PORTVERSION=	1.2
-PORTREVISION=	2
+PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTEPOCH=	1
 CATEGORIES=	devel ruby gnome
-MASTER_SITES=	http://beta4.com/
+MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}-${PORTVERSION:S/./-/g}
+DISTNAME=	${RUBY_GNOME_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -23,10 +24,9 @@ USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 USE_GNOME=	yes
 
-WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
-CONFIGURE_ARGS=	--with-glade-include="${LOCALBASE}/include/glade" \
-		--with-glib-config="${GLIB_CONFIG}" \
-		--with-gtk-config="${GTK_CONFIG}"
+.include "${.CURDIR}/../../x11/ruby-gnome/Makefile.common"
+
+WRKSRC=		${RUBY_GNOME_WRKSRC}/${PORTNAME}
 INSTALL_TARGET=	site-install
 
 post-install:
diff --git a/devel/ruby-libglade2/files/patch-extconf.rb b/devel/ruby-libglade2/files/patch-extconf.rb
index 1ae3d336a9e9..eb21d0573920 100644
--- a/devel/ruby-libglade2/files/patch-extconf.rb
+++ b/devel/ruby-libglade2/files/patch-extconf.rb
@@ -1,26 +1,32 @@
---- 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")
-+$CFLAGS += " " + %x(#{glib_config} --cflags).chomp
-+$LDFLAGS += " " + %x(#{glib_config} --libs).chomp
-+
-+gtk_config = with_config("gtk-config", "gtk-config")
-+$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 +28,3 @@
+--- extconf.rb.orig	Wed Dec 12 10:24:28 2001
++++ extconf.rb	Wed Mar 20 21:25:58 2002
+@@ -9,24 +9,16 @@
+ #
+ # detect libglade configurations
+ #
+-config_cmds = ["libglade-config"]
++config_cmd = with_config("libglade-config", "libglade-config")
+ while /^--/ =~ ARGV[0]
+   ARGV.shift
  end
+-if ARGV.size > 0
+-  config_cmds.unshift(ARGV[0])
+-end
  
- create_makefile("lglade")
--system('echo LDFLAGS+=`gtk-config --libs` >> Makefile')
--system('echo CFLAGS+=`gtk-config --cflags` >> Makefile')
+ begin
+-  config_cmds.each do |config_cmd|
+-    version = `#{config_cmd} --version`
+-    if not version.chomp.empty?
+-      config_libs, config_cflags = "--libs", "--cflags"
+-      $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.split(/(-l.*)/)
+-      $libs = libs.join(' ') + ' ' + $libs
+-      $CFLAGS = `#{config_cmd} #{config_cflags}`.chomp
+-      break
+-    end
++  version = `#{config_cmd} --version`
++  if not version.chomp.empty?
++    $CFLAGS += ' ' + `#{config_cmd} --cflags`.chomp
++    $LDFLAGS += ' ' + `#{config_cmd} --libs`.chomp
+   end
+ rescue
+   $LDFLAGS = '-L/usr/X11R6/lib -L/usr/local/lib'
diff --git a/devel/ruby-libglade2/pkg-plist b/devel/ruby-libglade2/pkg-plist
index 331700550447..02d26c97edaf 100644
--- a/devel/ruby-libglade2/pkg-plist
+++ b/devel/ruby-libglade2/pkg-plist
@@ -1,4 +1,5 @@
 %%RUBY_SITEARCHLIBDIR%%/lglade.so
+%%RUBY_SITELIBDIR%%/libglade.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.glade
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/libglade/test.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/libglade