Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 08 Nov 2012 01:41:11 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        ak@FreeBSD.org
Subject:   ports/173456: [MAINTAINER] games/bombherman: Makefile changed, added Desktop entries, icons, changed pkg-plist
Message-ID:  <20121108004114.77021103@hub.freebsd.org>
Resent-Message-ID: <201211080050.qA80o0o5088542@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         173456
>Category:       ports
>Synopsis:       [MAINTAINER] games/bombherman: Makefile changed, added Desktop entries, icons, changed pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 08 00:50:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
+DESKTOP_ENTRIES=
+.for s in ${ICON_SIZES}

Changed pkg-plist

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
WARN: Makefile: [66]: use ${VARIABLE}, instead of $(VARIABLE).
WARN: Makefile: [19]: possible direct use of command "automake" found. Use ${AUTOMAKE} instead and set according USE_AUTOTOOLS=<tool> macro
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: new ports should not set PORTREVISION.
0 fatal errors and 4 warnings found.

WARN: Makefile: [66] because is used
@${REINPLACE_CMD} -e 's|itlocaledir = $$(prefix)/$$(DATADIRNAME)/locale|itlocaledir = $$(prefix)/share/locale|'

WARN: Makefile: [19] because is used
BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake

port test: clean

Build log

https://redports.org/buildarchive/20121107223314-15403/

>Fix:

--- bomb-her-man-0.3_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/bombherman/Makefile ./Makefile
--- /usr/ports/games/bombherman/Makefile	2012-10-10 01:56:53.000000000 +0200
+++ ./Makefile	2012-11-08 01:17:47.000000000 +0100
@@ -4,11 +4,13 @@
 
 PORTNAME=	bomb-her-man
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	GH \
 		SF/nemysisfreebsdp/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}_icons.tar.gz:icons
+		${PORTNAME}_icons${EXTRACT_SUFX}:icons
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Bomberman clone written in C++
@@ -38,11 +40,13 @@
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
-DESKTOP_ENTRIES="Bomb-her-man" "${COMMENT}" "${PORTNAME}_48.png" \
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
+
+DESKTOP_ENTRIES="Bomb-her-man" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
 
 .include <bsd.port.options.mk>
 
@@ -63,7 +67,12 @@
 .endif
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png ${PREFIX}/share/pixmaps
+.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
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
diff -ruN --exclude=CVS /usr/ports/games/bombherman/distinfo ./distinfo
--- /usr/ports/games/bombherman/distinfo	2012-10-10 01:56:53.000000000 +0200
+++ ./distinfo	2012-11-07 20:07:53.000000000 +0100
@@ -1,4 +1,4 @@
-SHA256 (bomb-her-man-0.3.tar.gz) = 6ccf847f7452afaec664ee6f0dae50895ed7138bfc27479254e539d56b8cca9c
-SIZE (bomb-her-man-0.3.tar.gz) = 2019211
-SHA256 (bomb-her-man_icons.tar.gz) = b2a402bd226ccb324c0b9dbe24540da99880409ca2d2e862725eb08120c02978
-SIZE (bomb-her-man_icons.tar.gz) = 29696
+SHA256 (bomb-her-man/bomb-her-man-0.3.tar.gz) = 6ccf847f7452afaec664ee6f0dae50895ed7138bfc27479254e539d56b8cca9c
+SIZE (bomb-her-man/bomb-her-man-0.3.tar.gz) = 2019211
+SHA256 (bomb-her-man/bomb-her-man_icons.tar.gz) = 40be2e1ab029822d6acdbe35914a9169c4401e9a53e04bd500f44fe0253a3ac1
+SIZE (bomb-her-man/bomb-her-man_icons.tar.gz) = 32256
diff -ruN --exclude=CVS /usr/ports/games/bombherman/pkg-plist ./pkg-plist
--- /usr/ports/games/bombherman/pkg-plist	2012-10-10 01:56:53.000000000 +0200
+++ ./pkg-plist	2012-11-07 20:11:19.000000000 +0100
@@ -54,25 +54,39 @@
 %%DATADIR%%/graphics/scores/background-vertical.svg
 %%DATADIR%%/graphics/tomb1.svg
 %%DATADIR%%/graphics/tomb2.svg
+share/icons/hicolor/32x32/apps/bomb-her-man.png
+share/icons/hicolor/48x48/apps/bomb-her-man.png
+share/icons/hicolor/64x64/apps/bomb-her-man.png
+share/icons/hicolor/72x72/apps/bomb-her-man.png
+share/icons/hicolor/96x96/apps/bomb-her-man.png
 %%NLS%%share/locale/fr/LC_MESSAGES/bomb-her-man.mo
-share/pixmaps/bomb-her-man_48.png
-share/pixmaps/bomb-her-man_64.png
-share/pixmaps/bomb-her-man_72.png
-share/pixmaps/bomb-her-man_96.png
-@dirrm %%DATADIR%%/graphics/scores/2
-@dirrm %%DATADIR%%/graphics/scores/1
-@dirrm %%DATADIR%%/graphics/scores
-@dirrm %%DATADIR%%/graphics/players/2/3
-@dirrm %%DATADIR%%/graphics/players/2/2
-@dirrm %%DATADIR%%/graphics/players/2/1
-@dirrm %%DATADIR%%/graphics/players/2/0
-@dirrm %%DATADIR%%/graphics/players/2
-@dirrm %%DATADIR%%/graphics/players/1/3
-@dirrm %%DATADIR%%/graphics/players/1/2
-@dirrm %%DATADIR%%/graphics/players/1/1
-@dirrm %%DATADIR%%/graphics/players/1/0
-@dirrm %%DATADIR%%/graphics/players/1
-@dirrm %%DATADIR%%/graphics/players
-@dirrm %%DATADIR%%/graphics/bonuses
-@dirrm %%DATADIR%%/graphics
-@dirrm %%DATADIR%%
+share/pixmaps/bomb-her-man.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
+@dirrmtry share/icons
+@dirrmtry %%DATADIR%%/graphics/scores/2
+@dirrmtry %%DATADIR%%/graphics/scores/1
+@dirrmtry %%DATADIR%%/graphics/scores
+@dirrmtry %%DATADIR%%/graphics/players/2/3
+@dirrmtry %%DATADIR%%/graphics/players/2/2
+@dirrmtry %%DATADIR%%/graphics/players/2/1
+@dirrmtry %%DATADIR%%/graphics/players/2/0
+@dirrmtry %%DATADIR%%/graphics/players/2
+@dirrmtry %%DATADIR%%/graphics/players/1/3
+@dirrmtry %%DATADIR%%/graphics/players/1/2
+@dirrmtry %%DATADIR%%/graphics/players/1/1
+@dirrmtry %%DATADIR%%/graphics/players/1/0
+@dirrmtry %%DATADIR%%/graphics/players/1
+@dirrmtry %%DATADIR%%/graphics/players
+@dirrmtry %%DATADIR%%/graphics/bonuses
+@dirrmtry %%DATADIR%%/graphics
+@dirrmtry %%DATADIR%%
--- bomb-her-man-0.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?20121108004114.77021103>