4 files changed, 42 insertions, 69 deletions

diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile
index 4bb6427b5d0e..232f0d9adbc7 100644
--- a/graphics/fracplanet/Makefile
+++ b/graphics/fracplanet/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fracplanet
-PORTVERSION=	0.4.0
-PORTREVISION=	16
+PORTVERSION=	0.5.1
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
 		SF/nemysisfreebsdp/:icons
@@ -18,54 +17,50 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	fails to link: obj/fracplanet.o:(.text+0x250): undefined reference to boost::program_options::options_description::options_description
 
-BUILD_DEPENDS=	xsltproc:textproc/libxslt
 LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+FLAVORS=	qt4 qt5
+FLAVOR?=	${FLAVORS:[1]}
+qt5_PKGNAMESUFFIX=	-${FLAVOR}
 
-USES=		gmake qmake:no_env qt:4
-USE_GL=		glu
-USE_QT=		corelib moc_build qmake_build gui opengl
-HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	QTDIR="${PREFIX}"
-CONFIGURE_ARGS=	-spec ${QMAKESPEC}
+USES=		qmake:outsource
+USE_GL=		gl glu
+QMAKE_ARGS=	VERSION_NUMBER=${PORTVERSION}
 
-CXXFLAGS+=	-include ${WRKSRC}/precompiled.h
-
-PORTDOCS=	*
+.if ${FLAVOR} == qt4
+USES+=	qt:4
+USE_QT=		corelib gui moc_build opengl
+.else
+USES+=	qt:5
+USE_QT=		buildtools_build core gui opengl
+.endif
 
+DESKTOP_ENTRIES=	"Fracplanet" \
+			"" \
+			"${PORTNAME}" \
+			"${PORTNAME}" \
+			"Graphics;" \
+			""
 INSTALLS_ICONS=	yes
-ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
-
-DESKTOP_ENTRIES="Fracplanet" "" "${PORTNAME}" \
-		"${PORTNAME}" "Graphics;" ""
-
-OPTIONS_DEFINE=	DOXYGEN DOCS
+PORTDOCS=	*
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=		DOXYGEN DOCS
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
+DOXYGEN_IMPLIES=	DOCS
 
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	doxygen:devel/doxygen
-.endif
+DOCFILES=	BUGS NEWS README THANKS fracplanet.css fracplanet.htm
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
 
 post-patch:
-.for f in BUILD VERSION configure
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' \
-		${WRKSRC}/${f}
-.endfor
-	@${REINPLACE_CMD} -e 's|qmake-qt4|${QMAKE} ${QMAKE_ARGS}|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		's|-lboost_program_options|-lboost_program_options -lGLU|' \
-		${WRKSRC}/fracplanet.pro
-
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-post-build:
+	@${REINPLACE_CMD} -Ee 's|(OBJECTS_DIR)|#\1|' ${WRKSRC}/fracplanet.pro
+
+post-build-DOXYGEN-on:
 	cd ${WRKSRC} && doxygen .
-.endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
 
@@ -77,13 +72,12 @@ do-install:
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} BUGS NEWS README THANKS \
-		fracplanet.css fracplanet.htm ${STAGEDIR}${DOCSDIR}
-. if ${PORT_OPTIONS:MDOXYGEN}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "html latex" ${STAGEDIR}${DOCSDIR})
-. endif
-.endif
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR})
+
+post-install-DOXYGEN-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "html latex" ${STAGEDIR}${DOCSDIR})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/fracplanet/distinfo b/graphics/fracplanet/distinfo
index 73460d5020ce..356ac8a8fd28 100644
--- a/graphics/fracplanet/distinfo
+++ b/graphics/fracplanet/distinfo
@@ -1,4 +1,5 @@
-SHA256 (fracplanet-0.4.0.tar.gz) = 38d56aba3c5cf19d4f2c218bece471d3860b161d2210a24ba94550356723482a
-SIZE (fracplanet-0.4.0.tar.gz) = 101700
+TIMESTAMP = 1529683211
+SHA256 (fracplanet-0.5.1.tar.gz) = 435dd07e1798f810280260d09d2ee85e870eb466411e49b859eb1bef6f336ade
+SIZE (fracplanet-0.5.1.tar.gz) = 111911
 SHA256 (fracplanet_icons.tar.gz) = 99eeb8ed62d45083138402c41b2af79a4b432bfcb8e63cbe83090bb2d235063b
 SIZE (fracplanet_icons.tar.gz) = 51712
diff --git a/graphics/fracplanet/files/patch-fracplanet.pro b/graphics/fracplanet/files/patch-fracplanet.pro
deleted file mode 100644
index 67e0cae3ae37..000000000000
--- a/graphics/fracplanet/files/patch-fracplanet.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- fracplanet.pro.orig	2015-06-11 10:31:19 UTC
-+++ fracplanet.pro
-@@ -1,7 +1,7 @@
- TARGET = fracplanet
- TEMPLATE = app
- 
--CONFIG+= qt stl precompile_header exceptions release  # debug/release
-+CONFIG+= qt stl exceptions release  # debug/release
- QT += opengl
- 
- PRECOMPILED_HEADER = precompiled.h
diff --git a/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp b/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp
deleted file mode 100644
index 60f2a8650cea..000000000000
--- a/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- triangle_mesh_viewer_display.cpp.orig	2009-10-04 22:26:36 UTC
-+++ triangle_mesh_viewer_display.cpp
-@@ -24,6 +24,8 @@
- #include "matrix33.h"
- #include "triangle_mesh_viewer.h"
- 
-+#include <GL/glu.h>
-+
- TriangleMeshViewerDisplay::TriangleMeshViewerDisplay(TriangleMeshViewer* parent,const QGLFormat& format,const ParametersRender* param,const std::vector<const TriangleMesh*>& m,bool verbose)
-   :QGLWidget(format,parent)
-   ,_notify(*parent)