Index: head/graphics/fracplanet/Makefile =================================================================== --- head/graphics/fracplanet/Makefile (revision 389216) +++ head/graphics/fracplanet/Makefile (revision 389217) @@ -1,98 +1,88 @@ # Created by: Igor Pokrovsky # $FreeBSD$ PORTNAME= fracplanet PORTVERSION= 0.4.0 PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= SF \ SF/nemysisfreebsdp/:icons DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}_icons.tar.gz:icons MAINTAINER= ports@FreeBSD.org COMMENT= Interactive tool for creating random fractal planets and terrain LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt LIB_DEPENDS= libboost_program_options.so:${PORTSDIR}/devel/boost-libs WRKSRC= ${WRKDIR}/${PORTNAME} USES= gmake USE_GL= glu USE_QT4= corelib moc_build qmake_build gui opengl QT_NONSTANDARD= yes HAS_CONFIGURE= yes CONFIGURE_ENV= QTDIR="${QT_PREFIX}" CONFIGURE_ARGS= -spec ${QMAKESPEC} +CXXFLAGS+= -include ${WRKSRC}/precompiled.h + PORTDOCS= * -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= BUGS NEWS README THANKS ${PORTNAME}.css ${PORTNAME}.htm - INSTALLS_ICONS= yes ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 DESKTOP_ENTRIES="Fracplanet" "" "${PORTNAME}" \ "${PORTNAME}" "Graphics;" "" -OPTIONS_DEFINE= DOCS -OPTIONS_GROUP= DOXYGEN -OPTIONS_GROUP_DOXYGEN= HTML LATEX +OPTIONS_DEFINE= DOXYGEN DOCS -OPTIONS_DEFAULT= HTML +.include -HTML_DESC= Install HTML Doxygen files -LATEX_DESC= Install LaTeX Doxygen files - -.include - -.if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX} +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen .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 +.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN} +post-build: + cd ${WRKSRC} && doxygen . +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/man/man1/${PORTNAME}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ .for s in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${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 -.if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX} - @cd ${WRKSRC} && doxygen . -.endif - -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MHTML} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) -.endif - -.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MLATEX} - @(cd ${WRKSRC} && ${COPYTREE_SHARE} latex ${STAGEDIR}${DOCSDIR}) -.endif - -.include +.include Index: head/graphics/fracplanet/files/patch-fracplanet.pro =================================================================== --- head/graphics/fracplanet/files/patch-fracplanet.pro (nonexistent) +++ head/graphics/fracplanet/files/patch-fracplanet.pro (revision 389217) @@ -0,0 +1,11 @@ +--- 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 Property changes on: head/graphics/fracplanet/files/patch-fracplanet.pro ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp =================================================================== --- head/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp (revision 389216) +++ head/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp (revision 389217) @@ -1,11 +1,11 @@ ---- triangle_mesh_viewer_display.cpp.orig 2009-10-05 00:26:36.000000000 +0200 -+++ triangle_mesh_viewer_display.cpp 2013-10-03 00:25:53.000000000 +0200 +--- 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)