Update to 20000831. (forgotten to do that for long..) Now it works

with Ruby 1.6 and later.

8 files changed, 14 insertions, 119 deletions

diff --git a/x11-toolkits/ruby-fltk/Makefile b/x11-toolkits/ruby-fltk/Makefile
index 8d96320d11d..bc14a13c080 100644
--- a/x11-toolkits/ruby-fltk/Makefile
+++ b/x11-toolkits/ruby-fltk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fltk
-PORTVERSION=	20000618
+PORTVERSION=	20000831
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	http://kt-www.jaist.ac.jp:8000/~ttate/ftp/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -24,7 +24,7 @@ USE_MESA=	yes
 
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
 INSTALL_TARGET=	site-install
 CONFIGURE_ARGS=	--with-fltk-dir="${X11BASE}" --with-gl-dir="${X11BASE}"
 MAKE_ARGS=	LOCAL_LIBS="-lgcc"
@@ -32,10 +32,10 @@ MAKE_ARGS=	LOCAL_LIBS="-lgcc"
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/fltk
-	${INSTALL_DATA} ${WRKSRC}/test/adjuster.rb ${RUBY_EXAMPLESDIR}/fltk/
+	${INSTALL_DATA} ${WRKSRC}/test/*.rb ${RUBY_EXAMPLESDIR}/fltk/
 	${MKDIR} ${RUBY_DOCDIR}/fltk/ja
 	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/fltk/
-	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/fltk/ja/
+	${INSTALL_DATA} ${WRKSRC}/README.euc.jp ${WRKSRC}/README.utf8 ${RUBY_DOCDIR}/fltk/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-fltk/distinfo b/x11-toolkits/ruby-fltk/distinfo
index 363860c830c..020fe865173 100644
--- a/x11-toolkits/ruby-fltk/distinfo
+++ b/x11-toolkits/ruby-fltk/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-fltk-20000618.tar.gz) = 26d910c0b49f79c743fc52e14c27db06
+MD5 (ruby/ruby-fltk-20000831.tar.gz) = 020f63da8aacc46bb12747e413d97a66
diff --git a/x11-toolkits/ruby-fltk/files/patch-aa b/x11-toolkits/ruby-fltk/files/patch-aa
deleted file mode 100644
index d33195ab897..00000000000
--- a/x11-toolkits/ruby-fltk/files/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
---- extconf.rb.orig	Sun Jun 18 21:04:07 2000
-+++ extconf.rb	Fri Aug 25 03:54:53 2000
-@@ -12,40 +12,17 @@
- 
- if( ARGV.include?("--help") )
-   print <<EOF
--  --with-fltk            specify the fltk install prefix.
--  --with-fltk-incdir     specify the directory which contains fltk header files.
--  --with-fltk-libdir     specify the directory which contains fltk library.
--  --with-gl              specify the GL install prefix.
--  --with-gl-incdir       specify the directory which contains GL header files.
--  --with-gl-libdir       specify the directory which contains GL library.
-+  --with-fltk-dir        specify the fltk install prefix.
-+  --with-fltk-include    specify the directory which contains fltk header files.
-+  --with-fltk-lib        specify the directory which contains fltk library.
-+  --with-gl-dir          specify the GL install prefix.
-+  --with-gl-include      specify the directory which contains GL header files.
-+  --with-gl-lib          specify the directory which contains GL library.
- EOF
- end
- 
--if( fltk_prefix = with_config("fltk") )
--  $CFLAGS  += " -I" + File.join(fltk_prefix,"include")
--  $LDFLAGS += " -L" + File.join(fltk_prefix,"lib")
--end
--
--if( fltk_incdir = with_config("fltk-incdir") )
--  $CFLAGS += " -I" + fltk_incdir
--end
--
--if( fltk_libdir = with_config("fltk-libdir") )
--  $LDFLAGS += " -L" + fltk_libdir
--end
--
--if( gl_prefix = with_config("gl") )
--  $CFLAGS  += " -I" + File.join(gl_prefix,"include")
--  $LDFLAGS += " -L" + File.join(gl_prefix,"lib")
--end
--
--if( gl_incdir = with_config("gl-incdir") )
--  $CFLAGS += " -I" + gl_incdir
--end
--
--if( gl_libdir = with_config("gl-libdir") )
--  $LDFLAGS += " -L" + gl_libdir
--end
-+dir_config("fltk")
-+dir_config("gl")
- 
- if( have_header("FL/Fl.H") &&
-    have_library("GL",nil) &&
diff --git a/x11-toolkits/ruby-fltk/files/patch-ab b/x11-toolkits/ruby-fltk/files/patch-ab
deleted file mode 100644
index 67d68540a23..00000000000
--- a/x11-toolkits/ruby-fltk/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- README.jp.orig	Fri Jun  9 23:00:00 2000
-+++ README.jp	Fri Aug 25 04:32:41 2000
-@@ -8,7 +8,7 @@
- FltkとはFast Light Tool Kitの略であり、その名の
- 通り速く軽い X Window System 上のGUIライブラリです。
- Fltk自体はBill Spitzak(spitzak@d2.com)さんが作成
--されておりGPLに従って配布されています。
-+されておりLGPLに従って配布されています。
- 
- 
- 2. インストール
diff --git a/x11-toolkits/ruby-fltk/files/patch-ac b/x11-toolkits/ruby-fltk/files/patch-ac
deleted file mode 100644
index ffd4fc5f2fa..00000000000
--- a/x11-toolkits/ruby-fltk/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- README.orig	Fri Jun  9 23:00:17 2000
-+++ README	Fri Aug 25 04:33:13 2000
-@@ -5,9 +5,9 @@
- 
- 1. What's Fltk
- --------------
--Fltk mean "Fast Light Tool Kit". Fltk is written
--by Bill Spitzak(spitzak@d2.com),     distrebuted
--under GPL. 
-+Fltk means "Fast Light Tool Kit". Fltk is written
-+by Bill Spitzak(spitzak@d2.com),     distributed
-+under LGPL. 
- 
- 
- 2. Installation
-@@ -31,11 +31,11 @@
- 
- 4. Non-Guarantee
- ----------------
--The author can't guarantee the obstacles occured
-+The author can't guarantee the obstacles occurred
- by the programs and documentations. But I try to
- fix any bugs as quickly as possible.
- 
- 5. Reporting
- -------------
--I wish your bug reports and some patches.
-+I'd appreciate your bug reports and patches.
- Please mail to me <ttate@jaist.ac.jp>.
diff --git a/x11-toolkits/ruby-fltk/files/patch-ad b/x11-toolkits/ruby-fltk/files/patch-ad
deleted file mode 100644
index 419a9913557..00000000000
--- a/x11-toolkits/ruby-fltk/files/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
---- test/adjuster.rb.orig	Sun Jun 18 20:09:26 2000
-+++ test/adjuster.rb	Fri Aug 25 14:37:17 2000
-@@ -8,16 +8,16 @@
-   def end
-     super
-     show
--    callback(proc{|w| print "eixt!\n"; exit})
-+    callback(proc{|w| print "exit!\n"; exit})
-   end
- end
- 
- $win = MainWindow.new(200,200)
- $val = Fltk::Adjuster.new(0,0,200,100)
- $val.value(0)
--$val.label("値 = " + $val.value.to_s)
-+$val.label("value = " + $val.value.to_s)
- $val.callback(proc{|w|
--		$val.label("値 = " + $val.value.to_s)
-+		$val.label("value = " + $val.value.to_s)
- 		$win.redraw
- 	      })
- $win.end
diff --git a/x11-toolkits/ruby-fltk/files/patch-adjuster.rb b/x11-toolkits/ruby-fltk/files/patch-adjuster.rb
new file mode 100644
index 00000000000..a16ee854a1d
--- /dev/null
+++ b/x11-toolkits/ruby-fltk/files/patch-adjuster.rb
@@ -0,0 +1,6 @@
+--- test/adjuster.rb.orig	Thu Aug 31 22:43:18 2000
++++ test/adjuster.rb	Mon Mar 19 00:42:07 2001
+@@ -1,2 +1,2 @@
+-require "./fltk"
++require "fltk"
+ 
diff --git a/x11-toolkits/ruby-fltk/pkg-plist b/x11-toolkits/ruby-fltk/pkg-plist
index 9274bc8b345..b2013a41069 100644
--- a/x11-toolkits/ruby-fltk/pkg-plist
+++ b/x11-toolkits/ruby-fltk/pkg-plist
@@ -1,7 +1,9 @@
 %%RUBY_SITEARCHLIBDIR%%/fltk.so
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fltk/adjuster.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fltk/pack.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/fltk
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fltk/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fltk/ja/README.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fltk/ja/README.euc.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fltk/ja/README.utf8
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fltk/ja
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fltk