Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Oct 2013 18:02:53 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329487 - head/graphics/evolvotron
Message-ID:  <201310051802.r95I2rZH047135@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Sat Oct  5 18:02:53 2013
New Revision: 329487
URL: http://svnweb.freebsd.org/changeset/ports/329487

Log:
  - Change maintainer email to @FreeBSD.org
  - Use the new format for LIB_DEPENDS
  - Change desktop entry
  - Support STAGEDIR
  
  Approved by:	wg/pawel (mentors)

Modified:
  head/graphics/evolvotron/Makefile
  head/graphics/evolvotron/pkg-plist

Modified: head/graphics/evolvotron/Makefile
==============================================================================
--- head/graphics/evolvotron/Makefile	Sat Oct  5 18:02:35 2013	(r329486)
+++ head/graphics/evolvotron/Makefile	Sat Oct  5 18:02:53 2013	(r329487)
@@ -10,14 +10,12 @@ MASTER_SITES=	SF \
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Generative software that evolves images/textures/patterns
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
-
-OPTIONS_DEFINE=	DOCS
+LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -27,27 +25,19 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=		evolvotron.1 evolvotron_mutate.1 evolvotron_render.1
-
 PORTDOCS=	NEWS README TODO USAGE evolvotron.html
 
 INSTALLS_ICONS=	yes
 ICON_SIZES=	32x32 48x48 64x64 72x72 96x96 128x128
 
-DESKTOP_ENTRIES="Evolvotron" "Interactive image generator" \
-		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+DESKTOP_ENTRIES="Evolvotron" "Interactive image generator" "${PORTNAME}" \
 		"${PORTNAME}" "Graphics;2DGraphics;" true
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_SUB+=	PORTDOCS=""
-.else
-PLIST_SUB+=	PORTDOCS="@comment "
-.endif
-
 .if ${CXX:T:M*clang*} || ${OSVERSION} >= 1000024
 .for i in libevolvotron libfunction
 CXXFLAGS+=	-include ${WRKSRC}/${i}/${i}_precompiled.h \
@@ -58,8 +48,7 @@ QMAKEFLAGS+=	CONFIG+=precompile_header
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|/bin/bash|/bin/sh|' \
+	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
 		${WRKSRC}/configure ${WRKSRC}/VERSION
 	@${REINPLACE_CMD} -e \
 		'/^CONFIG/s|precompile_header|| ; \
@@ -72,24 +61,26 @@ post-configure:
 
 do-install:
 .for i in evolvotron evolvotron_mutate evolvotron_render
-	${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${STAGEDIR}${PREFIX}/bin/
 .endfor
+
 .for lib in libevolvotron libfunction
-	${INSTALL_DATA} ${WRKSRC}/${lib}/${lib}.a ${PREFIX}/lib/
+	${INSTALL_DATA} ${WRKSRC}/${lib}/${lib}.a ${STAGEDIR}${PREFIX}/lib/
 .endfor
 
-post-install:
 .for s in ${ICON_SIZES}
-	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
-		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
-	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
-	(cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1/)
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+.for m in evolvotron.1 evolvotron_mutate.1 evolvotron_render.1
+	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${m} ${STAGEDIR}${MAN1PREFIX}/man/man1/
+.endfor
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>

Modified: head/graphics/evolvotron/pkg-plist
==============================================================================
--- head/graphics/evolvotron/pkg-plist	Sat Oct  5 18:02:35 2013	(r329486)
+++ head/graphics/evolvotron/pkg-plist	Sat Oct  5 18:02:53 2013	(r329487)
@@ -3,11 +3,9 @@ bin/evolvotron_mutate
 bin/evolvotron_render
 lib/libevolvotron.a
 lib/libfunction.a
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/USAGE
-%%PORTDOCS%%%%DOCSDIR%%/evolvotron.html
+man/man1/evolvotron.1.gz
+man/man1/evolvotron_mutate.1.gz
+man/man1/evolvotron_render.1.gz
 share/icons/hicolor/128x128/apps/evolvotron.png
 share/icons/hicolor/32x32/apps/evolvotron.png
 share/icons/hicolor/48x48/apps/evolvotron.png
@@ -15,18 +13,3 @@ share/icons/hicolor/64x64/apps/evolvotro
 share/icons/hicolor/72x72/apps/evolvotron.png
 share/icons/hicolor/96x96/apps/evolvotron.png
 share/pixmaps/evolvotron.png
-@dirrmtry share/icons/hicolor/96x96/apps
-@dirrmtry share/icons/hicolor/96x96
-@dirrmtry share/icons/hicolor/72x72/apps
-@dirrmtry share/icons/hicolor/72x72
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310051802.r95I2rZH047135>