From nemysis@gmx.ch  Wed Nov 28 21:04:55 2012
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4FFCD4B9
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Nov 2012 21:04:55 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.22])
	by mx1.freebsd.org (Postfix) with SMTP id BA0BC8FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Nov 2012 21:04:54 +0000 (UTC)
Received: (qmail invoked by alias); 28 Nov 2012 21:04:52 -0000
Received: from 226-42.104-92.cust.bluewin.ch (EHLO something.email.com) [92.104.42.226]
  by mail.gmx.net (mp012) with SMTP; 28 Nov 2012 22:04:52 +0100
Received: by something.email.com (sSMTP sendmail emulation); Wed, 28 Nov 2012 22:04:51 +0100
Message-Id: <20121128210455.4FFCD4B9@hub.freebsd.org>
Date: Wed, 28 Nov 2012 22:04:51 +0100
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] games/palomino: Added Desktop entries, changed comment, pkg-plist, take maintainership
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         173979
>Category:       ports
>Synopsis:       [PATCH] games/palomino: Added Desktop entries, changed comment, pkg-plist, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 28 21:10:00 UTC 2012
>Closed-Date:    Fri Nov 30 20:42:41 UTC 2012
>Last-Modified:  Fri Nov 30 20:42:41 UTC 2012
>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:

- Take maintainership

Please close PR ports/173897

Makefile changed:
+DIST_SUBDIR=	${PORTNAME}
+COMMENT=	Action flight simulation computer program, use OSG
+DESKTOP_ENTRIES=

Changed and refined:
 .if ${PORT_OPTIONS:MJOYSTICK}
 post-install:
 pkg-plist

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:

--- palomino-20121026.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/palomino/Makefile ./Makefile
--- /usr/ports/games/palomino/Makefile	2012-11-28 21:31:09.000000000 +0100
+++ ./Makefile	2012-11-28 21:57:30.000000000 +0100
@@ -10,9 +10,10 @@
 		${PORTNAME}_data_models_${MODELS_VER}.tar.bz2 \
 		${PORTNAME}_data_sounds_${SOUNDS_VER}.tar.bz2 \
 		${PORTNAME}_data_terrain_${TERRAIN_VER}.tar.bz2
+DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Action flight simulator with its own 3D engine
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Action flight simulation computer program, use OSG
 
 LIB_DEPENDS=	osg:${PORTSDIR}/graphics/osg
 
@@ -39,6 +40,9 @@
 PLIB_DESC=	Enable sound support through plib
 GUI_DESC=	Enable FLTK GUI
 
