- Fix LICENSE

- Fix build with boost 1.60
- Switch to options helpers
- Cosmetic fixes

PR:		199601
This commit is contained in:
Dmitry Marakasov 2016-02-07 15:56:25 +00:00
parent 6a0ad9ba4f
commit c4c604737f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=408419
2 changed files with 21 additions and 6 deletions

View file

@ -13,8 +13,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
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}

View file

@ -0,0 +1,18 @@
--- libfunction/useful.h.orig 2013-01-26 12:49:04 UTC
+++ libfunction/useful.h
@@ -40,6 +40,7 @@
#include <sstream>
#include <vector>
+#ifndef Q_MOC_RUN
#include <boost/array.hpp>
#include <boost/ptr_container/ptr_map.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
@@ -49,6 +50,7 @@
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
#include <boost/version.hpp>
+#endif
//! Convenience typedef.
typedef unsigned int uint;