3 files changed, 44 insertions, 20 deletions

diff --git a/x11-toolkits/ruby-fox12/Makefile b/x11-toolkits/ruby-fox12/Makefile
index ebcca34b855f..63e08ec47ab3 100644
--- a/x11-toolkits/ruby-fox12/Makefile
+++ b/x11-toolkits/ruby-fox12/Makefile
@@ -21,7 +21,9 @@ LIB_DEPENDS=	FOX.1:${PORTSDIR}/x11-toolkits/fox \
 		png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-FOX_VERSION=	0.99.172
+BROKEN=		"Out of sync with FOX"
+
+FOX_VERSION=	0.99.173
 #FXRUBY_REVISION=	
 .if defined(FXRUBY_REVISION) && !empty(FXRUBY_REVISION)
 FXRUBY_PORTVERSION=	${FOX_VERSION}.${FXRUBY_REVISION}
@@ -32,33 +34,27 @@ FXRUBY_DISTNAME=	FXRuby-${FOX_VERSION}
 .endif
 
 USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
+USE_RUBY_SETUP=	yes
 
 USE_XLIB=	yes
 USE_MESA=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-INSTALL_TARGET=	site-install
-CONFIGURE_ARGS=	--with-fox-include="${LOCALBASE}/include/fox" \
-		--with-fox-lib="${LOCALBASE}/lib"
-#MAKE_ARGS=	LOCAL_LIBS="-lgcc"
-
-DOCS_EN=	README	index.html
+DOCS_EN=	ANNOUNCE	ChangeLog	README	\
+		index.html	doc
 
 post-patch:
-	${RUBY} -i -pe 'sub %r:/usr/X11R6\b:, "${X11BASE}"' ${WRKSRC}/extconf.rb
-
-pre-build:
-#	cd ${WRKSRC}/../swig-interfaces; ${MAKE}
-	${RUBY} -i -pe 'sub %r:^CXXFLAGS *=.*:, "CXXFLAGS = $$(CFLAGS) $$(CPPFLAGS)"' ${WRKSRC}/Makefile
+	${RUBY} -i -p \
+		-e 'gsub %r:/usr/local\b:, "${LOCALBASE}"' \
+		-e 'gsub %r:/usr/X11R6\b:, "${X11BASE}"' \
+		${WRKSRC}/ext/fox/extconf.rb
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/fox
-	${CP} -R ${WRKSRC}/../examples/* ${RUBY_EXAMPLESDIR}/fox/
-	${MKDIR} ${RUBY_DOCDIR}/fox
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/../${f} ${RUBY_DOCDIR}/fox/
+	${CP} -R ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
 .endfor
 .endif
 
diff --git a/x11-toolkits/ruby-fox12/distinfo b/x11-toolkits/ruby-fox12/distinfo
index c80d38a830dc..349eb1d879f4 100644
--- a/x11-toolkits/ruby-fox12/distinfo
+++ b/x11-toolkits/ruby-fox12/distinfo
@@ -1 +1 @@
-MD5 (ruby/FXRuby-0.99.172.tar.gz) = 6445c8951fcb137659de619e895be015
+MD5 (ruby/FXRuby-0.99.173.tar.gz) = 3fa962d6f65c5d7d4433b913ee8dc550
diff --git a/x11-toolkits/ruby-fox12/pkg-plist b/x11-toolkits/ruby-fox12/pkg-plist
index 065c7711f48d..9b6a22c1cad1 100644
--- a/x11-toolkits/ruby-fox12/pkg-plist
+++ b/x11-toolkits/ruby-fox12/pkg-plist
@@ -1,4 +1,7 @@
 %%RUBY_SITEARCHLIBDIR%%/fox.so
+%%RUBY_SITELIBDIR%%/fox/responder.rb
+%%RUBY_SITELIBDIR%%/fox/undolist.rb
+@dirrm %%RUBY_SITELIBDIR%%/fox
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/browser.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/button.rb
@@ -16,13 +19,17 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/hello2.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/image.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/imageviewer.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/responder.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/mditest.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/icons/backview.gif
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/big_gif.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/bigfolder.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/bigpenguin.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/bottomview.gif
@@ -30,6 +37,7 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/colorpal.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/copy.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/cut.gif
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/delimit.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/filenew.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/fileopen.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/filesave.gif
@@ -40,6 +48,7 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/frontview.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/hello2.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/help_gif.gif
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/indent.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/kill.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/leftview.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/light.gif
@@ -48,14 +57,17 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/minifolderopen.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/newfolder.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/nolight.gif
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/palette.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/parallel.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/paste.gif
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/pattern.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/penguin.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/perspective.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/printicon.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/prop.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/redo_gif.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/rightview.gif
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/saveas.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/shutter1.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/shutter2.gif
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/fox/icons/small_gif.gif
@@ -68,6 +80,22 @@
 %%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/glviewer.gif
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/goals.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/imageviewer.png
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/opengl.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/screenshots.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/todo.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/tutorial1.html
+%%PORTDOCS%%%%RUBY_DOCDIR%%/fox/doc/tutorial1.png
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fox/doc
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/fox