+DESKTOP_ENTRIES="Palomino" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MJOYSTICK}
@@ -62,11 +66,11 @@
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR}; \
-	for file in ${DISTFILES}; do \
-		if ${ECHO_CMD} $$file | ${GREP} -q txz$$; then \
-			${XZ_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \
+	for distfile in ${DISTFILES}; do \
+		if ${ECHO_CMD} $$distfile | ${GREP} -q txz$$; then \
+			${XZ_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$distfile ${EXTRACT_AFTER_ARGS}; \
 		else \
-			${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \
+			${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$distfile ${EXTRACT_AFTER_ARGS}; \
 		fi; \
 	done
 
@@ -99,9 +103,11 @@
 
 post-install:
 	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/ && ${COPYTREE_SHARE} "data scripts" ${DATADIR}/
+	cd ${WRKSRC}/ && ${COPYTREE_SHARE} "data scripts" ${DATADIR}
 # docs are used from within the game, so this is unconditional
 	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} "*" ${DOCSDIR}/
+	cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} \* ${DOCSDIR}
+
+	${LN} -sf ${PREFIX}/share/doc/palomino/images/palominoLogo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/games/palomino/distinfo ./distinfo
--- /usr/ports/games/palomino/distinfo	2012-11-28 21:31:09.000000000 +0100
+++ ./distinfo	2012-11-24 14:35:47.000000000 +0100
@@ -1,10 +1,10 @@
-SHA256 (palomino_src_20121026.txz) = fee1f1d05c8cb8bb25484d01b03ffdce44b31fac54a68c27f82d017ddee29b76
-SIZE (palomino_src_20121026.txz) = 572424
-SHA256 (palomino_data_misc_20091027.tar.bz2) = f5b7183ae98a7842dcc626de388d396a50c98011745bc6afca7da402c13fdac8
-SIZE (palomino_data_misc_20091027.tar.bz2) = 632943
-SHA256 (palomino_data_models_20090615.tar.bz2) = 53acdb00a61cbfe5faca7c30276ae76a2d0c8a169eff292b54fc9701bfbe885a
-SIZE (palomino_data_models_20090615.tar.bz2) = 28634800
-SHA256 (palomino_data_sounds_20080704.tar.bz2) = 7d5819575c539195a0d9e7145c7a92bf03257ba34aac0257f6aa55676a576b2a
-SIZE (palomino_data_sounds_20080704.tar.bz2) = 488862
-SHA256 (palomino_data_terrain_20080206.tar.bz2) = c1ee7b8a1835d8e072a1ea1fa551e72af20d2d35a92dc56bfb9488a4acdfeb87
-SIZE (palomino_data_terrain_20080206.tar.bz2) = 42208903
+SHA256 (palomino/palomino_src_20121026.txz) = fee1f1d05c8cb8bb25484d01b03ffdce44b31fac54a68c27f82d017ddee29b76
+SIZE (palomino/palomino_src_20121026.txz) = 572424
+SHA256 (palomino/palomino_data_misc_20091027.tar.bz2) = f5b7183ae98a7842dcc626de388d396a50c98011745bc6afca7da402c13fdac8
+SIZE (palomino/palomino_data_misc_20091027.tar.bz2) = 632943
+SHA256 (palomino/palomino_data_models_20090615.tar.bz2) = 53acdb00a61cbfe5faca7c30276ae76a2d0c8a169eff292b54fc9701bfbe885a
+SIZE (palomino/palomino_data_models_20090615.tar.bz2) = 28634800
+SHA256 (palomino/palomino_data_sounds_20080704.tar.bz2) = 7d5819575c539195a0d9e7145c7a92bf03257ba34aac0257f6aa55676a576b2a
+SIZE (palomino/palomino_data_sounds_20080704.tar.bz2) = 488862
+SHA256 (palomino/palomino_data_terrain_20080206.tar.bz2) = c1ee7b8a1835d8e072a1ea1fa551e72af20d2d35a92dc56bfb9488a4acdfeb87
+SIZE (palomino/palomino_data_terrain_20080206.tar.bz2) = 42208903
diff -ruN --exclude=CVS /usr/ports/games/palomino/pkg-descr ./pkg-descr
--- /usr/ports/games/palomino/pkg-descr	2012-11-16 09:01:33.000000000 +0100
+++ ./pkg-descr	2012-11-24 19:57:12.000000000 +0100
@@ -1,4 +1,4 @@
-Palomino is an open-source action flight simulator with its own
-3D engine.
+Palomino is a flight simulation computer program. Version 3 renders using
+OpenSceneGraph. OSG provides the ability to render satellite imagery.
 
 WWW: http://www.palomino3d.org/
diff -ruN --exclude=CVS /usr/ports/games/palomino/pkg-plist ./pkg-plist
--- /usr/ports/games/palomino/pkg-plist	2012-11-16 09:01:33.000000000 +0100
+++ ./pkg-plist	2012-11-24 20:48:50.000000000 +0100
@@ -1,4 +1,5 @@
 bin/palomino
+share/pixmaps/palomino.png
 %%DOCSDIR%%/coding.html
 %%DOCSDIR%%/compression.html
 %%DOCSDIR%%/crash.html
--- palomino-20121026.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rm 
Responsible-Changed-By: rm 
Responsible-Changed-When: Fri Nov 30 08:17:50 UTC 2012 
Responsible-Changed-Why:  
I will take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173979 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Fri Nov 30 20:42:41 UTC 2012 
State-Changed-Why:  
Partially committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173979 
>Unformatted:
