Date: Tue, 05 Mar 2013 15:30:43 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176665: [PATCH] graphics/evolvotron: added documenttion, icons, pkg-plist, take maintainership Message-ID: <20130305143052.19165EE9@hub.freebsd.org> Resent-Message-ID: <201303051440.r25Ee1tq014928@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176665
>Category: ports
>Synopsis: [PATCH] graphics/evolvotron: added documenttion, icons, pkg-plist, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 05 14:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: nemysis
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10
>Description:
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/
>Fix:
--- evolvotron-0.6.3_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/evolvotron/Makefile ./Makefile
--- /usr/ports/graphics/evolvotron/Makefile 2013-02-10 14:22:27.000000000 +0100
+++ ./Makefile 2013-03-05 14:24:16.000000000 +0100
@@ -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 @@
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 @@
.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>
diff -ruN --exclude=CVS /usr/ports/graphics/evolvotron/distinfo ./distinfo
--- /usr/ports/graphics/evolvotron/distinfo 2013-02-10 14:22:27.000000000 +0100
+++ ./distinfo 2013-03-05 13:33:20.000000000 +0100
@@ -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
diff -ruN --exclude=CVS /usr/ports/graphics/evolvotron/pkg-plist ./pkg-plist
--- /usr/ports/graphics/evolvotron/pkg-plist 1970-01-01 01:00:00.000000000 +0100
+++ ./pkg-plist 2013-03-05 13:39:06.000000000 +0100
@@ -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%%
--- evolvotron-0.6.3_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130305143052.19165EE9>