4 files changed, 69 insertions, 45 deletions

diff --git a/x11-toolkits/fox/Makefile b/x11-toolkits/fox/Makefile
index f0191c9fe8b7..95a32f47e9c6 100644
--- a/x11-toolkits/fox/Makefile
+++ b/x11-toolkits/fox/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	fox
-PORTVERSION?=	0.99.174
-PORTREVISION?=	1
+PORTVERSION?=	0.99.181
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
@@ -32,13 +32,16 @@ BUILD_DEPENDS=	${X11BASE}/include/xunicode/xunicode.h:${PORTSDIR}/converters/xun
 
 CONFIGURE_ENV=	X_CFLAGS=-DUSE_UNICODE
 
-PLIST_SUB=	NEWFILE="@comment "
+PLIST_SUB=	OLDFILE="" \
+		NEWFILE="@comment "
 .else
-PLIST_SUB=	NEWFILE=""
+PLIST_SUB=	OLDFILE="@comment " \
+		NEWFILE=""
 .endif
 
 USE_MESA=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
@@ -62,7 +65,7 @@ MAKE_ARGS+=	DOC=
 .else
 MAKE_ARGS+=	DOC=doc
 .endif
-USE_LIBTOOL=	yes
+#USE_LIBTOOL=	yes
 SHLIB_MAJ=	1
 SHLIB_MIN=	0
 MAKE_ENV+=	LT_CURRENT="${SHLIB_MAJ}" LT_REVISION="${SHLIB_MIN}"
@@ -77,4 +80,8 @@ post-extract:
 	cd ${WRKSRC} && ${LN} -s ${X11BASE}/include/xunicode
 .endif
 
+post-patch:
+	${PERL} -i -pe 's/^(SUBDIRS\s*=\s*).*/$$1utils include src \$${DOC}/' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/fox/distinfo b/x11-toolkits/fox/distinfo
index 6d9800063f0a..3874fbdc068c 100644
--- a/x11-toolkits/fox/distinfo
+++ b/x11-toolkits/fox/distinfo
@@ -1,2 +1,3 @@
 MD5 (fox-0.99.174.tar.gz) = 8546249fd51964c8269aecbcbb9e7946
 MD5 (fox-unicode-0.99.174.diff) = 7f24a256f24179e64cd778fa748454a0
+MD5 (fox-0.99.181.tar.gz) = 276741dee6400b3af5ef8c9171ca734b
diff --git a/x11-toolkits/fox/files/patch-ab b/x11-toolkits/fox/files/patch-ab
deleted file mode 100644
index a88f2e97dd4e..000000000000
--- a/x11-toolkits/fox/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Jul 13 02:58:24 2001
-+++ Makefile.in	Fri Jul 20 20:42:11 2001
-@@ -89,7 +89,7 @@
- AUTOMAKE_OPTIONS = foreign dist-zip
- #AUTOMAKE_OPTIONS = foreign dist-zip no-dependencies
- 
--SUBDIRS = utils include src doc tests textedit pathfinder calculator
-+SUBDIRS = utils include src ${DOC}
- EXTRA_DIST = ADDITIONS AUTHORS BUGS INSTALL LICENSE TRACING README fox.lsm index.html aclocal.m4
- 
- CLEANFILES = fox.tar.gz
diff --git a/x11-toolkits/fox/pkg-plist b/x11-toolkits/fox/pkg-plist
index dc62d1bda8fe..86da33db91f0 100644
--- a/x11-toolkits/fox/pkg-plist
+++ b/x11-toolkits/fox/pkg-plist
@@ -11,9 +11,11 @@ include/fox/FXButton.h
 include/fox/FXCanvas.h
 include/fox/FXCharset.h
 include/fox/FXCheckButton.h
+%%NEWFILE%%include/fox/FXColorBar.h
 include/fox/FXColorDialog.h
 include/fox/FXColorSelector.h
 include/fox/FXColorWell.h
+%%NEWFILE%%include/fox/FXColorWheel.h
 include/fox/FXComboBox.h
 include/fox/FXComposite.h
 include/fox/FXCursor.h
@@ -68,14 +70,18 @@ include/fox/FXHMat.h
 include/fox/FXHVec.h
 include/fox/FXHeader.h
 include/fox/FXHorizontalFrame.h
+%%NEWFILE%%include/fox/FXICOIcon.h
+%%NEWFILE%%include/fox/FXICOImage.h
 include/fox/FXIcon.h
 include/fox/FXIconList.h
 include/fox/FXId.h
 include/fox/FXImage.h
 include/fox/FXImageView.h
 include/fox/FXInputDialog.h
-include/fox/FXJPEGIcon.h
-include/fox/FXJPEGImage.h
+%%OLDFILE%%include/fox/FXJPEGIcon.h
+%%OLDFILE%%include/fox/FXJPEGImage.h
+%%NEWFILE%%include/fox/FXJPGIcon.h
+%%NEWFILE%%include/fox/FXJPGImage.h
 include/fox/FXLabel.h
 include/fox/FXList.h
 include/fox/FXListBox.h
@@ -101,6 +107,7 @@ include/fox/FXPCXImage.h
 include/fox/FXPNGIcon.h
 include/fox/FXPNGImage.h
 include/fox/FXPacker.h
+%%NEWFILE%%include/fox/FXPicker.h
 include/fox/FXPoint.h
 include/fox/FXPopup.h
 include/fox/FXPrintDialog.h
