--- fracplanet/Makefile (revision 474858) +++ fracplanet/Makefile (working copy) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= fracplanet -PORTVERSION= 0.4.0 -PORTREVISION= 16 +PORTVERSION= 0.5.1 CATEGORIES= graphics MASTER_SITES= SF \ SF/nemysisfreebsdp/:icons +PKGNAMESUFFIX= -${FLAVOR} DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}_icons.tar.gz:icons @@ -18,54 +18,50 @@ 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]} -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 - +DESKTOP_ENTRIES= "Fracplanet" \ + "" \ + "${PORTNAME}" \ + "${PORTNAME}" \ + "Graphics;" \ + "" +INSTALLS_ICONS= yes PORTDOCS= * +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -INSTALLS_ICONS= yes -ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 - -DESKTOP_ENTRIES="Fracplanet" "" "${PORTNAME}" \ - "${PORTNAME}" "Graphics;" "" - OPTIONS_DEFINE= DOXYGEN DOCS +DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen +DOXYGEN_IMPLIES= DOCS -.include +DOCFILES= BUGS NEWS README THANKS fracplanet.css fracplanet.htm +ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS+= doxygen:devel/doxygen +.if ${FLAVOR} == qt4 +USES+= qt:4 +USE_QT= corelib gui moc_build opengl +.else +USES+= qt:5 +USE_QT= buildtools_build core gui opengl +QTVER_SUFFIX= 5 .endif 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 + @${REINPLACE_CMD} -Ee 's|(OBJECTS_DIR)|#\1|' ${WRKSRC}/fracplanet.pro -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} -post-build: +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 +73,12 @@ ${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}) -.include +post-install-DOXYGEN-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${COPYTREE_SHARE} "html latex" ${STAGEDIR}${DOCSDIR}) + +.include --- fracplanet/distinfo (revision 474858) +++ fracplanet/distinfo (working copy) @@ -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 --- fracplanet/files/patch-fracplanet.pro (revision 474858) +++ fracplanet/files/patch-fracplanet.pro (nonexistent) @@ -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 --- fracplanet/files/patch-triangle_mesh_viewer_display.cpp (revision 474858) +++ fracplanet/files/patch-triangle_mesh_viewer_display.cpp (nonexistent) @@ -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 -+ - TriangleMeshViewerDisplay::TriangleMeshViewerDisplay(TriangleMeshViewer* parent,const QGLFormat& format,const ParametersRender* param,const std::vector& m,bool verbose) - :QGLWidget(format,parent) - ,_notify(*parent)