7 files changed, 78 insertions, 36 deletions

diff --git a/graphics/ruby-gimp/Makefile b/graphics/ruby-gimp/Makefile
index 680550a5b72f..791c6f8d39a3 100644
--- a/graphics/ruby-gimp/Makefile
+++ b/graphics/ruby-gimp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	20000227
+PORTVERSION=	20010315
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://homepage1.nifty.com/susho/software/gimp/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -15,6 +15,7 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
+BUILD_DEPENDS=	gimptool:${.CURDIR}/../gimp1
 LIB_DEPENDS=	gimp.1:${.CURDIR}/../gimp1
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
 
@@ -25,10 +26,19 @@ WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 INSTALL_TARGET=	site-install
 PLIST_SUB=	X11BASE="${X11BASE}"
 
-DOCS_EN=	ENVIRONMENT \
+DOCS_EN=	ChangeLog \
+		ENVIRONMENT \
 		README \
 		TODO
-DOCS_JA=	MEMO.ja
+DOCS_JA=	doc/API.ja.html \
+		doc/BUGS.ja \
+		doc/MEMO.ja
+
+#post-build:
+#	cd ${WRKSRC}/embed && ${SETENV} CC='${CC}' \
+#	CFLAGS='-I${RUBY_ARCHLIBDIR} -DMODULE_COMPILATION' \
+#	LDFLAGS='-L${PREFIX}/lib -lruby' \
+#	gimptool --build rubymod.c
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/plug-ins/*.rb ${X11BASE}/libexec/gimp/1.2/plug-ins/
diff --git a/graphics/ruby-gimp/distinfo b/graphics/ruby-gimp/distinfo
index 9cbfeea842df..4c32a01f9ad2 100644
--- a/graphics/ruby-gimp/distinfo
+++ b/graphics/ruby-gimp/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-gimp-snapshot-20000227.tar.gz) = a0a6f1d1a746f886bcab3cc9ea3e6a66
+MD5 (ruby/ruby-gimp-snapshot-20010315.tar.gz) = 2fd0908f23d4b6062cc3e7fa39fc2c6b
diff --git a/graphics/ruby-gimp/files/patch-gimp::extconf.rb b/graphics/ruby-gimp/files/patch-gimp::extconf.rb
index cff4a5c70049..2227be8fe343 100644
--- a/graphics/ruby-gimp/files/patch-gimp::extconf.rb
+++ b/graphics/ruby-gimp/files/patch-gimp::extconf.rb
@@ -1,12 +1,15 @@
---- gimp/extconf.rb.orig	Fri Feb 23 04:53:23 2001
-+++ gimp/extconf.rb	Wed Feb 28 22:43:04 2001
-@@ -2,8 +2,8 @@
- require '../mkmf_gimp.rb'
- 
+--- gimp/extconf.rb.orig	Thu Mar 15 03:50:32 2001
++++ gimp/extconf.rb	Sun Mar 18 04:55:15 2001
+@@ -4,9 +4,9 @@
  $CFLAGS  += ' ' + GimpConfig::CFLAGS
-+$LDFLAGS += ' ' + GimpConfig::LDFLAGS
+ $LDFLAGS += ' ' + GimpConfig::LDFLAGS
+ 
+-if have_library(GimpConfig::LIBGLIB, "g_print") and
+-   have_library(GimpConfig::LIBGTK, "gtk_init") and
+-   have_library(GimpConfig::LIBGIMP, "gimp_main") and
++if have_func("g_print") and
++   have_func("gtk_init") and
++   have_func("gimp_main") and
+    have_header("libgimp/gimp.h")
+   have_func("gimp_sysconf_directory")
  
- if have_gimp_library("gimp", "gimp_main") and have_header("libgimp/gimp.h")
--#  $LDFLAGS += ' ' + GimpConfig::LDFLAGS
-   create_makefile("gimp")
- end
diff --git a/graphics/ruby-gimp/files/patch-gimpui::extconf.rb b/graphics/ruby-gimp/files/patch-gimpui::extconf.rb
index 880c373f8a30..20bf63b89a9b 100644
--- a/graphics/ruby-gimp/files/patch-gimpui::extconf.rb
+++ b/graphics/ruby-gimp/files/patch-gimpui::extconf.rb
@@ -1,13 +1,19 @@
---- gimpui/extconf.rb.orig	Fri Feb 23 04:55:36 2001
-+++ gimpui/extconf.rb	Wed Feb 28 22:42:45 2001
-@@ -2,9 +2,8 @@
- require '../mkmf_gimp.rb'
- 
+--- gimpui/extconf.rb.orig	Thu Mar 15 10:48:42 2001
++++ gimpui/extconf.rb	Sun Mar 18 04:55:36 2001
+@@ -4,11 +4,11 @@
  $CFLAGS  += ' ' + GimpConfig::CFLAGS
--$LDFLAGS += ' -lgimp'
-+$LDFLAGS += ' ' + GimpConfig::LDFLAGS
+ $LDFLAGS += ' ' + GimpConfig::LDFLAGS
+ 
+-if have_library(GimpConfig::LIBGLIB, "g_print") and
+-   have_library(GimpConfig::LIBGDK, "gdk_init") and
+-   have_library(GimpConfig::LIBGTK, "gtk_init") and
+-   have_library(GimpConfig::LIBGIMP, "gimp_main") and
+-   have_library(GimpConfig::LIBGIMPUI, "gimp_ui_init") and
++if have_func("g_print") and
++   have_func("gdk_init") and
++   have_func("gtk_init") and
++   have_func("gimp_main") and
++   have_func("gimp_ui_init") and
+    have_header("libgimp/gimpui.h")
  
- if have_gimp_library("gimpui", "gimp_ui_init") and have_header("libgimp/gimpui.h")
--#  $LDFLAGS += ' ' + GimpConfig::LDFLAGS
-   create_makefile("gimpui")
- end
+   have_func("gimp_mem_size_entry_new")
diff --git a/graphics/ruby-gimp/files/patch-mkmf_gimp.rb b/graphics/ruby-gimp/files/patch-mkmf_gimp.rb
new file mode 100644
index 000000000000..12bc691d60ed
--- /dev/null
+++ b/graphics/ruby-gimp/files/patch-mkmf_gimp.rb
@@ -0,0 +1,30 @@
+--- mkmf_gimp.rb.orig	Thu Mar 15 00:55:02 2001
++++ mkmf_gimp.rb	Sun Mar 18 04:54:48 2001
+@@ -22,25 +22,10 @@
+   else
+     config_cmds = "#{CONFIG['RUBY_INSTALL_NAME']} ../gimp-config.mingw"
+   end
+-  if ARGV.size > 0
+-    config_cmds = ARGV.shift
+-  end
++
++  config_cmds = with_config("gimp-config", config_cmds)
+ 
+   CFLAGS  = `#{config_cmds} --cflags`.chomp
+   LDFLAGS = `#{config_cmds} --libs`.chomp
+-
+-  if /win32|mingw/ =~ RUBY_PLATFORM
+-    LIBGLIB   = "glib-1.3"
+-    LIBGDK    = "gdk-1.3"
+-    LIBGTK    = "gtk-1.3"
+-    LIBGIMP   = "gimp-1.2"
+-    LIBGIMPUI = "gimpui-1.2"
+-  else
+-    LIBGLIB   = "glib"
+-    LIBGDK    = "gdk"
+-    LIBGTK    = "gtk"
+-    LIBGIMP   = "gimp"
+-    LIBGIMPUI = "gimpui"
+-  end
+ 
+ end
diff --git a/graphics/ruby-gimp/files/patch-plug-ins::eval.rb b/graphics/ruby-gimp/files/patch-plug-ins::eval.rb
deleted file mode 100644
index 9a841276f6e2..000000000000
--- a/graphics/ruby-gimp/files/patch-plug-ins::eval.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/eval.rb.orig	Tue Feb 27 20:08:13 2001
-+++ plug-ins/eval.rb	Thu Mar  1 01:29:43 2001
-@@ -13,7 +13,7 @@
- 	 "",
- 	 [
- 	   [RF_STRING, "code", "Code to eval", "", true],
--	 ],
-+	 ]
- ) { |text|
-   eval(text)
- }
diff --git a/graphics/ruby-gimp/pkg-plist b/graphics/ruby-gimp/pkg-plist
index 450dfb830685..69c8a4f2bdba 100644
--- a/graphics/ruby-gimp/pkg-plist
+++ b/graphics/ruby-gimp/pkg-plist
@@ -8,7 +8,10 @@
 %%PORTDOCS%%%%RUBY_DOCDIR%%/gimp/TODO
 %%PORTDOCS%%%%RUBY_DOCDIR%%/gimp/README
 %%PORTDOCS%%%%RUBY_DOCDIR%%/gimp/ENVIRONMENT
+%%PORTDOCS%%%%RUBY_DOCDIR%%/gimp/ChangeLog
 %%PORTDOCS%%%%RUBY_DOCDIR%%/gimp/ja/MEMO.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/gimp/ja/BUGS.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/gimp/ja/API.ja.html
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gimp/ja
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gimp
 @cwd %%X11BASE%%
@@ -16,6 +19,7 @@ libexec/gimp/1.2/plug-ins/clothify.rb
 libexec/gimp/1.2/plug-ins/coolmetal-logo.rb
 libexec/gimp/1.2/plug-ins/erase-rows.rb
 libexec/gimp/1.2/plug-ins/eval.rb
+libexec/gimp/1.2/plug-ins/gimp-druby.rb
 libexec/gimp/1.2/plug-ins/list_images.rb
 libexec/gimp/1.2/plug-ins/raindrop.rb
 libexec/gimp/1.2/plug-ins/rendermap.rb