4 files changed, 62 insertions, 29 deletions

diff --git a/x11-toolkits/ruby-fox/Makefile b/x11-toolkits/ruby-fox/Makefile
index 74c239f1b3ed..0d443c886060 100644
--- a/x11-toolkits/ruby-fox/Makefile
+++ b/x11-toolkits/ruby-fox/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	FOX.1:${PORTSDIR}/x11-toolkits/fox \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-FOX_VERSION=	0.99.189
+FOX_VERSION=	1.0.3
 #FXRUBY_REVISION=	
 .if defined(FXRUBY_REVISION) && !empty(FXRUBY_REVISION)
 FXRUBY_PORTVERSION=	${FOX_VERSION}.${FXRUBY_REVISION}
diff --git a/x11-toolkits/ruby-fox/distinfo b/x11-toolkits/ruby-fox/distinfo
index 15209f0c41c3..7c4816044662 100644
--- a/x11-toolkits/ruby-fox/distinfo
+++ b/x11-toolkits/ruby-fox/distinfo
@@ -1 +1 @@
-MD5 (ruby/FXRuby-0.99.189.tar.gz) = 0f8bb40b5d465311965444fac678eef4
+MD5 (ruby/FXRuby-1.0.3.tar.gz) = 8d1931e236402793b8f3b035d72c4c2d
diff --git a/x11-toolkits/ruby-fox/files/patch-extconf.rb b/x11-toolkits/ruby-fox/files/patch-extconf.rb
index e609a8c3404f..dbdaa5095fdf 100644
--- a/x11-toolkits/ruby-fox/files/patch-extconf.rb
+++ b/x11-toolkits/ruby-fox/files/patch-extconf.rb
@@ -1,11 +1,11 @@
---- ext/fox/extconf.rb.orig	Sun Jan 27 03:57:10 2002
-+++ ext/fox/extconf.rb	Sun Jan 27 04:01:57 2002
-@@ -120,7 +120,7 @@
+--- ext/fox/extconf.rb.orig	Fri Mar 22 08:00:40 2002
++++ ext/fox/extconf.rb	Fri Mar 22 12:13:55 2002
+@@ -129,7 +129,7 @@
    find_library("GL", "glXCreateContext", "/usr/X11R6/lib")
    find_library("GLU", "gluNewQuadric", "/usr/X11R6/lib")
    $libs = append_library($libs, "FOX")
--  $CFLAGS = $CFLAGS + "-O0 -DSWIG_NOINCLUDE -Iinclude"
-+  $CFLAGS = $CFLAGS + "-DSWIG_NOINCLUDE -Iinclude -fno-strict-prototype -fpermissive"
-   if isScintillaBuild
+-  $CFLAGS = $CFLAGS + "-O0 -Iinclude"
++  $CFLAGS = $CFLAGS + "-O0 -Iinclude -fno-strict-prototype -fpermissive"
+   if is_scintilla_build?
+     File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
-     $libs = append_library($libs, "scintilla")
diff --git a/x11-toolkits/ruby-fox/pkg-plist b/x11-toolkits/ruby-fox/pkg-plist
index 9ca220efebec..50b1d67a1eb2 100644
--- a/x11-toolkits/ruby-fox/pkg-plist
+++ b/x11-toolkits/ruby-fox/pkg-plist
@@ -11,6 +11,7 @@
 %%RUBY_SITELIBDIR%%/fox/undolist.rb
 @dirrm %%RUBY_SITELIBDIR%%/fox
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/README
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/babelfish.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/browser.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/button.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/datatarget.rb
@@ -26,21 +27,14 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/header.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/hello.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/hello2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/image.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/imageviewer.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/inputs.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/mditest.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/scintilla-test.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/scribble-orig.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/scribble.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/shutter.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/splitter.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/tabbook.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/table.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/textedit/commands.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/textedit/helpwindow.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/textedit/prefdialog.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/textedit/textedit.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/iRAA.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/AngryGuyInBunnySuit.ico
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/FatBot.ico
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/FlippedySwitch.ico
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/LeGoon.ico
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/Net.ico
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/RedMacOS.ico
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/SawBlade.ico
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/backview.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/big_gif.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/bigfolder.gif
@@ -90,27 +84,66 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/undo_gif.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/winapp.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/zoom.gif
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/image.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/imageviewer.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/inputs.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/mditest.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/raabrowser.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/scintilla-test.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/scintilla_wrapper.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/scribble-orig.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/scribble.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/shutter.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/splitter.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/tabbook.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/table.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/textedit/commands.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/textedit/helpwindow.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/textedit/prefdialog.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/textedit/textedit.rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/fox/icons
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/fox/textedit
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/fox
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/ANNOUNCE
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/ChangeLog
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/index.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/book.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/build.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/button.png
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/changes.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/differences.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/events.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/glviewer.gif
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/examples.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/goals.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/imageviewer.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/babelfish.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/browser.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/button.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/datatarget.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/dialog.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/dilbert.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/dirlist.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/foursplit.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/gltest.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/glviewer.gif
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/groupbox.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/header.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/hello.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/hello2.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/image.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/imageviewer.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/mditest.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/raabrowser.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/scribble.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/shutter.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/splitter.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/tabbook.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/images/table.png
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/library.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/opengl.html
-%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/screenshots.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/scintilla.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/todo.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/tutorial1.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/tutorial1.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/index.html
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fox/doc/images
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fox/doc
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fox