Bug 175976 - [patch] Install desktop icon for games/boswars
Summary: [patch] Install desktop icon for games/boswars
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: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-02-09 04:20 UTC by Kevin Zheng
Modified: 2013-03-02 14:30 UTC (History)
0 users

See Also:


Attachments
file.diff (3.32 KB, patch)
2013-02-09 04:20 UTC, Kevin Zheng
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kevin Zheng 2013-02-09 04:20:00 UTC
Install a desktop icon for games/boswars. This desktop icon will work, but unfortunately doesn't have an icon image associated with it. While here,

- Trim Makefile header
- Take out indefinite article from COMMENT
- Sort LIB_DEPENDS
- Cosmetic changes to pkg-descr
- Bump PORTREVISION

Portlint is unhappy with NOPORTDOCS, but I didn't figure out how to fix it. Committer should fix that.

Fix: Apply the attached patch.

Patch attached with submission follows:
How-To-Repeat: Not applicable.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-02-09 04:20:07 UTC
Maintainer of games/boswars,

Please note that PR ports/175976 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/175976

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-02-09 04:20:08 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 martin 2013-02-09 21:17:53 UTC
On Sat, Feb 09, 2013 at 04:20:07AM +0000, Edwin Groothuis wrote:
> Maintainer of games/boswars,
> 
> Please note that PR ports/175976 has just been submitted.
> 
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.
> 
> The full text of the PR can be found at:
>     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/175976
> 
> -- 
> Edwin Groothuis via the GNATS Auto Assign Tool
> edwin@FreeBSD.org

Thank you Kevin. I don't use a desktop environment, so I never noticed the
broken icon :-/

As for the portlint error, I don't see any (?)

[/home/martin/boswars]# portlint -A
WARN: Makefile: [30]: possible direct use of command "false" found. use ${FALSE} instead.
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 4 warnings found.

[/home/martin/boswars]# portlint -V
portlint version 2.13.13


In any case, this patch looks OK.


-- 
Martin Tournoij <martin@arp242.net>
http://arp242.net | http://daemonforums.org

QOTD:
HELP!  MY TYPEWRITER IS BROKEN!
		-- E. E. CUMMINGS
Comment 4 Kevin Zheng 2013-02-21 04:13:37 UTC
Greetings,

The status of this PR seems to be stuck at 'feedback', although I've
already received a response from the maintainer more than a week ago. In
the past this has worked out differently, so I'm just curious if this
wait is normal.

Apologies in advance for any rudeness implied. My appreciation goes out
to the committers who make things happen :)

Thanks,
Kevin Zheng
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-03-02 14:26:34 UTC
Author: pawel
Date: Sat Mar  2 14:26:20 2013
New Revision: 313231
URL: http://svnweb.freebsd.org/changeset/ports/313231

Log:
  - Add desktop entry file
  - Remove ABI versions from LIB_DEPENDS
  - Update pkg-descr
  - Convert to OptionsNG
  
  PR:		ports/175976
  Submitted by:	Kevin Zheng <kevinz5000@gmail.com>
  Approved by:	Martin Tournoij <martin@arp242.net> (maintainer)

Modified:
  head/games/boswars/Makefile   (contents, props changed)
  head/games/boswars/pkg-descr   (contents, props changed)

Modified: head/games/boswars/Makefile
==============================================================================
--- head/games/boswars/Makefile	Sat Mar  2 13:48:31 2013	(r313230)
+++ head/games/boswars/Makefile	Sat Mar  2 14:26:20 2013	(r313231)
@@ -1,25 +1,21 @@
-# New ports collection makefile for:	bos
-# Date created:				14 Oct 2005
-# Whom:					Alejandro Pulver <alejandro@varnet.biz>
-#
+# Created by: Alejandro Pulver <alejandro@varnet.biz>
 # $FreeBSD$
-#
 
 PORTNAME=	boswars
 PORTVERSION=	2.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.boswars.org/dist/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	martin@arp242.net
-COMMENT=	A real-time strategy game
+COMMENT=	Futuristic real-time strategy game
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		theora.0:${PORTSDIR}/multimedia/libtheora \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+		theora:${PORTSDIR}/multimedia/libtheora \
+		vorbis:${PORTSDIR}/audio/libvorbis
 
 USE_LUA=	5.1
 USE_SDL=	sdl
@@ -30,6 +26,11 @@ CPPPATH=	${LOCALBASE}/include ${LUA_INCD
 LIBPATH=	${LOCALBASE}/lib ${LUA_LIBDIR}
 CFLAGS+=	-DSTRATAGUS_LIB_PATH='"\"${DATADIR}\""'
 
+DESKTOP_ENTRIES=	"Bos Wars" "${COMMENT}" "" \
+			"boswars" "Game;StrategyGame;" false
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e '\
 		s|-pthread|${PTHREAD_LIBS}|g; \
@@ -44,7 +45,7 @@ do-install:
 	${CP} -R ${WRKSRC}/${f} ${DATADIR}
 .endfor
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.txt ${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}

Modified: head/games/boswars/pkg-descr
==============================================================================
--- head/games/boswars/pkg-descr	Sat Mar  2 13:48:31 2013	(r313230)
+++ head/games/boswars/pkg-descr	Sat Mar  2 14:26:20 2013	(r313231)
@@ -1,22 +1,17 @@
-Bos Wars is a real-time strategy game that uses a modified version of the
-Stratagus game engine.
-
 Bos Wars is a futuristic real time strategy game (RTS). In a RTS game, the
 player has to combat his enemies while developing his war economy. Everything
-runs in real-time, as opposed to turn-based games where the player always has
-to wait for his turn. The trick is to balance the effort put into building his
-economy and building an army to defend and attack the enemies. 
-
-Bos Wars has a dynamic rate based economy. Energy is produced by power plants
-and magma gets pumped from hot spots. Buildings and mobile units are also
-built at a continuous rate. Control of larger parts of the map creates the
-potential to increase your economy throughput. Holding key points like roads
-and passages allow for different strategies. 
+runs in real-time, as opposed to turn-based games where the player always
+has to wait for his turn. The trick is to balance the effort put into
+building his economy and building an army to defend and attack the enemies.
 
-It is possible to play against human opponents over LAN, internet, or against
-the computer. Bos Wars successfully runs under Linux, MS Windows, BSD, and Mac
-OS X. 
+Bos Wars has a dynamic rate based economy. Energy is produced by power
+plants and magma gets pumped from hot spots. Buildings and mobile units
+are also built at a continuous rate. Control of larger parts of the map
+creates the potential to increase your economy throughput. Holding key
+points like roads and passages allow for different strategies.
 
-Bos Wars aims to create a completely original and fun open source RTS game.
+It is possible to play against human opponents over LAN, internet, or
+against the computer. Bos Wars successfully runs under Linux, MS Windows,
+BSD, and Mac OS X.
 
 WWW: http://www.boswars.org/
_______________________________________________
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 6 Pawel Pekala freebsd_committer freebsd_triage 2013-03-02 14:29:26 UTC
State Changed
From-To: feedback->closed

Committed. Thanks! PR status change is manual, someone have to do this 
and sometimes things slip through :)