Bug 172887 - [PATCH] games/nuclearchess: Makefile changed, OptionsNG, take maintainership
Summary: [PATCH] games/nuclearchess: Makefile changed, OptionsNG, take maintainership
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: Rene Ladan
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-10-19 23:40 UTC by nemysis
Modified: 2013-02-22 10:30 UTC (History)
0 users

See Also:


Attachments
nuclearchess-1.0.0_7.patch (2.62 KB, patch)
2012-10-19 23:40 UTC, nemysis
no flags Details | Diff
nuclearchess.diff (4.17 KB, patch)
2013-02-15 13:23 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-10-19 23:40:01 UTC
- Take maintainership

Removed file(s):
- pkg-plist

Makefile changed:

+LICENSE=	GPLv2
+BUILD_DEPENDS=	pamscale:${PORTSDIR}/graphics/netpbm
+PORTDATA=	*
+PORTDOCS=
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>
+post-build:
+post-install:

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: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: new ports should not set PORTREVISION.
WARN: Makefile: only one MASTER_SITE configured.  Consider adding additional mirrors.
0 fatal errors and 3 warnings found.


port test: clean


Build log

https://redports.org/buildarchive/20121019220307-60681/
Comment 1 nemysis 2013-02-15 13:23:43 UTC
Removed:
BUILD_DEPENDS= pamscale:${PORTSDIR}/graphics/netpbm

Added:

Makefile
SF/nemysisfreebsdp/:icons
${PORTNAME}.png:icons
DIST_SUBDIR=    ${PORTNAME}
EXTRACT_ONLY=   ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
USE_GNOME=      desktopfileutils
INSTALLS_ICONS= yes
DESKTOP_ENTRIES=
@-update-desktop-database


pkg-plist
@exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
Comment 2 Rene Ladan freebsd_committer freebsd_triage 2013-02-21 13:25:01 UTC
Responsible Changed
From-To: freebsd-ports-bugs->rene

Take
Comment 3 Rene Ladan freebsd_committer freebsd_triage 2013-02-21 14:16:25 UTC
State Changed
From-To: open->closed

Committed, thanks
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-02-21 14:16:37 UTC
Author: rene
Date: Thu Feb 21 14:16:23 2013
New Revision: 312719
URL: http://svnweb.freebsd.org/changeset/ports/312719

Log:
  - Use PLIST macros instead of pkg-plist
  - Set LICENSE to GPLv2
  - Convert Makefile header
  - Convert to optionsNG
  - Remove indefinite article from COMMENT
  - Add build dependency on pamscale (graphics/netpbm)
  - Add DESKTOP_ENTRIES
  - Bump PORTREVISION
  - Pass maintainership to submitter
  
  PR:		ports/172887
  Submitted by:	nemysis@gmx.ch

Deleted:
  head/games/nuclearchess/pkg-plist
Modified:
  head/games/nuclearchess/Makefile   (contents, props changed)

Modified: head/games/nuclearchess/Makefile
==============================================================================
--- head/games/nuclearchess/Makefile	Thu Feb 21 14:11:02 2013	(r312718)
+++ head/games/nuclearchess/Makefile	Thu Feb 21 14:16:23 2013	(r312719)
@@ -1,25 +1,46 @@
-# New ports collection makefile for:	nuclearchess
-# Date Created:				2006-05-26
-# Whom:					Shaun Amott <shaun@inerd.com>
-#
+# Created by: Shaun Amott <shaun@inerd.com>
 # $FreeBSD$
-#
 
 PORTNAME=	nuclearchess
 PORTVERSION=	1.0.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	http://www.linux-games.com/nuclearchess/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A chess variant designed to be short and fun for all players
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Chess variant designed to be short and fun for all players
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2
+
+BUILD_DEPENDS=	pamscale:${PORTSDIR}/graphics/netpbm
 
 USE_SDL=	sdl image
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${DATADIR}
 MAKE_JOBS_SAFE=	yes
 
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.png
+
+PORTDATA=	*
+PORTDOCS=	AUTHORS ChangeLog
+
+DESKTOP_ENTRIES="NuclearChess" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
+.include <bsd.port.options.mk>
+
+post-build:
+	@(cd ${WRKSRC}/gfx && \
+		${LOCALBASE}/bin/pngtopnm atom.png | \
+		${LOCALBASE}/bin/pamscale .22 | ${LOCALBASE}/bin/pnmtopng > nuclearchess.png)
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/gfx/nuclearchess.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
_______________________________________________
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 5 dfilter service freebsd_committer freebsd_triage 2013-02-22 10:23:47 UTC
Author: rene
Date: Fri Feb 22 10:23:38 2013
New Revision: 312758
URL: http://svnweb.freebsd.org/changeset/ports/312758

Log:
  Commit the correct patch:
  - remove dependency on pamscale, use a pre-built desktop icon
    and desktopfileutils instead
  - improve DESKTOP_ENTRIES
  - move distribution files into their own subdirectory
  - use pkg-plist again instead of PLIST macros
  Bump PORTREVISION
  PR:		ports/172887
  Submitted by:	nemysis@gmx.de
  Pointyhat:	rene

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

