- Refactor FOX ports

  * Remove CONFLICTS between FOX ports by having man-pages
    and binaries named after the port version
  * Avoid bumping shlib version at each minor update by using
    ltverhack [1]
  * Make PKGNAMEs unique (fox14, fox16, fox17) [2]
  * Use new LIB_DEPENDS format

Suggested by:	mezz [1], bapt [2]

2 files changed, 23 insertions, 178 deletions

diff --git a/x11-toolkits/fox17/Makefile b/x11-toolkits/fox17/Makefile
index 7057cdf50ed4..9195bd419a0a 100644
--- a/x11-toolkits/fox17/Makefile
+++ b/x11-toolkits/fox17/Makefile
@@ -7,62 +7,53 @@ PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://ftp.fox-toolkit.org/pub/ \
    		ftp://ftp.fox-toolkit.org/pub/
+PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Fast and extensive C++ GUI toolkit -- devel version
 
-LIB_DEPENDS=	Xft:${PORTSDIR}/x11-fonts/libXft
-
-OPTIONS_DEFINE=	JPEG PNG TIFF WEBP
+OPTIONS_DEFINE=	DOCS JPEG PNG TIFF WEBP
 OPTIONS_DEFAULT=JPEG PNG TIFF WEBP
 
-LATEST_LINK=	fox17
-
 MAJORVER=	${PORTVERSION:R}
 PLIST_SUB+=	MAJORVER=${MAJORVER}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${MAJORVER}
 
+USES+=		pathfix
+USE_AUTOTOOLS=	libtool
 USE_GL=		glut
-USE_XORG=	sm
-USES=	pathfix
+USE_GNOME=	ltverhack
+USE_XORG=	sm xft
 USE_LDCONFIG=	yes
-
-GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-opengl=yes \
 		--bindir=${PREFIX}/bin/${PORTNAME}-${MAJORVER}
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib
+PORTDOCS=	*
 
