2 files changed, 36 insertions, 168 deletions

diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index faa2f9211b85..d3780d2db61a 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -2,36 +2,34 @@
 # $FreeBSD$
 
 PORTNAME=	fox
-PORTVERSION=	${MAJORVER}.${SHVER}
+PORTVERSION=	1.4.35
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.fox-toolkit.org/ftp/ \
 		ftp://ftp.fox-toolkit.org/pub/ \
 		http://fresh.t-systems-sfr.com/unix/src/misc/
+PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 
 MAINTAINER?=	gahr@FreeBSD.org
 COMMENT=	Fast and extensive C++ GUI toolkit
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
-CONFLICTS=	fox-1.6.* fox-1.7.*
-
-LATEST_LINK=	fox14
-
-MAJORVER=	1.4
-SHVER=		35
+MAJORVER=	${PORTVERSION:R}
+SHVER=		${PORTVERSION:S/${MAJORVER}.//}
 PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
 USE_AUTOTOOLS=	libtool
 USE_GL=		yes
+USE_GNOME=	ltverhack
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-opengl --with-x --enable-threadsafe
+CONFIGURE_ARGS=	--with-opengl=yes \
+		--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER} \
+		--enable-threadsafe
 USE_LDCONFIG=	yes
-
-MAN1=		shutterbug.1 reswrap.1
+PORTDOCS=	*
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -41,7 +39,6 @@ OPTIONS_DEFAULT=SHM XFT
 APPS_DESC=	Install sample applications
 SHM_DESC=	Shared Memory support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 ##
@@ -49,7 +46,8 @@ NO_STAGE=	yes
 ##
 #
 .if ${PORT_OPTIONS:MXFT}
-CONFIGURE_ARGS+=	--with-xft=yes
+CONFIGURE_ARGS+=--with-xft=yes
+USE_XORG+=	xft
 CPPFLAGS+=	`freetype-config --cflags`
 LDFLAGS+=	`freetype-config --libs`
 .else
@@ -63,7 +61,7 @@ CONFIGURE_ARGS+=	--with-xshm=no
 .endif
 #
 .if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
+LIB_DEPENDS+=	libcups.so:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=	--enable-cups
 .else
 CONFIGURE_ARGS+=	--disable-cups
@@ -76,7 +74,6 @@ CONFIGURE_ARGS+=	--enable-release
 .endif
 #
 .if ${PORT_OPTIONS:MAPPS}
-MAN1+=		PathFinder.1 adie.1 calculator.1
 PLIST_SUB+=	APPS=""
 .else
 PLIST_SUB+=	APPS="@comment "
@@ -92,6 +89,14 @@ CONFIGURE_ARGS+=	--with-profiling=gprof
 .endif
 
 post-patch:
+# Rename man pages as in manpage.1 --> manpage-14.1 to avoid
+# conflicts with fox16 and fox17
+	files=$$(${FIND} ${WRKSRC} -name *.1); \
+	for f in $$files; do \
+		${MV} $$f `echo $$f | ${SED} -e 's|\.1|-14.1|'`; \
+	done;
+	${FIND} ${WRKSRC} -name Makefile.am -o -name Makefile.in | ${XARGS} \
+	    ${REINPLACE_CMD} -i '' -e '/man_MANS/s|\.1|-14.1|g'
 # CXXFLAGS safeness
 	@${REINPLACE_CMD} -E -e \
 		's|-O2|${CXXFLAGS}|g ; \
diff --git a/x11-toolkits/fox14/pkg-plist b/x11-toolkits/fox14/pkg-plist
index 2636deba2a5e..2b065f74bd75 100644
--- a/x11-toolkits/fox14/pkg-plist
+++ b/x11-toolkits/fox14/pkg-plist
@@ -1,9 +1,9 @@
-%%APPS%%bin/PathFinder
-%%APPS%%bin/adie
-%%APPS%%bin/calculator
-bin/fox-config
-bin/reswrap
-bin/shutterbug
+%%APPS%%bin/fox-1.4/PathFinder
+%%APPS%%bin/fox-1.4/adie
+%%APPS%%bin/fox-1.4/calculator
+bin/fox-1.4/fox-config
+bin/fox-1.4/reswrap
+bin/fox-1.4/shutterbug
 include/fox-%%MAJORVER%%/FX4Splitter.h
 include/fox-%%MAJORVER%%/FX7Segment.h
 include/fox-%%MAJORVER%%/FXAccelTable.h
@@ -234,152 +234,15 @@ include/fox-%%MAJORVER%%/xincs.h
 lib/libCHART-%%MAJORVER%%.a
 lib/libCHART-%%MAJORVER%%.la
 lib/libCHART-%%MAJORVER%%.so
-lib/libCHART-%%MAJORVER%%.so.%%SHVER%%
+lib/libCHART-%%MAJORVER%%.so.0
 lib/libFOX-%%MAJORVER%%.a
 lib/libFOX-%%MAJORVER%%.la
 lib/libFOX-%%MAJORVER%%.so
