svn commit: r389810 - in branches/2015Q2/graphics/fracplanet: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Jun 16 01:28:29 2015
New Revision: 389810
URL: https://svnweb.freebsd.org/changeset/ports/389810

Log:
  MFH: r389217
  
  - Add LICENSE_FILE
  - Simplify documentation installation
  - Disable precompiled headers to fix build with old gcc on -current kernel
  
  Approved by:	ports-secteam (build fix blanket)

Added:
  branches/2015Q2/graphics/fracplanet/files/patch-fracplanet.pro
     - copied unchanged from r389217, head/graphics/fracplanet/files/patch-fracplanet.pro
Modified:
  branches/2015Q2/graphics/fracplanet/Makefile
  branches/2015Q2/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/graphics/fracplanet/Makefile
==============================================================================
--- branches/2015Q2/graphics/fracplanet/Makefile	Tue Jun 16 01:26:59 2015	(r389809)
+++ branches/2015Q2/graphics/fracplanet/Makefile	Tue Jun 16 01:28:29 2015	(r389810)
@@ -14,6 +14,7 @@ MAINTAINER=	ports at 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
@@ -28,10 +29,9 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 CONFIGURE_ARGS=	-spec ${QMAKESPEC}
 
-PORTDOCS=	*
+CXXFLAGS+=	-include ${WRKSRC}/precompiled.h
 
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	 BUGS NEWS README THANKS ${PORTNAME}.css ${PORTNAME}.htm
+PORTDOCS=	*
 
 INSTALLS_ICONS=	yes
 ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
@@ -39,18 +39,11 @@ ICON_SIZES=	32x32 48x48 64x64 72x72 96x9
 DESKTOP_ENTRIES="Fracplanet" "" "${PORTNAME}" \
 		"${PORTNAME}" "Graphics;" ""
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_GROUP=	DOXYGEN
-OPTIONS_GROUP_DOXYGEN=	HTML LATEX
-
-OPTIONS_DEFAULT=	HTML
+OPTIONS_DEFINE=	DOXYGEN DOCS
 
-HTML_DESC=	Install HTML Doxygen files
-LATEX_DESC=	Install LaTeX Doxygen files
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MLATEX}
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
 
@@ -65,6 +58,11 @@ post-patch:
 		'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 \
@@ -80,19 +78,11 @@ do-install:
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-.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})
+	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
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Copied: branches/2015Q2/graphics/fracplanet/files/patch-fracplanet.pro (from r389217, head/graphics/fracplanet/files/patch-fracplanet.pro)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q2/graphics/fracplanet/files/patch-fracplanet.pro	Tue Jun 16 01:28:29 2015	(r389810, copy of r389217, head/graphics/fracplanet/files/patch-fracplanet.pro)
@@ -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

Modified: branches/2015Q2/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp
==============================================================================
--- branches/2015Q2/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp	Tue Jun 16 01:26:59 2015	(r389809)
+++ branches/2015Q2/graphics/fracplanet/files/patch-triangle_mesh_viewer_display.cpp	Tue Jun 16 01:28:29 2015	(r389810)
@@ -1,5 +1,5 @@
---- 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"