From owner-svn-ports-all@freebsd.org Sun Feb 7 15:56:27 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EF4BBAA0E8D; Sun, 7 Feb 2016 15:56:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AF538FB2; Sun, 7 Feb 2016 15:56:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u17FuP03018659; Sun, 7 Feb 2016 15:56:25 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u17FuPa8018657; Sun, 7 Feb 2016 15:56:25 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201602071556.u17FuPa8018657@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 7 Feb 2016 15:56:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408419 - in head/graphics/evolvotron: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Feb 2016 15:56:27 -0000 Author: amdmi3 Date: Sun Feb 7 15:56:25 2016 New Revision: 408419 URL: https://svnweb.freebsd.org/changeset/ports/408419 Log: - Fix LICENSE - Fix build with boost 1.60 - Switch to options helpers - Cosmetic fixes PR: 199601 Added: head/graphics/evolvotron/files/patch-libfunction_useful.h (contents, props changed) Modified: head/graphics/evolvotron/Makefile Modified: head/graphics/evolvotron/Makefile ============================================================================== --- head/graphics/evolvotron/Makefile Sun Feb 7 15:53:49 2016 (r408418) +++ head/graphics/evolvotron/Makefile Sun Feb 7 15:56:25 2016 (r408419) @@ -13,8 +13,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${E MAINTAINER= ports@FreeBSD.org COMMENT= Generative software that evolves images/textures/patterns -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= GPLv3+ # LICENSE file is GPLv2 though LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs @@ -22,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= python qmake USE_QT4= corelib gui xml moc_build -QMAKE_ARGS+= VERSION_NUMBER="${PORTVERSION}" +QMAKE_ARGS= VERSION_NUMBER="${PORTVERSION}" QMAKE_SOURCE_PATH= ${WRKSRC}/main.pro MAKE_JOBS_UNSAFE= yes @@ -49,11 +48,9 @@ do-install: .for i in evolvotron evolvotron_mutate evolvotron_render ${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${STAGEDIR}${PREFIX}/bin/ .endfor - .for lib in libevolvotron libfunction ${INSTALL_DATA} ${WRKSRC}/${lib}/${lib}.a ${STAGEDIR}${PREFIX}/lib/ .endfor - .for s in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ @@ -61,12 +58,12 @@ do-install: .endfor ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ - .for m in evolvotron.1 evolvotron_mutate.1 evolvotron_render.1 cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${m} \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ .endfor +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Added: head/graphics/evolvotron/files/patch-libfunction_useful.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/evolvotron/files/patch-libfunction_useful.h Sun Feb 7 15:56:25 2016 (r408419) @@ -0,0 +1,18 @@ +--- libfunction/useful.h.orig 2013-01-26 12:49:04 UTC ++++ libfunction/useful.h +@@ -40,6 +40,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include + #include + #include +@@ -49,6 +50,7 @@ + #include + #include + #include ++#endif + + //! Convenience typedef. + typedef unsigned int uint;