-MAN1=		reswrap-17.1 shutterbug-17.1 adie-17.1 PathFinder-17.1 \
-		calculator-17.1 ControlPanel-17.1
-.for man1 in ${MAN1}
-MAN_REPLACE+=	s|${man1:S/-17//}|${man1}|;
-.endfor
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 .else
 CONFIGURE_ARGS+=--disable-jpeg
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
 .else
 CONFIGURE_ARGS+=--disable-png
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=	tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
 .else
 CONFIGURE_ARGS+=--disable-tiff
 .endif
 
 .if ${PORT_OPTIONS:MWEBP}
-LIB_DEPENDS+=	webp:${PORTSDIR}/graphics/webp
+LIB_DEPENDS+=	libwebp.so:${PORTSDIR}/graphics/webp
 .else
 CONFIGURE_ARGS+=--disable-webp
 .endif
@@ -73,14 +64,13 @@ BROKEN=		Does not link on powerpc
 
 post-patch:
 # Rename man pages as in manpage.1 --> manpage-17.1 to avoid
-# conflicts with x11-toolkits/fox16
-	for f in ${MAN1}; do \
-	    old=$$(echo $$f | ${SED} -e 's|-17||'); \
-	    dir=$$(dirname $$(find ${WRKSRC} -name $$old)); \
-	    ${MV} $$dir/$$old $$dir/$$f; \
-	done
+# conflicts with fox14 and fox16
+	files=$$(${FIND} ${WRKSRC} -name *.1); \
+	for f in $$files; do \
+		${MV} $$f `echo $$f | sed -e 's|\.1|-17.1|'`; \
+	done;
 	${FIND} ${WRKSRC} -name Makefile.am -o -name Makefile.in | ${XARGS} \
-	    ${REINPLACE_CMD} -i '' -e '${MAN_REPLACE}'
+	    ${REINPLACE_CMD} -i '' -e '/man_MANS/s|\.1|-17.1|g'
 	${REINPLACE_CMD} -e '/^Libs:/s|$$| -pthread|; s|"||g' ${WRKSRC}/fox17.pc.in
 .if !${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/^SUBDIRS/s/ doc//' ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
diff --git a/x11-toolkits/fox17/pkg-plist b/x11-toolkits/fox17/pkg-plist
index a4f97817ef99..c9831061a6da 100644
--- a/x11-toolkits/fox17/pkg-plist
+++ b/x11-toolkits/fox17/pkg-plist
@@ -356,157 +356,12 @@ include/fox-%%MAJORVER%%/fxkeys.h
 include/fox-%%MAJORVER%%/fxunicode.h
 include/fox-%%MAJORVER%%/fxver.h
 include/fox-%%MAJORVER%%/xincs.h
+man/man1/reswrap-17.1.gz
+man/man1/shutterbug-17.1.gz
+man/man1/adie-17.1.gz
+man/man1/PathFinder-17.1.gz
+man/man1/calculator-17.1.gz
+man/man1/ControlPanel-17.1.gz
 @dirrm include/fox-%%MAJORVER%%/chart
 @dirrm include/fox-%%MAJORVER%%
 @dirrm bin/fox-%%MAJORVER%%
-%%PORTDOCS%%%%DOCSDIR%%/html/adie.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app.html
-%%PORTDOCS%%%%DOCSDIR%%/html/art/bigpenguin.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/fifthplanet.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/art/fox.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/foxlogo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/art/foxlogo.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/foxlogo_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/art/foxstart.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/freespeach.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/ill.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/ilr.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/innernerd.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/iul.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/iur.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/layout.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/line.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/mouse.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/nerd_inside.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/oll.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/olr.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/opengl_logo.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/oul.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/oul_grey.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/our.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/progress.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/scribble.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/sgitextedit.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/slingerzbutton1.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/art/widget.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/art/win32-libraries.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/win32-linkoutput.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/win32-postbuild.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/win32-preprocessor.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/win32-project.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/win32-tooloptions.png
-%%PORTDOCS%%%%DOCSDIR%%/html/art/wintextedit.png
-%%PORTDOCS%%%%DOCSDIR%%/html/calc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/clipboard.html
-%%PORTDOCS%%%%DOCSDIR%%/html/consulting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/datatarget.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/download.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.cfg
-%%PORTDOCS%%%%DOCSDIR%%/html/draganddrop.html
-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filefuncs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/filter.pl
-%%PORTDOCS%%%%DOCSDIR%%/html/focus.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fonts.html
-%%PORTDOCS%%%%DOCSDIR%%/html/footer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/foreword.html
-%%PORTDOCS%%%%DOCSDIR%%/html/fox.html
-%%PORTDOCS%%%%DOCSDIR%%/html/goals.html
-%%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/install.html
-%%PORTDOCS%%%%DOCSDIR%%/html/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/html/layout.html
-%%PORTDOCS%%%%DOCSDIR%%/html/license.html
-%%PORTDOCS%%%%DOCSDIR%%/html/menu.css
-%%PORTDOCS%%%%DOCSDIR%%/html/menu.html
-%%PORTDOCS%%%%DOCSDIR%%/html/messages.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/page.css
-%%PORTDOCS%%%%DOCSDIR%%/html/pathfinder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/projects.html
-%%PORTDOCS%%%%DOCSDIR%%/html/references.html
-%%PORTDOCS%%%%DOCSDIR%%/html/registry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rex.html
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots.html
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/SbSScreen1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/SbSScreen1_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/adie.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/adie_colors.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/adie_edit.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/adie_font.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/adie_sty.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/analysisview.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/aqx_linux_visualizacao_peq.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/ares_lauch.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/arithmedrill-screenshot.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/arithmedrill-screenshot_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/big_ctc_osx.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/big_ctc_xp.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/boskalisday.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/boskalisnite.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/clview_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/colordialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/cometassay.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/contact.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/dirdialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/emso_screen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/emso_screen_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/filedialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/fontdialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/foxcalc.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/foxcalc_prefdialog_01_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/foxcalc_prefdialog_02_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/foxcalc_prefdialog_03_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/glview.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/goggles.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/igscanner-screenshot-small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/iims1.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/iims1_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/iims2.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/iims2_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/iims3.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/iims3_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/imagedebugger.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/inload.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/openspace.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/pathfinder.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/pdiary.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/printdialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/replacedialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/rezound_thumb.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/scenegraphnavigator.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/scriptolutions.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/searchdialog.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/small_ctc_osx.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/small_ctc_xp.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/sumo.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/table.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/tmp_vision_snap.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/tux_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/udine_physics.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/vorhour1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/vorhour1_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/vorhour2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/vorhour2_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/xfe.png
-%%PORTDOCS%%%%DOCSDIR%%/html/screenshots/xfe_small.png
-%%PORTDOCS%%%%DOCSDIR%%/html/serialization.html
-%%PORTDOCS%%%%DOCSDIR%%/html/styles.css
-%%PORTDOCS%%%%DOCSDIR%%/html/timers.html
-%%PORTDOCS%%%%DOCSDIR%%/html/top.html
-%%PORTDOCS%%%%DOCSDIR%%/html/widgets.html
-%%PORTDOCS%%%%DOCSDIR%%/html/win32.html
-%%PORTDOCS%%%%DOCSDIR%%/html/window.html
-%%PORTDOCS%%%%DOCSDIR%%/html/xml.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/screenshots
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/art
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%