- Update to 0.6.3

PR:		175016
Submitted by:	ports fury

5 files changed, 73 insertions, 25 deletions

diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile
index 122e6d1f1306..a211aa573a10 100644
--- a/graphics/evolvotron/Makefile
+++ b/graphics/evolvotron/Makefile
@@ -2,41 +2,68 @@
 # $FreeBSD$
 
 PORTNAME=	evolvotron
-PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTVERSION=	0.6.3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generative software that evolves images/textures/patterns
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_QT4=	corelib gui moc_build qmake_build xml
+USE_QT4=	corelib gui xml moc_build qmake_build
 USE_PYTHON=	yes
-USE_XORG=	x11
-GNU_CONFIGURE=	yes
-
+HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 MAKE_JOBS_UNSAFE=	yes
 
+MAN1=		evolvotron.1 evolvotron_mutate.1 evolvotron_render.1
+PORTDOCS=	*
+PLIST_FILES=	bin/evolvotron bin/evolvotron_mutate bin/evolvotron_render \
+		lib/libevolvotron.a lib/libfunction.a
+
+DESKTOP_ENTRIES="Evolvotron" "Interactive image generator" "" "${PORTNAME}" \
+		"Graphics;2DGraphics;" true
+
 .include <bsd.port.pre.mk>
 
+.if ${CXX:T:M*clang*} || ${OSVERSION} >= 1000024
+.for i in libevolvotron libfunction
+CXXFLAGS+=	-include ${WRKSRC}/${i}/${i}_precompiled.h \
+		-I${WRKSRC}/${i}
+.endfor
+.else
+QMAKEFLAGS+=	CONFIG+=precompile_header
+.endif
+
 post-patch:
-	${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 28d ${WRKSRC}/libevolvotron/platform_specific.h
-	${REINPLACE_CMD} -e 30d ${WRKSRC}/libevolvotron/platform_specific.h
+	@${REINPLACE_CMD} -e \
+		's|/bin/bash|/bin/sh|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^CONFIG/s|precompile_header|| ; \
+		 /DEFINES/s|_LINUX|_BSD|' ${WRKSRC}/common.pro
+
+post-configure:
+	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} \
+		VERSION_NUMBER="${PORTVERSION}" main.pro)
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/evolvotron/evolvotron ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/evolvotron_mutate/evolvotron_mutate ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/evolvotron_render/evolvotron_render ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/libevolvotron/libevolvotron.a ${PREFIX}/lib
-	@${INSTALL_DATA} ${WRKSRC}/libfunction/libfunction.a ${PREFIX}/lib
-.if !defined(NOPORTDOCS)
+.for i in evolvotron evolvotron_mutate evolvotron_render
+	(cd ${WRKSRC}/${i} && ${INSTALL_PROGRAM} ${i} ${PREFIX}/bin)
+	(cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${i}.1 ${MANPREFIX}/man/man1)
+.endfor
+.for i in libevolvotron libfunction
+	(cd ${WRKSRC}/${i} && ${INSTALL_DATA} ${i}.a ${PREFIX}/lib)
+.endfor
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/evolvotron.html ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} evolvotron.html ${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/evolvotron/distinfo b/graphics/evolvotron/distinfo
index 7334fc9d77a8..fc685edf8592 100644
--- a/graphics/evolvotron/distinfo
+++ b/graphics/evolvotron/distinfo
@@ -1,2 +1,2 @@
-SHA256 (evolvotron-0.6.1.tar.gz) = 70bf4dc6de69f43385047d3dfb6058c6d5b26957313486bfc452721ff05be503
-SIZE (evolvotron-0.6.1.tar.gz) = 156441
+SHA256 (evolvotron-0.6.3.tar.gz) = d1735fe84d90be004888017068f49fa00c97378fd7cca11a90a4a889ef681393
+SIZE (evolvotron-0.6.3.tar.gz) = 182357
diff --git a/graphics/evolvotron/files/patch-USAGE b/graphics/evolvotron/files/patch-USAGE
new file mode 100644
index 000000000000..fffb20faf384
--- /dev/null
+++ b/graphics/evolvotron/files/patch-USAGE
@@ -0,0 +1,13 @@
+--- USAGE.orig
++++ USAGE
+@@ -68,8 +68,8 @@
+ 
+   -m, --multisample <multisample grid>
+ 	Enables additional antialiasing passes.
+-	Specifing 2 or 3 will provide an additional pass with 2x2 or 3x3 samples per pixel.
+-	Specifiying 4 (of higher) will provide a 2x2 and a final 4x4 pass.
++	Specifying 2 or 3 will provide an additional pass with 2x2 or 3x3 samples per pixel.
++	Specifying 4 (of higher) will provide a 2x2 and a final 4x4 pass.
+ 	Specifying 1 provides the default behaviour of one sample per pixel.
+ 	For best rendering quality also specify -j.
+ 
diff --git a/graphics/evolvotron/files/patch-libevolvotron__dialog_help.cpp b/graphics/evolvotron/files/patch-libevolvotron__dialog_help.cpp
new file mode 100644
index 000000000000..235c31977851
--- /dev/null
+++ b/graphics/evolvotron/files/patch-libevolvotron__dialog_help.cpp
@@ -0,0 +1,15 @@
+--- libevolvotron/dialog_help.cpp.orig
++++ libevolvotron/dialog_help.cpp
+@@ -45,10 +45,10 @@
+ "    Esc - Returns to normal mode from full-screen/menu-hidden mode."
+ "  </li>"
+ "  <li>"
+-"    R - Reset (reset mutation paramters and locks)"
++"    R - Reset (reset mutation parameters and locks)"
+ "  </li>"
+ "  <li>"
+-"    T - Restart (preserve mutation paramters and locks)"
++"    T - Restart (preserve mutation parameters and locks)"
+ "  </li>"
+ "  <li>"
+ "    X - Remix (randomize function weights and restart)"
diff --git a/graphics/evolvotron/pkg-plist b/graphics/evolvotron/pkg-plist
index 15872ef8ec3b..e69de29bb2d1 100644
--- a/graphics/evolvotron/pkg-plist
+++ b/graphics/evolvotron/pkg-plist
@@ -1,7 +0,0 @@
-bin/evolvotron
-bin/evolvotron_mutate
-bin/evolvotron_render
-lib/libevolvotron.a
-lib/libfunction.a
-%%PORTDOCS%%%%DOCSDIR%%/evolvotron.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%