Date: Fri, 15 Mar 2013 17:31:34 +0100 From: nemysis <nemysis@gmx.ch> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176997: [PATCH] games/maelstrom: OptionsNG, added license, icon, desktop entry , take maintainership Message-ID: <20130315163137.DF31744B@hub.freebsd.org> Resent-Message-ID: <201303151640.r2FGe0Nc075933@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176997
>Category: ports
>Synopsis: [PATCH] games/maelstrom: OptionsNG, added license, icon, desktop entry , 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: Fri Mar 15 16: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= Maelstrom-${DISTVERSION}${EXTRACT_SUFX} \
+ ${PORTNAME}.png:icons
+EXTRACT_ONLY= Maelstrom-${DISTVERSION}${EXTRACT_SUFX}
+LICENSE= GPLv2
+DATADIR= ${PREFIX}/share/Maelstrom
+DOCSDIR= ${PREFIX}/share/doc/Maelstrom
+PORTDOCS= *
+DESKTOP_ENTRIES="Maelstrom" "${COMMENT}" \
+ "${PREFIX}/share/pixmaps/${PORTNAME}.png" \ <-- .png must be uses or not work icon for Maelstrom.desktop
+ "Maelstrom" "Game;ArcadeGame;" false
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}
+ ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
Changed and refined:
pkg-plist <-- clean, not more PORTDOCS
- Take maintainership
Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
portlint -A
looks fine.
port test: clean
>Fix:
--- maelstrom-3.0.6_9.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/maelstrom/Makefile ./Makefile
--- /usr/ports/games/maelstrom/Makefile 2013-01-14 17:55:35.000000000 +0100
+++ ./Makefile 2013-03-15 17:23:57.000000000 +0100
@@ -1,27 +1,39 @@
-# New ports collection makefile for: Maelstrom
-# Date created: 13 May 1998
-# Whom: Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
# $FreeBSD: head/games/maelstrom/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
PORTNAME= maelstrom
PORTVERSION= 3.0.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= games
-MASTER_SITES= http://slouken.libsdl.org/projects/Maelstrom/src/
+MASTER_SITES= http://slouken.libsdl.org/projects/Maelstrom/src/ \
+ SF/nemysisfreebsdp/:icons
DISTNAME= Maelstrom-${PORTVERSION}
+DISTFILES= Maelstrom-${DISTVERSION}${EXTRACT_SUFX} \
+ ${PORTNAME}.png:icons
DIST_SUBDIR= ${PORTNAME}
+EXTRACT_ONLY= Maelstrom-${DISTVERSION}${EXTRACT_SUFX}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= nemysis@gmx.ch
COMMENT= Asteroids-style game for X Window System
+LICENSE= GPLv2
+
USE_SDL= sdl net
USE_XORG= xpm
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
-.if !defined(NOPORTDOCS)
+DATADIR= ${PREFIX}/share/Maelstrom
+DOCSDIR= ${PREFIX}/share/doc/Maelstrom
+PORTDOCS= *
+
+DESKTOP_ENTRIES="Maelstrom" "${COMMENT}" \
+ "${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+ "Maelstrom" "Game;ArcadeGame;" false
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
INSTALL_TARGET= install install_gamedocs
.endif
@@ -30,5 +42,6 @@
${CHMOD} 2755 ${PREFIX}/bin/Maelstrom
${CHMOD} 664 ${PREFIX}/share/Maelstrom/Maelstrom-Scores
${CHOWN} root:games ${PREFIX}/share/Maelstrom/Maelstrom-Scores
+ ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/maelstrom/distinfo ./distinfo
--- /usr/ports/games/maelstrom/distinfo 2013-01-14 17:55:35.000000000 +0100
+++ ./distinfo 2013-03-15 16:36:14.000000000 +0100
@@ -1,2 +1,4 @@
SHA256 (maelstrom/Maelstrom-3.0.6.tar.gz) = e7983c2c7376cdcca1944db1706d92aedd529638cf13358c88a60df982ba7b46
SIZE (maelstrom/Maelstrom-3.0.6.tar.gz) = 1013073
+SHA256 (maelstrom/maelstrom.png) = 814b1b6f6aacc5faf2befa52df0b97ff89efc8d5bffb3146c0cd6e354fda7799
+SIZE (maelstrom/maelstrom.png) = 2058
diff -ruN --exclude=CVS /usr/ports/games/maelstrom/pkg-plist ./pkg-plist
--- /usr/ports/games/maelstrom/pkg-plist 2013-01-14 17:55:35.000000000 +0100
+++ ./pkg-plist 2013-03-15 16:37:05.000000000 +0100
@@ -1,58 +1,39 @@
bin/Maelstrom
bin/Maelstrom-netd
-%%PORTDOCS%%share/doc/Maelstrom/Ambrosia_Software,_Inc._FAQ
-%%PORTDOCS%%share/doc/Maelstrom/COPYING
-%%PORTDOCS%%share/doc/Maelstrom/COPYING.GPL
-%%PORTDOCS%%share/doc/Maelstrom/Maelstrom-Announce
-%%PORTDOCS%%share/doc/Maelstrom/Maelstrom.FAQ
-%%PORTDOCS%%share/doc/Maelstrom/MaelstromGPL_press_release
-%%PORTDOCS%%share/doc/Maelstrom/Makefile
-%%PORTDOCS%%share/doc/Maelstrom/Makefile.in
-%%PORTDOCS%%share/doc/Maelstrom/Networking.Paper
-%%PORTDOCS%%share/doc/Maelstrom/Porting.Paper
-%%PORTDOCS%%share/doc/Maelstrom/Quotes
-%%PORTDOCS%%share/doc/Maelstrom/README
-%%PORTDOCS%%share/doc/Maelstrom/README.joystick
-%%PORTDOCS%%share/doc/Maelstrom/README.network
-%%PORTDOCS%%share/doc/Maelstrom/README.options
-%%PORTDOCS%%share/doc/Maelstrom/RSA.README
-%%PORTDOCS%%share/doc/Maelstrom/Technical_Notes-v1.0
-%%PORTDOCS%%share/doc/Maelstrom/Technical_Notes-v1.1
-%%PORTDOCS%%share/doc/Maelstrom/Technical_Notes-v2.0
-share/Maelstrom/Images/Maelstrom_Icon#100.cicn
-share/Maelstrom/Images/Maelstrom_Icon#101.cicn
-share/Maelstrom/Images/Maelstrom_Icon#102.cicn
-share/Maelstrom/Images/Maelstrom_Icon#103.cicn
-share/Maelstrom/Images/Maelstrom_Icon#104.cicn
-share/Maelstrom/Images/Maelstrom_Icon#110.cicn
-share/Maelstrom/Images/Maelstrom_Icon#128.cicn
-share/Maelstrom/Images/Maelstrom_Icon#129.cicn
-share/Maelstrom/Images/Maelstrom_Icon#130.cicn
-share/Maelstrom/Images/Maelstrom_Icon#131.cicn
-share/Maelstrom/Images/Maelstrom_Icon#132.cicn
-share/Maelstrom/Images/Maelstrom_Icon#133.cicn
-share/Maelstrom/Images/Maelstrom_Icon#134.cicn
-share/Maelstrom/Images/Maelstrom_Icon#135.cicn
-share/Maelstrom/Images/Maelstrom_Icon#136.cicn
-share/Maelstrom/Images/Maelstrom_Icon#137.cicn
-share/Maelstrom/Images/Maelstrom_Titles#100.bmp
-share/Maelstrom/Images/Maelstrom_Titles#101.bmp
-share/Maelstrom/Images/Maelstrom_Titles#102.bmp
-share/Maelstrom/Images/Maelstrom_Titles#128.bmp
-share/Maelstrom/Images/Maelstrom_Titles#129.bmp
-share/Maelstrom/Images/Maelstrom_Titles#130.bmp
-share/Maelstrom/Images/Maelstrom_Titles#133.bmp
-share/Maelstrom/Images/Maelstrom_Titles#134.bmp
-share/Maelstrom/Images/Maelstrom_Titles#135.bmp
-share/Maelstrom/Images/Maelstrom_Titles#999.bmp
-share/Maelstrom/Images/Makefile
-share/Maelstrom/Images/Makefile.in
-share/Maelstrom/Maelstrom-Scores
-share/Maelstrom/Maelstrom_Fonts
-share/Maelstrom/Maelstrom_Sounds
-share/Maelstrom/Maelstrom_Sprites
-share/Maelstrom/icon.bmp
-share/Maelstrom/icon.xpm
-@dirrm share/Maelstrom/Images
-@dirrm share/Maelstrom
-%%PORTDOCS%%@dirrm share/doc/Maelstrom
+%%DATADIR%%/Images/Maelstrom_Icon#100.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#101.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#102.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#103.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#104.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#110.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#128.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#129.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#130.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#131.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#132.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#133.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#134.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#135.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#136.cicn
+%%DATADIR%%/Images/Maelstrom_Icon#137.cicn
+%%DATADIR%%/Images/Maelstrom_Titles#100.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#101.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#102.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#128.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#129.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#130.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#133.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#134.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#135.bmp
+%%DATADIR%%/Images/Maelstrom_Titles#999.bmp
+%%DATADIR%%/Images/Makefile
+%%DATADIR%%/Images/Makefile.in
+%%DATADIR%%/Maelstrom-Scores
+%%DATADIR%%/Maelstrom_Fonts
+%%DATADIR%%/Maelstrom_Sounds
+%%DATADIR%%/Maelstrom_Sprites
+%%DATADIR%%/icon.bmp
+%%DATADIR%%/icon.xpm
+share/pixmaps/maelstrom.png
+@dirrm %%DATADIR%%/Images
+@dirrm %%DATADIR%%
--- maelstrom-3.0.6_9.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?20130315163137.DF31744B>