6 files changed, 185 insertions, 208 deletions

diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index fdfd27ddd844..0046bc81b46f 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fox
-PORTVERSION?=	1.0.11
+PORTVERSION?=	1.0.30
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
@@ -17,27 +17,8 @@ MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 MAINTAINER?=	ports@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png
-
-.if defined(WITH_XUNICODE)
-PKGNAMESUFFIX=	-unicode
-
-PATCHVERSION?=	${PORTVERSION}
-
-PATCH_SITES=	http://www.ab.wakwak.com/~tino/jatk/fox/
-PATCHFILES=	${PORTNAME}${PKGNAMESUFFIX}-${PATCHVERSION}.diff
-PATCH_DIST_STRIP=	-p1
-
-BUILD_DEPENDS=	${X11BASE}/include/xunicode/xunicode.h:${PORTSDIR}/converters/xunicode
-
-CONFIGURE_ENV=	X_CFLAGS=-DUSE_UNICODE
-
-PLIST_SUB=	OLDFILE="" \
-		NEWFILE="@comment "
-.else
-PLIST_SUB=	OLDFILE="@comment " \
-		NEWFILE=""
-.endif
+		png.5:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_MESA=	yes
 INSTALLS_SHLIB=	yes
@@ -47,44 +28,109 @@ CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=--with-opengl=mesa --with-x
-.if defined(NO_SHM)
+
+MAN1=	reswrap.1
+
+##
+## Additional Options
+##
+#
+.if defined(WITHOUT_SHM)
 CONFIGURE_ARGS+=--with-shm=no
 .else
 CONFIGURE_ARGS+=--with-shm=yes
 .endif
-.if defined(DEBUG)
+#
+.if defined(WITH_CUPS)
+CONFIGURE_ARGS+=--enable-cups
+.else
+CONFIGURE_ARGS+=--disable-cups
+.endif
+#
+.if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .else
 CONFIGURE_ARGS+=--enable-release
 .endif
-.if defined(WANT_PROFILE)
+#
+.if defined(WITH_FOX_APPLICATIONS)
+PLIST_SUB+=	APPS=""
+
+MAN1+=	PathFinder.1 adie.1 calculator.1
+.else
+PLIST_SUB+=	APPS="@comment "
+.endif
+#
+.if defined(WITH_OPTIMIZED_CXXFLAGS)
+# turn distribution-recommended optimization flags back on
+CXXFLAGS+=	-Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations
+.endif
+#
+.if defined(WITH_PROFILING)
 CONFIGURE_ARGS+=--with-profiling=gprof
 .endif
-MAKE_ARGS+=	-j3
+#
 .if defined(NOPORTDOCS)
 MAKE_ARGS+=	DOC=
 .else
 MAKE_ARGS+=	DOC=doc
 .endif
-#USE_LIBTOOL=	yes
-SHLIB_MAJ=	1
-SHLIB_MIN=	0
-MAKE_ENV+=	LT_CURRENT="${SHLIB_MAJ}" LT_REVISION="${SHLIB_MIN}"
-PLIST_SUB+=	LIBVER="${SHLIB_MAJ}"
-MAN1=		reswrap.1
-
-# Uncomment this to turn the distribution-recommended optimization flags on.
-#CXXFLAGS=	-O2 -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations
-
-.if defined(WITH_XUNICODE)
-post-extract:
-	cd ${WRKSRC} && ${LN} -s ${X11BASE}/include/xunicode
-.endif
 
 post-patch:
