Bug 176665 - [PATCH] graphics/evolvotron: added documenttion, icons, pkg-plist, take maintainership
Summary: [PATCH] graphics/evolvotron: added documenttion, icons, pkg-plist, take maint...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Beech Rintoul
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-03-05 14:40 UTC by nemysis
Modified: 2013-03-06 00:30 UTC (History)
0 users

See Also:


Attachments
evolvotron-0.6.3_1.patch (4.92 KB, patch)
2013-03-05 14:40 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2013-03-05 14:40:00 UTC
Makefile changed:
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}_icons${EXTRACT_SUFX}:icons
+PORTDOCS=	NEWS README TODO USAGE evolvotron.html
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96 128x128
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+=	PORTDOCS=""

Changed and refined:
 post-patch:
 post-configure:
 do-install:
+post-install:

- Take maintainership

Added file(s):
- pkg-plist

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)

How-To-Repeat: 
portlint -A
looks fine.

port test: clean

Build log
https://redports.org/buildarchive/20130305134719-15787/
Comment 1 Beech Rintoul freebsd_committer freebsd_triage 2013-03-05 18:29:39 UTC
Responsible Changed
From-To: freebsd-ports-bugs->beech

I'll take it
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-03-06 00:29:08 UTC
Author: beech
Date: Wed Mar  6 00:28:55 2013
New Revision: 313486
URL: http://svnweb.freebsd.org/changeset/ports/313486

Log:
  - add documenttion, icons, pkg-plist
  - Pass maintainership to submitter
  
  PR:		ports/176665
  Submitted by:	nemysis <nemysis@gmx.ch>

Added:
  head/graphics/evolvotron/pkg-plist   (contents, props changed)
Modified:
  head/graphics/evolvotron/Makefile
  head/graphics/evolvotron/distinfo

Modified: head/graphics/evolvotron/Makefile
==============================================================================
--- head/graphics/evolvotron/Makefile	Wed Mar  6 00:19:08 2013	(r313485)
+++ head/graphics/evolvotron/Makefile	Wed Mar  6 00:28:55 2013	(r313486)
@@ -3,10 +3,14 @@
 
 PORTNAME=	evolvotron
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	SF
+MASTER_SITES=	SF \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Generative software that evolves images/textures/patterns
 
 LICENSE=	GPLv2
@@ -24,14 +28,24 @@ 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
+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" \
+		"${PORTNAME}" "Graphics;2DGraphics;" true
 
 .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
@@ -43,27 +57,38 @@ QMAKEFLAGS+=	CONFIG+=precompile_header
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|/bin/bash|/bin/sh|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} \
+		-e 's|/bin/bash|/bin/sh|' \
+		${WRKSRC}/configure ${WRKSRC}/VERSION
 	@${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)
+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} \
+		VERSION_NUMBER="${PORTVERSION}" main.pro
 
 do-install:
 .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)
+	${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${PREFIX}/bin/
 .endfor
-.for i in libevolvotron libfunction
-	(cd ${WRKSRC}/${i} && ${INSTALL_DATA} ${i}.a ${PREFIX}/lib)
+.for lib in libevolvotron libfunction
+	${INSTALL_DATA} ${WRKSRC}/${lib}/${lib}.a ${PREFIX}/lib/
 .endfor
+
+post-install:
+.for s in ${ICON_SIZES}
+	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
+		${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/)
+
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} evolvotron.html ${DOCSDIR})
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/graphics/evolvotron/distinfo
==============================================================================
--- head/graphics/evolvotron/distinfo	Wed Mar  6 00:19:08 2013	(r313485)
+++ head/graphics/evolvotron/distinfo	Wed Mar  6 00:28:55 2013	(r313486)
@@ -1,2 +1,4 @@
 SHA256 (evolvotron-0.6.3.tar.gz) = d1735fe84d90be004888017068f49fa00c97378fd7cca11a90a4a889ef681393
 SIZE (evolvotron-0.6.3.tar.gz) = 182357
+SHA256 (evolvotron_icons.tar.gz) = f7d98eab15bf39d6de66a548457223daaffab4e5fe4aa444c926343786400d85
+SIZE (evolvotron_icons.tar.gz) = 93696

Added: head/graphics/evolvotron/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/evolvotron/pkg-plist	Wed Mar  6 00:28:55 2013	(r313486)
@@ -0,0 +1,32 @@
+bin/evolvotron
+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
+share/icons/hicolor/128x128/apps/evolvotron.png
+share/icons/hicolor/32x32/apps/evolvotron.png
+share/icons/hicolor/48x48/apps/evolvotron.png
+share/icons/hicolor/64x64/apps/evolvotron.png
+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%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Beech Rintoul freebsd_committer freebsd_triage 2013-03-06 00:29:20 UTC
State Changed
From-To: open->closed

Committed, Thanks!