Bug 173456 - [MAINTAINER] games/bombherman: Makefile changed, added Desktop entries, icons, changed pkg-plist
Summary: [MAINTAINER] games/bombherman: Makefile changed, added Desktop entries, icons...
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: Max Brazhnikov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-11-08 00:50 UTC by nemysis
Modified: 2013-02-20 18:10 UTC (History)
1 user (show)

See Also:


Attachments
bomb-her-man-0.3_1.patch (4.74 KB, patch)
2012-11-08 00:50 UTC, nemysis
no flags Details | Diff
bombherman.diff (5.14 KB, patch)
2012-12-04 17:47 UTC, nemysis
no flags Details | Diff
bombherman.diff (3.94 KB, patch)
2013-02-19 13:13 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 2012-11-08 00:50:00 UTC
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/
Comment 1 nemysis 2012-12-04 17:47:20 UTC
Added

#Wrong versioning upstream
PORTSCOUT=      skipv:1.0
Comment 2 Max Brazhnikov freebsd_committer freebsd_triage 2013-01-10 20:52:48 UTC
Responsible Changed
From-To: freebsd-ports-bugs->makc

I'll take it.
Comment 3 Max Brazhnikov freebsd_committer freebsd_triage 2013-02-19 12:19:37 UTC
State Changed
From-To: open->feedback

I suggest to no set DIST_SUBDIR, as it will force users to redownload 
source tarball. Is there a reason you changed dirrm to dirrmtry for 
DATADIR in plist?
Comment 4 nemysis 2013-02-19 13:13:10 UTC
On Tue, 19 Feb 2013 12:19:37 GMT
makc@FreeBSD.org wrote:

> Synopsis: [MAINTAINER] games/bombherman: Makefile changed, added Desktop entries, icons, changed pkg-plist
> 
> State-Changed-From-To: open->feedback
> State-Changed-By: makc
> State-Changed-When: Tue Feb 19 12:19:37 UTC 2013
> State-Changed-Why: 
> I suggest to no set DIST_SUBDIR, as it will force users to redownload
> source tarball. Is there a reason you changed dirrm to dirrmtry for
> DATADIR in plist?
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=173456

Because this i use DIST_SUBDIR=<-->${PORTNAME}, and later is a new version

http://www.freebsd.org/doc/en/books/porters-handbook/makefile-distfiles.html#AEN2079

Sorry i have forget this for dirrm. Now have this changed.

New updated patch, old not apply more because Header is changed.

This is important
+PORTSCOUT=      ignore:1
Comment 5 Max Brazhnikov freebsd_committer freebsd_triage 2013-02-19 16:26:52 UTC
State Changed
From-To: feedback->open

Feedback received
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-02-20 18:05:30 UTC
Author: makc
Date: Wed Feb 20 18:05:17 2013
New Revision: 312642
URL: http://svnweb.freebsd.org/changeset/ports/312642

Log:
  - Update icons
  - Set PORTSCOUT
  
  PR:		ports/173456
  Submitted by:	nemysis (maintainer)

Modified:
  head/games/bombherman/Makefile
  head/games/bombherman/distinfo
  head/games/bombherman/pkg-plist

Modified: head/games/bombherman/Makefile
==============================================================================
--- head/games/bombherman/Makefile	Wed Feb 20 18:02:12 2013	(r312641)
+++ head/games/bombherman/Makefile	Wed Feb 20 18:05:17 2013	(r312642)
@@ -1,23 +1,21 @@
-# Created by:	nemysis@gmx.ch
-#
+# Created by: nemysis@gmx.ch
 # $FreeBSD$
 
 PORTNAME=	bomb-her-man
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	GH \
 		SF/nemysisfreebsdp/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}_icons.tar.gz:icons
+		${PORTNAME}_icons${EXTRACT_SUFX}:icons
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Bomberman clone written in C++
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake \
-		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo
 
 USE_GITHUB=	yes
@@ -29,7 +27,7 @@ GH_COMMIT=	8f5aa22
 USE_SDL=	sdl image mixer ttf
 USE_GNOME=	intltool librsvg2
 GNU_CONFIGURE=	yes
-AUTOMAKE_ARGS=	--add-missing
+USE_AUTOTOOLS=	automake:env
 USE_GMAKE=	yes
 ALL_TARGET=	# empty
 MAKE_JOBS_SAFE=	yes
@@ -39,12 +37,16 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
-DESKTOP_ENTRIES="Bomb-her-man" "Bomberman clone" \
-		"${PREFIX}/share/pixmaps/${PORTNAME}_48.png" \
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
+
+DESKTOP_ENTRIES="Bomb-her-man" "Bomberman clone" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" false
 
 OPTIONS_DEFINE=	NLS
-OPTIONS_DEFAULT=	NLS
+
+# Wrong versioning upstream
+PORTSCOUT=	 ignore:1
 
 .include <bsd.port.options.mk>
 
@@ -65,7 +67,12 @@ pre-configure:
 .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}

Modified: head/games/bombherman/distinfo
==============================================================================
--- head/games/bombherman/distinfo	Wed Feb 20 18:02:12 2013	(r312641)
+++ head/games/bombherman/distinfo	Wed Feb 20 18:05:17 2013	(r312642)
@@ -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_icons.tar.gz) = 40be2e1ab029822d6acdbe35914a9169c4401e9a53e04bd500f44fe0253a3ac1
+SIZE (bomb-her-man_icons.tar.gz) = 32256

Modified: head/games/bombherman/pkg-plist
==============================================================================
--- head/games/bombherman/pkg-plist	Wed Feb 20 18:02:12 2013	(r312641)
+++ head/games/bombherman/pkg-plist	Wed Feb 20 18:05:17 2013	(r312642)
@@ -54,11 +54,25 @@ bin/bomb-her-man
 %%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
+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
 @dirrm %%DATADIR%%/graphics/scores/2
 @dirrm %%DATADIR%%/graphics/scores/1
 @dirrm %%DATADIR%%/graphics/scores
_______________________________________________
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 7 Max Brazhnikov freebsd_committer freebsd_triage 2013-02-20 18:07:50 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!