-	${REINPLACE_CMD} -E 's/^(SUBDIRS[ 	]*=[ 	]*).*/\1utils include src $${DOC}/' \
+# CXXFLAGS safeness
+.if !defined(WITH_OPTIMIZED_CXXFLAGS)
+	@${REINPLACE_CMD} -E -e \
+		's|-O2|${CXXFLAGS}|g' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.else
+	@${REINPLACE_CMD} -E -e \
+		's|-O2|-O2 ${CXXFLAGS}|g' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.endif
+# doc prefix safeness
+	@${REINPLACE_CMD} -E -e \
+		's|^(htmldir).*$$|\1=${DOCSDIR}/html|' \
+		${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -E -e \
+		's|^(artdir).*$$|\1=${DOCSDIR}/html|' \
+		${WRKSRC}/doc/art/Makefile.in
+	@${REINPLACE_CMD} -E -e \
+		's|^(screenshotsdir).*$$|\1=${DOCSDIR}/html|' \
+		${WRKSRC}/doc/screenshots/Makefile.in
+.if !defined(WITH_FOX_APPLICATIONS)
+	@${REINPLACE_CMD} -E -e \
+		's,^(SUBDIRS.*)adie,\1,; \
+		s,^(SUBDIRS.*)pathfinder,\1,; \
+		s,^(SUBDIRS.*)calculator,\1,' \
 		${WRKSRC}/Makefile.in
-	${FIND} ${WRKSRC} -name Makefile.in -print0 | \
-		${XARGS} -0 ${REINPLACE_CMD} -E 's:\$$\(prefix\)/@PACKAGE@:$$(datadir)/doc/@PACKAGE@:'
+.endif
+
+pre-everything::
+.if !defined(WITH_OPTIMIZED_CXXFLAGS)
+	@${ECHO_MSG}
+	@${ECHO_MSG} 'You can enable additional compilation optimizations'
+	@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CXXFLAGS'
+.endif
+.if !defined(WITH_CUPS)
+	@${ECHO_MSG}
+	@${ECHO_MSG} 'You can enable CUPS support by defining WITH_CUPS'
+.endif
+.if !defined(WITH_DEBUG)
+	@${ECHO_MSG}
+	@${ECHO_MSG} 'You can build DEBUG support by defining WITH_DEBUG'
+.endif
+.if !defined(WITH_FOX_APPLICATIONS)
+	@${ECHO_MSG}
+	@${ECHO_MSG} 'You can install FOX sample applications by defining WITH_FOX_APPLICATIONS"
+.endif
+.if !defined(WITH_PROFILING)
+	@${ECHO_MSG}
+	@${ECHO_MSG} 'You can build PROFILING support by defining WITH_PROFILING'
+.endif
+.if !defined(WITHOUT_SHM)
+	@${ECHO_MSG}
+	@${ECHO_MSG} 'You can disable Shared Memory support by defining WITHOUT_SHM'
+.endif
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/fox-devel/distinfo b/x11-toolkits/fox-devel/distinfo
index 1682956cb076..6e6a9c8482e2 100644
--- a/x11-toolkits/fox-devel/distinfo
+++ b/x11-toolkits/fox-devel/distinfo
@@ -1,3 +1 @@
-MD5 (fox-0.99.174.tar.gz) = 8546249fd51964c8269aecbcbb9e7946
-MD5 (fox-unicode-0.99.174.diff) = 7f24a256f24179e64cd778fa748454a0
-MD5 (fox-1.0.11.tar.gz) = 27d344b24b6158b9bc209f9ee3215619
+MD5 (fox-1.0.30.tar.gz) = 19486a03a11f916c17b8988d9d6f2cef
diff --git a/x11-toolkits/fox-devel/files/patch-aa b/x11-toolkits/fox-devel/files/patch-aa
deleted file mode 100644
index 1332b8b8e024..000000000000
--- a/x11-toolkits/fox-devel/files/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile.in.orig	Fri Oct  6 16:07:43 2000
-+++ src/Makefile.in	Mon Oct  9 08:18:53 2000
-@@ -74,9 +74,9 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LT_AGE = @LT_AGE@
--LT_CURRENT = @LT_CURRENT@
-+LT_CURRENT ?= @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
--LT_REVISION = @LT_REVISION@
-+LT_REVISION ?= @LT_REVISION@
- MAKEINFO = @MAKEINFO@
- OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
-@@ -91,7 +91,7 @@
- 
- libFOX_la_LIBADD = $(X_LIBS) $(X_BASE_LIBS) $(X_EXTRA_LIBS) $(GL_LIBS)
- 
--libFOX_la_LDFLAGS =          -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    	-release $(LT_RELEASE)
-+libFOX_la_LDFLAGS =          -version-info $(LT_CURRENT):$(LT_REVISION)
- 
- 
- CURSORS =          crosshair.xbm                   crosshair_mask.xbm              dndcopy.xbm                     dndcopy_mask.xbm                dndlink.xbm                     dndlink_mask.xbm                dndmove.xbm                     dndmove_mask.xbm                dontdrop.xbm                    dontdrop_mask.xbm               drag.xbm                        drag_mask.xbm                   gray.xbm                        hsplit.xbm                      hsplit_mask.xbm                 move.xbm                        move_mask.xbm                   resize.xbm                      resize_mask.xbm                 resizeleft.xbm                  resizeleft_mask.xbm             resizetop.xbm                   resizetop_mask.xbm              resizetopleft.xbm               resizetopleft_mask.xbm          resizetopright.xbm              resizetopright_mask.xbm         rotate.xbm                      rotate_mask.xbm                 swatch.xbm                      swatch_mask.xbm                 vsplit.xbm                      vsplit_mask.xbm                 xsplit.xbm                      xsplit_mask.xbm                 ne.xbm                          ne_mask.xbm                     se.xbm                          se_mask.xbm                     sw.xbm                          sw_mask.xbm                     nw.xbm                          nw_mask.xbm                     translate.xbm                   translate_mask.xbm              zoom.xbm                        zoom_mask.xbm
diff --git a/x11-toolkits/fox-devel/files/patch-ad b/x11-toolkits/fox-devel/files/patch-ad
deleted file mode 100644
index 9ec0f21f9004..000000000000
--- a/x11-toolkits/fox-devel/files/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.orig	Thu Apr  5 05:25:59 2001
-+++ configure	Tue May  1 01:34:27 2001
-@@ -839,7 +839,7 @@
- 
- 
- 
--CXXFLAGS=""
-+#CXXFLAGS=""
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
- echo "configure:846: checking whether ${MAKE-make} sets \${MAKE}" >&5
-@@ -3440,9 +3440,12 @@
- 
- echo "$ac_t""$enable_release" 1>&6
- if test "x$enable_release" = "xyes" ; then
--CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
-+CXXFLAGS="${CXXFLAGS} -DNDEBUG"
- if test "${GXX}" = "yes" ; then
--CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
-+#CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
-+if test "${with_profiling}" = ""; then
-+CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer"
-+fi
- fi
- fi
- 
diff --git a/x11-toolkits/fox-devel/files/patch-configure b/x11-toolkits/fox-devel/files/patch-configure
new file mode 100644
index 000000000000..cd0f6671becd
--- /dev/null
+++ b/x11-toolkits/fox-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Feb  4 18:33:38 2003
++++ configure	Tue Feb  4 18:34:51 2003
+@@ -7498,7 +7498,7 @@
+ if test "x$enable_release" = "xyes" ; then
+ CXXFLAGS="${CXXFLAGS} -O2 -DNDEBUG"
+ if test "${GXX}" = "yes" ; then
+-CXXFLAGS="${CXXFLAGS} -Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations"
++CXXFLAGS="${CXXFLAGS} -Wuninitialized"
+ fi
+ fi
+ 
diff --git a/x11-toolkits/fox-devel/pkg-plist b/x11-toolkits/fox-devel/pkg-plist
index c41af38fb6eb..0cd4f1d88a18 100644
--- a/x11-toolkits/fox-devel/pkg-plist
+++ b/x11-toolkits/fox-devel/pkg-plist
@@ -1,3 +1,6 @@
+%%APPS%%bin/PathFinder
+%%APPS%%bin/adie
+%%APPS%%bin/calculator
 bin/reswrap
 include/fox/FX4Splitter.h
 include/fox/FXAccelTable.h
@@ -8,15 +11,15 @@ include/fox/FXBMPIcon.h
 include/fox/FXBMPImage.h
 include/fox/FXBitmap.h
 include/fox/FXButton.h
-%%NEWFILE%%include/fox/FXCURCursor.h
+include/fox/FXCURCursor.h
 include/fox/FXCanvas.h
 include/fox/FXCharset.h
 include/fox/FXCheckButton.h
-%%NEWFILE%%include/fox/FXColorBar.h
+include/fox/FXColorBar.h
 include/fox/FXColorDialog.h
 include/fox/FXColorSelector.h
 include/fox/FXColorWell.h
-%%NEWFILE%%include/fox/FXColorWheel.h
+include/fox/FXColorWheel.h
 include/fox/FXComboBox.h
 include/fox/FXComposite.h
 include/fox/FXCursor.h
@@ -71,18 +74,16 @@ 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/FXICOIcon.h
+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
-%%OLDFILE%%include/fox/FXJPEGIcon.h
-%%OLDFILE%%include/fox/FXJPEGImage.h
-%%NEWFILE%%include/fox/FXJPGIcon.h
-%%NEWFILE%%include/fox/FXJPGImage.h
+include/fox/FXJPGIcon.h
+include/fox/FXJPGImage.h
 include/fox/FXLabel.h
 include/fox/FXList.h
 include/fox/FXListBox.h
@@ -108,16 +109,15 @@ include/fox/FXPCXImage.h
 include/fox/FXPNGIcon.h
 include/fox/FXPNGImage.h
 include/fox/FXPacker.h
-%%NEWFILE%%include/fox/FXPicker.h
+include/fox/FXPicker.h
 include/fox/FXPoint.h
 include/fox/FXPopup.h
 include/fox/FXPrintDialog.h
-%%OLDFILE%%include/fox/FXProfiler.h
 include/fox/FXProgressBar.h
 include/fox/FXProgressDialog.h
 include/fox/FXQuat.h
-%%NEWFILE%%include/fox/FXRGBIcon.h
-%%NEWFILE%%include/fox/FXRGBImage.h
+include/fox/FXRGBIcon.h
+include/fox/FXRGBImage.h
 include/fox/FXRadioButton.h
 include/fox/FXRange.h
 include/fox/FXRecentFiles.h
@@ -125,7 +125,7 @@ include/fox/FXRectangle.h
 include/fox/FXRegion.h
 include/fox/FXRegistry.h
 include/fox/FXReplaceDialog.h
-%%NEWFILE%%include/fox/FXRex.h
+include/fox/FXRex.h
 include/fox/FXRootWindow.h
 include/fox/FXScrollArea.h
 include/fox/FXScrollWindow.h
@@ -143,16 +143,15 @@ include/fox/FXStatusbar.h
 include/fox/FXStatusline.h
 include/fox/FXStream.h
 include/fox/FXString.h
-%%NEWFILE%%include/fox/FXStringDict.h
+include/fox/FXStringDict.h
 include/fox/FXSwitcher.h
-%%NEWFILE%%include/fox/FXTGAIcon.h
-%%NEWFILE%%include/fox/FXTGAImage.h
+include/fox/FXTGAIcon.h
+include/fox/FXTGAImage.h
 include/fox/FXTIFIcon.h
 include/fox/FXTIFImage.h
-%%OLDFILE%%include/fox/FXTab.h
-%%NEWFILE%%include/fox/FXTabBar.h
-%%NEWFILE%%include/fox/FXTabBook.h
-%%NEWFILE%%include/fox/FXTabItem.h
+include/fox/FXTabBar.h
+include/fox/FXTabBook.h
+include/fox/FXTabItem.h
 include/fox/FXTable.h
 include/fox/FXText.h
 include/fox/FXTextField.h
@@ -177,121 +176,93 @@ include/fox/fx.h
 include/fox/fx3d.h
 include/fox/fxdefs.h
 include/fox/fxkeys.h
-%%OLDFILE%%include/fox/fxregex.h
 include/fox/fxver.h
 include/fox/xincs.h
-@dirrm include/fox
+lib/libFOX-1.0.so
+lib/libFOX-1.0.so.0
 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/adie.html
+%%PORTDOCS%%share/doc/fox/html/adie.jpg
+%%PORTDOCS%%share/doc/fox/html/adie_colors.jpg
+%%PORTDOCS%%share/doc/fox/html/adie_del.jpg
+%%PORTDOCS%%share/doc/fox/html/adie_edit.jpg
+%%PORTDOCS%%share/doc/fox/html/adie_font.jpg
+%%PORTDOCS%%share/doc/fox/html/adie_pat.jpg
 %%PORTDOCS%%share/doc/fox/html/app.html
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/bigpenguin.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/foxlogo.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/foxstart.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/freespeach.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/ill.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/ilr.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/innernerd.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/iul.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/iur.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/nerd_inside.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/oll.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/olr.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/opengl_logo.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/oul.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/oul_grey.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/our.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/progress.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/scribble.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/sgitextedit.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/slingerzbutton1.gif
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/win32-libraries.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/win32-linkoutput.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/win32-postbuild.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/win32-preprocessor.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/win32-project.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/win32-tooloptions.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/art/wintextedit.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/bigpenguin.png
+%%PORTDOCS%%share/doc/fox/html/calc.html
+%%PORTDOCS%%share/doc/fox/html/colordialog.png
 %%PORTDOCS%%share/doc/fox/html/datatarget.html
-%%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/dirdialog.png
+%%PORTDOCS%%share/doc/fox/html/doc.html
+%%PORTDOCS%%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/filedialog.png
+%%PORTDOCS%%share/doc/fox/html/filefuncs.html
 %%PORTDOCS%%share/doc/fox/html/focus.html
+%%PORTDOCS%%share/doc/fox/html/fontdialog.png
 %%PORTDOCS%%share/doc/fox/html/fonts.html
 %%PORTDOCS%%share/doc/fox/html/foreword.html
 %%PORTDOCS%%share/doc/fox/html/fox.html
-%%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/foxcalc.jpg
+%%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_01_small.jpg
+%%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_02_small.jpg
+%%PORTDOCS%%share/doc/fox/html/foxcalc_prefdialog_03_small.jpg
+%%PORTDOCS%%share/doc/fox/html/foxlogo.png
+%%PORTDOCS%%share/doc/fox/html/foxstart.png
+%%PORTDOCS%%share/doc/fox/html/freespeach.gif
+%%PORTDOCS%%share/doc/fox/html/glview.png
+%%PORTDOCS%%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/ill.gif
+%%PORTDOCS%%share/doc/fox/html/ilr.gif
+%%PORTDOCS%%share/doc/fox/html/innernerd.gif
 %%PORTDOCS%%share/doc/fox/html/introduction.html
+%%PORTDOCS%%share/doc/fox/html/iul.gif
+%%PORTDOCS%%share/doc/fox/html/iur.gif
 %%PORTDOCS%%share/doc/fox/html/layout.html
 %%PORTDOCS%%share/doc/fox/html/messages.html
-%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/nasafan.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/news.html
+%%PORTDOCS%%share/doc/fox/html/nerd_inside.gif
+%%PORTDOCS%%share/doc/fox/html/news.html
 %%PORTDOCS%%share/doc/fox/html/oldfox.html
-%%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/oll.gif
+%%PORTDOCS%%share/doc/fox/html/olr.gif
+%%PORTDOCS%%share/doc/fox/html/opengl_logo.png
+%%PORTDOCS%%share/doc/fox/html/oul.gif
+%%PORTDOCS%%share/doc/fox/html/oul_grey.gif
+%%PORTDOCS%%share/doc/fox/html/our.gif
+%%PORTDOCS%%share/doc/fox/html/pathfinder.html
+%%PORTDOCS%%share/doc/fox/html/pathfinder.png
+%%PORTDOCS%%share/doc/fox/html/printdialog.png
+%%PORTDOCS%%share/doc/fox/html/progress.png
+%%PORTDOCS%%share/doc/fox/html/projects.html
 %%PORTDOCS%%share/doc/fox/html/registry.html
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/rex.html
-%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/scribble.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots.html
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/adie.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/adie_colors.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/adie_del.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/adie_edit.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/adie_font.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/adie_pat.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/colordialog.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/dirdialog.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/filedialog.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/fontdialog.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/foxcalc.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/foxcalc_prefdialog_01_small.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/foxcalc_prefdialog_02_small.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/foxcalc_prefdialog_03_small.jpg
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/glview.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/pathfinder.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/printdialog.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/replacedialog.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/searchdialog.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/screenshots/table.png
+%%PORTDOCS%%share/doc/fox/html/replacedialog.png
+%%PORTDOCS%%share/doc/fox/html/rex.html
+%%PORTDOCS%%share/doc/fox/html/screenshots.html
+%%PORTDOCS%%share/doc/fox/html/scribble.png
+%%PORTDOCS%%share/doc/fox/html/searchdialog.png
 %%PORTDOCS%%share/doc/fox/html/serialization.html
-%%PORTDOCS%%%%OLDFILE%%share/doc/fox/html/sgitextedit.png
-%%PORTDOCS%%%%NEWFILE%%share/doc/fox/html/styles.css
-%%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%%share/doc/fox/html/sgitextedit.png
+%%PORTDOCS%%share/doc/fox/html/slingerzbutton1.gif
+%%PORTDOCS%%share/doc/fox/html/styles.css
+%%PORTDOCS%%share/doc/fox/html/table.png
 %%PORTDOCS%%share/doc/fox/html/timers.html
 %%PORTDOCS%%share/doc/fox/html/widgets.html
-%%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-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%%share/doc/fox/html/win32.html
-%%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%%%%NEWFILE%%@dirrm share/doc/fox/html/screenshots
-%%PORTDOCS%%%%NEWFILE%%@dirrm share/doc/fox/html/art
+%%PORTDOCS%%share/doc/fox/html/window.html
+%%PORTDOCS%%share/doc/fox/html/wintextedit.png
+%%PORTDOCS%%share/doc/fox/html/xml.html
 %%PORTDOCS%%@dirrm share/doc/fox/html
 %%PORTDOCS%%@dirrm share/doc/fox
+@dirrm include/fox