@@ -132,10 +139,16 @@ include/fox/FXStatusbar.h
 include/fox/FXStatusline.h
 include/fox/FXStream.h
 include/fox/FXString.h
+%%NEWFILE%%include/fox/FXStringDict.h
 include/fox/FXSwitcher.h
+%%NEWFILE%%include/fox/FXTGAIcon.h
+%%NEWFILE%%include/fox/FXTGAImage.h
 include/fox/FXTIFIcon.h
 include/fox/FXTIFImage.h
-include/fox/FXTab.h
+%%OLDFILE%%include/fox/FXTab.h
+%%NEWFILE%%include/fox/FXTabBar.h
+%%NEWFILE%%include/fox/FXTabBook.h
+%%NEWFILE%%include/fox/FXTabItem.h
 include/fox/FXTable.h
 include/fox/FXText.h
 include/fox/FXTextField.h
@@ -165,52 +178,66 @@ include/fox/fxver.h
 include/fox/xincs.h
 @dirrm include/fox
 lib/libFOX.a
+lib/libFOX.la
 lib/libFOX.so
 lib/libFOX.so.%%LIBVER%%
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/adie.html
 %%PORTDOCS%%share/doc/fox/html/app.html
-%%PORTDOCS%%share/doc/fox/html/bigpenguin.png
-%%PORTDOCS%%share/doc/fox/html/cfdrc.png
-%%PORTDOCS%%share/doc/fox/html/cfdrclogo.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/bigpenguin.png
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/calc.html
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/cfdrc.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/cfdrclogo.png
 %%PORTDOCS%%share/doc/fox/html/datatarget.html
-%%PORTDOCS%%share/doc/fox/html/dlgedit1.gif
-%%PORTDOCS%%share/doc/fox/html/dlgedit2.gif
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/dlgedit1.gif
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/dlgedit2.gif
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/doc.html
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/download.html
 %%PORTDOCS%%share/doc/fox/html/draganddrop.html
 %%PORTDOCS%%share/doc/fox/html/faq.html
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/filefuncs.html
 %%PORTDOCS%%share/doc/fox/html/focus.html
 %%PORTDOCS%%share/doc/fox/html/fonts.html
 %%PORTDOCS%%share/doc/fox/html/foreword.html
 %%PORTDOCS%%share/doc/fox/html/fox.html
-%%PORTDOCS%%share/doc/fox/html/foxback.png
-%%PORTDOCS%%share/doc/fox/html/foxlogo.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/foxback.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/foxlogo.png
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/goals.html
 %%PORTDOCS%%share/doc/fox/html/guiupdate.html
 %%PORTDOCS%%share/doc/fox/html/icons.html
 %%PORTDOCS%%share/doc/fox/html/introduction.html
 %%PORTDOCS%%share/doc/fox/html/layout.html
 %%PORTDOCS%%share/doc/fox/html/messages.html
-%%PORTDOCS%%share/doc/fox/html/nasafan.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/nasafan.png
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/news.html
 %%PORTDOCS%%share/doc/fox/html/oldfox.html
-%%PORTDOCS%%share/doc/fox/html/opengl_logo.png
-%%PORTDOCS%%share/doc/fox/html/owl-anim.png
-%%PORTDOCS%%share/doc/fox/html/pathfinder.png
-%%PORTDOCS%%share/doc/fox/html/pcboard.png
-%%PORTDOCS%%share/doc/fox/html/platforms.html
-%%PORTDOCS%%share/doc/fox/html/progress.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/opengl_logo.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/owl-anim.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/pathfinder.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/pcboard.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/platforms.html
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/progress.png
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/pathfinder.html
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/projects.html
 %%PORTDOCS%%share/doc/fox/html/registry.html
-%%PORTDOCS%%share/doc/fox/html/scribble.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/scribble.png
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots.html
 %%PORTDOCS%%share/doc/fox/html/serialization.html
-%%PORTDOCS%%share/doc/fox/html/sgitextedit.png
-%%PORTDOCS%%share/doc/fox/html/tb-paste.png
-%%PORTDOCS%%share/doc/fox/html/textedit.png
-%%PORTDOCS%%share/doc/fox/html/textedit2.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/sgitextedit.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/tb-paste.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/textedit.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/textedit2.png
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/styles.css
 %%PORTDOCS%%share/doc/fox/html/timers.html
 %%PORTDOCS%%share/doc/fox/html/widgets.html
-%%PORTDOCS%%share/doc/fox/html/win32-libraries.png
-%%PORTDOCS%%share/doc/fox/html/win32-linkoutput.png
-%%PORTDOCS%%share/doc/fox/html/win32-postbuild.png
-%%PORTDOCS%%share/doc/fox/html/win32-preprocessor.png
-%%PORTDOCS%%share/doc/fox/html/win32-project.png
-%%PORTDOCS%%share/doc/fox/html/win32-tooloptions.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/win32-libraries.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/win32-linkoutput.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/win32-postbuild.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/win32-preprocessor.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/win32-project.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/win32-tooloptions.png
 %%PORTDOCS%%share/doc/fox/html/win32.html
-%%PORTDOCS%%share/doc/fox/html/wintextedit.png
+%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/wintextedit.png
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/window.html
+%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/xml.html
 %%PORTDOCS%%@dirrm share/doc/fox/html
 %%PORTDOCS%%@dirrm share/doc/fox