Adapt this package to NetBSD.

6 files changed, 26 insertions, 36 deletions

diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index 296c284d243..5bd18c74c34 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:    ruby-gtk
-# Version required:     0.21
-# Date created:         19 April 1999
-# Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
-#
-# $FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.3 1999/08/31 02:59:33 peter Exp $
-#
+# $NetBSD: Makefile,v 1.2 1999/09/17 05:00:21 sakamoto Exp $
+# FreeBSD Id: ports/x11-toolkits/ruby-gtk/Makefile,v 1.3 1999/08/31 02:59:33 peter Exp
 
 DISTNAME=	ruby-gtk-0.21
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11
 MASTER_SITES=	http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \
 		ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/contrib/ \
@@ -16,29 +11,21 @@ MASTER_SITES=	http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \
 		ftp://ftp.krnet.ne.jp/pub/ruby/contrib/ \
 		ftp://mirror.nucba.ac.jp/mirror/ruby/contrib/
 
-MAINTAINER=	yasuf@big.or.jp
+MAINTAINER=	sakamoto@netbsd.org
+HOMEPAGE=	http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/gtk.html
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+DEPENDS+=	ruby-1.4.2:../../lang/ruby
+DEPENDS+=	gtk+-1.2.4:../../x11/gtk
+DEPENDS+=	imlib-1.9.4:../../graphics/imlib
 
-USE_XLIB=	yes
+USE_X11=	YES
 WRKSRC=		${WRKDIR}/gtk
-PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
+PLIST_SUBST=	RUBY_VERSION=1.4
 
 RUBY=		${PREFIX}/bin/ruby
-RUBY_VER=	1.4
-RUBY_ARCH=	${ARCH}-freebsd${OSREL}
-
-.if defined(NO_IMLIB)
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-.else
-LIB_DEPENDS+=	Imlib.4:${PORTSDIR}/graphics/imlib
-GTK_CONFIG?=	${X11BASE}/bin/imlib-config
-.endif
 
 do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${GTK_CONFIG}
+	@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${GTK_CONFIG})
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${PREFIX}/lib/ruby/${RUBY_VER}
@@ -46,9 +33,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${PREFIX}/share/examples/ruby/gtk
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk/browser
 	${INSTALL_DATA} ${WRKSRC}/doc/*.rb ${PREFIX}/share/examples/ruby/gtk/browser
-.if !defined(NO_IMLIB)
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk/gdkimlib
 	${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${PREFIX}/share/examples/ruby/gtk/gdkimlib
-.endif
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gtk/files/md5 b/x11/ruby-gtk/files/md5
index 37e06183a4c..5ae2c9fe3e2 100644
--- a/x11/ruby-gtk/files/md5
+++ b/x11/ruby-gtk/files/md5
@@ -1 +1,3 @@
+$NetBSD: md5,v 1.2 1999/09/17 05:00:21 sakamoto Exp $
+
 MD5 (ruby-gtk-0.21.tar.gz) = c93477a649e5982379fcba756ab8825c
diff --git a/x11/ruby-gtk/files/patch-sum b/x11/ruby-gtk/files/patch-sum
new file mode 100644
index 00000000000..860f005abe0
--- /dev/null
+++ b/x11/ruby-gtk/files/patch-sum
@@ -0,0 +1,3 @@
+$NetBSD: patch-sum,v 1.1 1999/09/17 05:00:21 sakamoto Exp $
+
+MD5 (patch-aa) = f9192647a145ae61c2a4837c4c8d6016
diff --git a/x11/ruby-gtk/patches/patch-aa b/x11/ruby-gtk/patches/patch-aa
index c225b857c02..33f6e77da78 100644
--- a/x11/ruby-gtk/patches/patch-aa
+++ b/x11/ruby-gtk/patches/patch-aa
@@ -1,7 +1,8 @@
+$NetBSD: patch-aa,v 1.2 1999/09/17 05:00:22 sakamoto Exp $
+
 --- extconf.rb.orig	Sat Aug  7 02:57:08 1999
-+++ extconf.rb	Wed Aug 25 08:44:11 1999
-@@ -8,22 +8,26 @@
- # detect GTK+ (and Imlib) configurations
++++ extconf.rb	Fri Sep 17 12:54:56 1999
+@@ -9,20 +9,24 @@
  #
  if /mswin32/ !~ PLATFORM
 -  config_cmds = [
@@ -19,6 +20,7 @@
 +    config_cmds.each do |config_cmd|
        version = `#{config_cmd} --version`
        if not version.chomp.empty?
+-	$LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.split(/(-l.*)/)
 +	if /^imlib/ === File.basename(config_cmd)
 +	  with_imlib = true
 +	  config_libs, config_cflags = "--libs-gdk", "--cflags-gdk"
@@ -26,11 +28,10 @@
 +	  with_imlib = false
 +	  config_libs, config_cflags = "--libs", "--cflags"
 +	end
- 	$LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.split(/(-l.*)/)
++	$LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.gsub("-Wl,","").split(/(-l.*)/)
  	$libs = libs.join(' ') + ' ' + $libs
  	$CFLAGS = `#{config_cmd} #{config_cflags}`.chomp
 -	if /^imlib/ === config_cmd
 +	if with_imlib
  	  $CFLAGS = $CFLAGS + " -DHAVE_GDKIMLIB"
  	  STDERR.puts("Imlib support enabled.")
- 	end
diff --git a/x11/ruby-gtk/pkg/DESCR b/x11/ruby-gtk/pkg/DESCR
index 61d97de5782..9b9da834e89 100644
--- a/x11/ruby-gtk/pkg/DESCR
+++ b/x11/ruby-gtk/pkg/DESCR
@@ -1,6 +1,4 @@
 Ruby extension module to use Gtk+.
 
-WWW: http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/gtk.html
-
 - Yasuhiro Fukuma
 yasuf@big.or.jp
diff --git a/x11/ruby-gtk/pkg/PLIST b/x11/ruby-gtk/pkg/PLIST
index edd0a1e93db..062f6be7a8b 100644
--- a/x11/ruby-gtk/pkg/PLIST
+++ b/x11/ruby-gtk/pkg/PLIST
@@ -1,5 +1,6 @@
-lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/gtk.so
-lib/ruby/%%RUBY_VER%%/gtkcompat.rb
+@comment $NetBSD: PLIST,v 1.2 1999/09/17 05:00:22 sakamoto Exp $
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/gtk.so
+lib/ruby/gtkcompat.rb
 share/examples/ruby/gtk/drawing.rb
 share/examples/ruby/gtk/helloworld.rb
 share/examples/ruby/gtk/text.rb