Modified: head/games/nuclearchess/Makefile
==============================================================================
--- head/games/nuclearchess/Makefile	Fri Feb 22 09:17:37 2013	(r312757)
+++ head/games/nuclearchess/Makefile	Fri Feb 22 10:23:38 2013	(r312758)
@@ -3,44 +3,42 @@
 
 PORTNAME=	nuclearchess
 PORTVERSION=	1.0.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
-MASTER_SITES=	http://www.linux-games.com/nuclearchess/
+MASTER_SITES=	http://www.linux-games.com/nuclearchess/ \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Chess variant designed to be short and fun for all players
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	pamscale:${PORTSDIR}/graphics/netpbm
-
 USE_SDL=	sdl image
+USE_GNOME=	desktopfileutils
+INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${DATADIR}
 MAKE_JOBS_SAFE=	yes
 
-PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.png
-
-PORTDATA=	*
 PORTDOCS=	AUTHORS ChangeLog
 
-DESKTOP_ENTRIES="NuclearChess" "${COMMENT}" "${PORTNAME}" \
-		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+DESKTOP_ENTRIES="NuclearChess" "${COMMENT}"  \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" "Game;BoardGame;" false
 
 .include <bsd.port.options.mk>
 
-post-build:
-	@(cd ${WRKSRC}/gfx && \
-		${LOCALBASE}/bin/pngtopnm atom.png | \
-		${LOCALBASE}/bin/pamscale .22 | ${LOCALBASE}/bin/pnmtopng > nuclearchess.png)
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/gfx/nuclearchess.png ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
+	@-update-desktop-database
 
 .include <bsd.port.mk>

Modified: head/games/nuclearchess/distinfo
==============================================================================
--- head/games/nuclearchess/distinfo	Fri Feb 22 09:17:37 2013	(r312757)
+++ head/games/nuclearchess/distinfo	Fri Feb 22 10:23:38 2013	(r312758)
@@ -1,2 +1,4 @@
-SHA256 (nuclearchess-1.0.0.tar.gz) = 52e8b2cd297e0a38be276c0084b018c8ee54709356c7f4c642cd7205976aa21b
-SIZE (nuclearchess-1.0.0.tar.gz) = 1377205
+SHA256 (nuclearchess/nuclearchess-1.0.0.tar.gz) = 52e8b2cd297e0a38be276c0084b018c8ee54709356c7f4c642cd7205976aa21b
+SIZE (nuclearchess/nuclearchess-1.0.0.tar.gz) = 1377205
+SHA256 (nuclearchess/nuclearchess.png) = 0f79c2bc0fdf2abd313b78d43fab1fcdf400aeefca9d9dac556bbed37abad0d5
+SIZE (nuclearchess/nuclearchess.png) = 2613

Added: head/games/nuclearchess/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nuclearchess/pkg-plist	Fri Feb 22 10:23:38 2013	(r312758)
@@ -0,0 +1,40 @@
+bin/nuclearchess
+%%DATADIR%%/gfx/SmallStone.png
+%%DATADIR%%/gfx/StoneFont.png
+%%DATADIR%%/gfx/anim1.png
+%%DATADIR%%/gfx/anim10.png
+%%DATADIR%%/gfx/anim11.png
+%%DATADIR%%/gfx/anim12.png
+%%DATADIR%%/gfx/anim13.png
+%%DATADIR%%/gfx/anim14.png
+%%DATADIR%%/gfx/anim15.png
+%%DATADIR%%/gfx/anim2.png
+%%DATADIR%%/gfx/anim3.png
+%%DATADIR%%/gfx/anim4.png
+%%DATADIR%%/gfx/anim5.png
+%%DATADIR%%/gfx/anim6.png
+%%DATADIR%%/gfx/anim7.png
+%%DATADIR%%/gfx/anim8.png
+%%DATADIR%%/gfx/anim9.png
+%%DATADIR%%/gfx/atom-rot.png
+%%DATADIR%%/gfx/atom.png
+%%DATADIR%%/gfx/bauer.png
+%%DATADIR%%/gfx/black.png
+%%DATADIR%%/gfx/board.png
+%%DATADIR%%/gfx/bomb.png
+%%DATADIR%%/gfx/bombe.png
+%%DATADIR%%/gfx/button-light.png
+%%DATADIR%%/gfx/button.png
+%%DATADIR%%/gfx/dame.png
+%%DATADIR%%/gfx/koenig.png
+%%DATADIR%%/gfx/laeufer.png
+%%DATADIR%%/gfx/select.png
+%%DATADIR%%/gfx/springer.png
+%%DATADIR%%/gfx/turm.png
+%%DATADIR%%/gfx/white.png
+%%DATADIR%%/gfx/wood.png
+share/pixmaps/nuclearchess.png
+@dirrm %%DATADIR%%/gfx
+@dirrm %%DATADIR%%
+@exec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database -q || /usr/bin/true
_______________________________________________
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"