6 files changed, 42 insertions, 8 deletions

diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index b01972a1bf02..08197ed785ae 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby-gtk
-# Version required:     0.20
+# Version required:     0.21
 # Date created:         19 April 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/26 21:22:49 cpiazza Exp $
 #
 
-DISTNAME=	ruby-gtk-0.20
+DISTNAME=	ruby-gtk-0.21
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \
 		ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
@@ -30,15 +30,25 @@ 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}
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${PREFIX}/lib/ruby/${RUBY_VER}
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk
 	${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>
diff --git a/x11-toolkits/ruby-gtk/distinfo b/x11-toolkits/ruby-gtk/distinfo
index e6ded3592ae3..37e06183a4ce 100644
--- a/x11-toolkits/ruby-gtk/distinfo
+++ b/x11-toolkits/ruby-gtk/distinfo
@@ -1 +1 @@
-MD5 (ruby-gtk-0.20.tar.gz) = f1baf7fd43dde9ab44cb4e783c8d431c
+MD5 (ruby-gtk-0.21.tar.gz) = c93477a649e5982379fcba756ab8825c
diff --git a/x11-toolkits/ruby-gtk/pkg-plist b/x11-toolkits/ruby-gtk/pkg-plist
index d4ac46a1e9ca..edd0a1e93db3 100644
--- a/x11-toolkits/ruby-gtk/pkg-plist
+++ b/x11-toolkits/ruby-gtk/pkg-plist
@@ -1,4 +1,5 @@
 lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/gtk.so
+lib/ruby/%%RUBY_VER%%/gtkcompat.rb
 share/examples/ruby/gtk/drawing.rb
 share/examples/ruby/gtk/helloworld.rb
 share/examples/ruby/gtk/text.rb
@@ -8,4 +9,10 @@ share/examples/ruby/gtk/browser/rbbr_gtk.rb
 share/examples/ruby/gtk/browser/rbbr_rb.rb
 share/examples/ruby/gtk/browser/rbdump.rb
 @dirrm share/examples/ruby/gtk/browser
+share/examples/ruby/gtk/gdkimlib/sample1.rb
+share/examples/ruby/gtk/gdkimlib/sample2.rb
+share/examples/ruby/gtk/gdkimlib/sample3.rb
+share/examples/ruby/gtk/gdkimlib/sample4.rb
+share/examples/ruby/gtk/gdkimlib/sample5.rb
+@dirrm share/examples/ruby/gtk/gdkimlib
 @dirrm share/examples/ruby/gtk
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index b01972a1bf02..08197ed785ae 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby-gtk
-# Version required:     0.20
+# Version required:     0.21
 # Date created:         19 April 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/08/26 21:22:49 cpiazza Exp $
 #
 
-DISTNAME=	ruby-gtk-0.20
+DISTNAME=	ruby-gtk-0.21
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.ueda.info.waseda.ac.jp/~igarashi/ruby/ \
 		ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
@@ -30,15 +30,25 @@ 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}
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${PREFIX}/lib/ruby/${RUBY_VER}
 	${MKDIR} ${PREFIX}/share/examples/ruby/gtk
 	${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>
diff --git a/x11-toolkits/ruby-gtk2/distinfo b/x11-toolkits/ruby-gtk2/distinfo
index e6ded3592ae3..37e06183a4ce 100644
--- a/x11-toolkits/ruby-gtk2/distinfo
+++ b/x11-toolkits/ruby-gtk2/distinfo
@@ -1 +1 @@
-MD5 (ruby-gtk-0.20.tar.gz) = f1baf7fd43dde9ab44cb4e783c8d431c
+MD5 (ruby-gtk-0.21.tar.gz) = c93477a649e5982379fcba756ab8825c
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index d4ac46a1e9ca..edd0a1e93db3 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -1,4 +1,5 @@
 lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/gtk.so
+lib/ruby/%%RUBY_VER%%/gtkcompat.rb
 share/examples/ruby/gtk/drawing.rb
 share/examples/ruby/gtk/helloworld.rb
 share/examples/ruby/gtk/text.rb
@@ -8,4 +9,10 @@ share/examples/ruby/gtk/browser/rbbr_gtk.rb
 share/examples/ruby/gtk/browser/rbbr_rb.rb
 share/examples/ruby/gtk/browser/rbdump.rb
 @dirrm share/examples/ruby/gtk/browser
+share/examples/ruby/gtk/gdkimlib/sample1.rb
+share/examples/ruby/gtk/gdkimlib/sample2.rb
+share/examples/ruby/gtk/gdkimlib/sample3.rb
+share/examples/ruby/gtk/gdkimlib/sample4.rb
+share/examples/ruby/gtk/gdkimlib/sample5.rb
+@dirrm share/examples/ruby/gtk/gdkimlib
 @dirrm share/examples/ruby/gtk