-lib/libFOX-%%MAJORVER%%.so.%%SHVER%%
-%%PORTDOCS%%%%DOCSDIR%%/html/SbSScreen1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/SbSScreen1_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/adie.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/adie.html
-%%PORTDOCS%%%%DOCSDIR%%/html/adie_colors.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/adie_edit.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/adie_font.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/adie_sty.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/analysisview.png
-%%PORTDOCS%%%%DOCSDIR%%/html/app.html
-%%PORTDOCS%%%%DOCSDIR%%/html/aqx_linux_visualizacao_peq.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/arithmedrill-screenshot.png
-%%PORTDOCS%%%%DOCSDIR%%/html/arithmedrill-screenshot_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/bigpenguin.png
-%%PORTDOCS%%%%DOCSDIR%%/html/boskalisday.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/boskalisnite.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/calc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/clipboard.html
-%%PORTDOCS%%%%DOCSDIR%%/html/clview_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/colordialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/cometassay.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/consulting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/contact.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/datatarget.html
-%%PORTDOCS%%%%DOCSDIR%%/html/dirdialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/dlgedit1.png
-%%PORTDOCS%%%%DOCSDIR%%/html/dlgedit2.png
-%%PORTDOCS%%%%DOCSDIR%%/html/doc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/download.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.cfg
-%%PORTDOCS%%%%DOCSDIR%%/html/draganddrop.html
-%%PORTDOCS%%%%DOCSDIR%%/html/emso_screen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/emso_screen_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fifthplanet.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/filedialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/filefuncs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filter.pl
-%%PORTDOCS%%%%DOCSDIR%%/html/focus.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fontdialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/fonts.html
-%%PORTDOCS%%%%DOCSDIR%%/html/footer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/foreword.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fox.gif
-%%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.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/foxlogo.png
-%%PORTDOCS%%%%DOCSDIR%%/html/foxlogo_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/foxstart.png
-%%PORTDOCS%%%%DOCSDIR%%/html/freespeach.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/glview.png
-%%PORTDOCS%%%%DOCSDIR%%/html/goals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/goggles.png
-%%PORTDOCS%%%%DOCSDIR%%/html/gpgkey.html
-%%PORTDOCS%%%%DOCSDIR%%/html/guiupdate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/header.html
-%%PORTDOCS%%%%DOCSDIR%%/html/home.html
-%%PORTDOCS%%%%DOCSDIR%%/html/icons.html
-%%PORTDOCS%%%%DOCSDIR%%/html/iims1.png
-%%PORTDOCS%%%%DOCSDIR%%/html/iims1_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/iims2.png
-%%PORTDOCS%%%%DOCSDIR%%/html/iims2_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/iims3.png
-%%PORTDOCS%%%%DOCSDIR%%/html/iims3_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/ill.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/ilr.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/imagedebugger.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/innernerd.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/install.html
-%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/html/iul.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/iur.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/layout.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/layout.html
-%%PORTDOCS%%%%DOCSDIR%%/html/license.html
-%%PORTDOCS%%%%DOCSDIR%%/html/line.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/menu.css
-%%PORTDOCS%%%%DOCSDIR%%/html/menu.html
-%%PORTDOCS%%%%DOCSDIR%%/html/messages.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mouse.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/nerd_inside.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/news.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news2.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/page.css
-%%PORTDOCS%%%%DOCSDIR%%/html/pathfinder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/pathfinder.png
-%%PORTDOCS%%%%DOCSDIR%%/html/pdiary.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/printdialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/progress.png
-%%PORTDOCS%%%%DOCSDIR%%/html/projects.html
-%%PORTDOCS%%%%DOCSDIR%%/html/references.html
-%%PORTDOCS%%%%DOCSDIR%%/html/registry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/replacedialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/rex.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rezound_thumb.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/scenegraphnavigator.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots.html
-%%PORTDOCS%%%%DOCSDIR%%/html/scribble.png
-%%PORTDOCS%%%%DOCSDIR%%/html/scriptolutions.gif
-%%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/tmp_vision_snap.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/top.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tux_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/udine_physics.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/vorhour1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/vorhour1_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/vorhour2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/vorhour2_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/widget.jpg
-%%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/xfe.png
-%%PORTDOCS%%%%DOCSDIR%%/html/xfe_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/xml.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xtc.gif
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+lib/libFOX-%%MAJORVER%%.so.0
+man/man1/shutterbug-14.1.gz
+man/man1/reswrap-14.1.gz
+%%APPS%%man/man1/PathFinder-14.1.gz
+%%APPS%%man/man1/adie-14.1.gz
+%%APPS%%man/man1/calculator-14.1.gz
 @dirrm include/fox-%%MAJORVER%%/chart
 @dirrm include/fox-%%MAJORVER%%