4 files changed, 93 insertions, 99 deletions

diff --git a/x11-toolkits/fox/Makefile b/x11-toolkits/fox/Makefile
index 5e0bee304f63..b1dd473a011f 100644
--- a/x11-toolkits/fox/Makefile
+++ b/x11-toolkits/fox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fox
-PORTVERSION?=	1.0.46
-PORTREVISION?=	1
+PORTVERSION=	1.0.47
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
@@ -15,7 +14,7 @@ MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
 
 MAINTAINER?=	ports@FreeBSD.org
-COMMENT?=	Fast and extensive C++ GUI toolkit
+COMMENT=	Fast and extensive C++ GUI toolkit
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
@@ -61,10 +60,12 @@ MAN1+=	PathFinder.1 adie.1 calculator.1
 .else
 PLIST_SUB+=	APPS="@comment "
 .endif
+
+SPECFLAGS=	-ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations
 #
 .if defined(WITH_OPTIMIZED_CXXFLAGS)
 # turn distribution-recommended optimization flags back on
-CXXFLAGS+=	-Wuninitialized -ffast-math -finline-functions -fomit-frame-pointer -fexpensive-optimizations
+CXXFLAGS+=	-Wuninitialized ${SPECFLAGS}
 .endif
 #
 .if defined(WITH_PROFILING)
@@ -78,6 +79,10 @@ MAKE_ARGS+=	DOC=doc
 .endif
 
 post-patch:
+# Remove additional flags
+	@${REINPLACE_CMD} -E -e \
+		's|${SPECFLAGS}||g' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 # CXXFLAGS safeness
 .if !defined(WITH_OPTIMIZED_CXXFLAGS)
 	@${REINPLACE_CMD} -E -e \
@@ -125,7 +130,7 @@ pre-everything::
 .endif
 .if !defined(WITH_FOX_APPLICATIONS)
 	@${ECHO_MSG}
-	@${ECHO_MSG} 'You can install FOX sample applications by defining WITH_FOX_APPLICATIONS"
+	@${ECHO_MSG} 'You can install FOX sample applications by defining WITH_FOX_APPLICATIONS'
 .endif
 .if !defined(WITH_PROFILING)
 	@${ECHO_MSG}
diff --git a/x11-toolkits/fox/distinfo b/x11-toolkits/fox/distinfo
index 66b23fcc302a..3cbc77398f23 100644
--- a/x11-toolkits/fox/distinfo
+++ b/x11-toolkits/fox/distinfo
@@ -1 +1 @@
-MD5 (fox-1.0.46.tar.gz) = 169394eda51f96f8825a63fafd1d5acd
+MD5 (fox-1.0.47.tar.gz) = b8d3397ef2f56d4017d9119036e70720
diff --git a/x11-toolkits/fox/files/patch-configure b/x11-toolkits/fox/files/patch-configure
deleted file mode 100644
index cd0f6671becd..000000000000
--- a/x11-toolkits/fox/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/x11-toolkits/fox/pkg-plist
index 0cd4f1d88a18..c300836e5473 100644
--- a/x11-toolkits/fox/pkg-plist
+++ b/x11-toolkits/fox/pkg-plist
@@ -183,86 +183,86 @@ lib/libFOX-1.0.so.0
 lib/libFOX.a
 lib/libFOX.la
 lib/libFOX.so
-%%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%%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%%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%%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%%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%%share/doc/fox/html/nerd_inside.gif
-%%PORTDOCS%%share/doc/fox/html/news.html
-%%PORTDOCS%%share/doc/fox/html/oldfox.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%%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%%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%%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%%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
+%%PORTDOCS%%%%DOCSDIR%%/html/adie.html
+%%PORTDOCS%%%%DOCSDIR%%/html/adie.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/adie_colors.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/adie_del.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/adie_edit.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/adie_font.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/adie_pat.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/app.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bigpenguin.png
+%%PORTDOCS%%%%DOCSDIR%%/html/calc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/colordialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/datatarget.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dirdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/doc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/download.html
+%%PORTDOCS%%%%DOCSDIR%%/html/draganddrop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/filedialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/filefuncs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/focus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fontdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts.html
+%%PORTDOCS%%%%DOCSDIR%%/html/foreword.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fox.html
+%%PORTDOCS%%%%DOCSDIR%%/html/foxcalc.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/foxcalc_prefdialog_01_small.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/foxcalc_prefdialog_02_small.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/foxcalc_prefdialog_03_small.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/foxlogo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/foxstart.png
+%%PORTDOCS%%%%DOCSDIR%%/html/freespeach.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/glview.png
+%%PORTDOCS%%%%DOCSDIR%%/html/goals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/guiupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/icons.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ill.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/ilr.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/innernerd.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
+%%PORTDOCS%%%%DOCSDIR%%/html/iul.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/iur.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/layout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/messages.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nerd_inside.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/news.html
+%%PORTDOCS%%%%DOCSDIR%%/html/oldfox.html
+%%PORTDOCS%%%%DOCSDIR%%/html/oll.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/olr.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/opengl_logo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/oul.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/oul_grey.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/our.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pathfinder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pathfinder.png
+%%PORTDOCS%%%%DOCSDIR%%/html/printdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/progress.png
+%%PORTDOCS%%%%DOCSDIR%%/html/projects.html
+%%PORTDOCS%%%%DOCSDIR%%/html/registry.html
+%%PORTDOCS%%%%DOCSDIR%%/html/replacedialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/rex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/screenshots.html
+%%PORTDOCS%%%%DOCSDIR%%/html/scribble.png
+%%PORTDOCS%%%%DOCSDIR%%/html/searchdialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/serialization.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sgitextedit.png
+%%PORTDOCS%%%%DOCSDIR%%/html/slingerzbutton1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/styles.css
+%%PORTDOCS%%%%DOCSDIR%%/html/table.png
+%%PORTDOCS%%%%DOCSDIR%%/html/timers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/widgets.html
+%%PORTDOCS%%%%DOCSDIR%%/html/win32-libraries.png
+%%PORTDOCS%%%%DOCSDIR%%/html/win32-linkoutput.png
+%%PORTDOCS%%%%DOCSDIR%%/html/win32-postbuild.png
+%%PORTDOCS%%%%DOCSDIR%%/html/win32-preprocessor.png
+%%PORTDOCS%%%%DOCSDIR%%/html/win32-project.png
+%%PORTDOCS%%%%DOCSDIR%%/html/win32-tooloptions.png
+%%PORTDOCS%%%%DOCSDIR%%/html/win32.html
+%%PORTDOCS%%%%DOCSDIR%%/html/window.html
+%%PORTDOCS%%%%DOCSDIR%%/html/wintextedit.png
+%%PORTDOCS%%%%DOCSDIR%%/html/xml.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/fox