Bug 179335 - [UPDATE] games/palomino to v20130527
Summary: [UPDATE] games/palomino to v20130527
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: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-05 17:20 UTC by hardy.schumacher
Modified: 2013-06-18 14:10 UTC (History)
0 users

See Also:


Attachments
file.diff (1.25 KB, patch)
2013-06-05 17:20 UTC, hardy.schumacher
no flags Details | Diff
palomino.diff (5.72 KB, patch)
2013-06-06 09:44 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description hardy.schumacher 2013-06-05 17:20:00 UTC
Update for port games/palomino is available.

Fix: Patch attached with submission follows:
How-To-Repeat: n/a
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-05 17:20:07 UTC
Maintainer of games/palomino,

Please note that PR ports/179335 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/179335

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

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 nemysis 2013-06-06 09:44:34 UTC
- Update to 20130527
- Add license
- Remove JOYSTICK Option
- Trim docs
- Trim desktop entry
- Cleanup Makefile
- Trim typo
- Trim pkg-plist, remove docs

Build log

https://redports.org/buildarchive/20130606081101-64378/


/usr/ports/MOVED

devel/linux-js||2013-06-04|Has expired: Broken for more than 6 month
Comment 4 William Grzybowski freebsd_committer freebsd_triage 2013-06-17 19:08:34 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-06-18 14:03:24 UTC
Author: wg
Date: Tue Jun 18 13:03:10 2013
New Revision: 321185
URL: http://svnweb.freebsd.org/changeset/ports/321185

Log:
  games/palomino: update to 20130527
  
  - Update to 20130527 [1]
  - Add LICENSE (GPLv2) [2]
  - Remove JOYSTICK option, dependency broken [2]
  - Use PORTDOCS instead of pkg-plist [2]
  
  PR:		ports/179335
  Submitted by:	Hardy Schumacher <hardy.schumacher@gmx.de> [1], maintainer [2]
  Approved by:	culot / jpaetzel (mentors, implicit), maintainer

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

Modified: head/games/palomino/Makefile
==============================================================================
--- head/games/palomino/Makefile	Tue Jun 18 12:41:02 2013	(r321184)
+++ head/games/palomino/Makefile	Tue Jun 18 13:03:10 2013	(r321185)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	palomino
-PORTVERSION=	20121026
-PORTREVISION=	2
+PORTVERSION=	20130527
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.palomino3d.org/sim/
 DISTFILES=	${PORTNAME}_src_${PORTVERSION}.txz \
@@ -15,6 +14,8 @@ DISTFILES=	${PORTNAME}_src_${PORTVERSION
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Action flight simulation computer program using OSG
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	osg:${PORTSDIR}/graphics/osg
 
 USE_BZIP2=	yes
@@ -32,24 +33,20 @@ TERRAIN_VER=	20080206
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS_DEFINE=	JOYSTICK SDL PLIB GUI
+OPTIONS_DEFINE=	SDL PLIB GUI
 OPTIONS_DEFAULT=	SDL GUI
 
-JOYSTICK_DESC=	Enable joystick support through linux-js
 SDL_DESC=	SDL support for input and sound
 PLIB_DESC=	Enable sound support through plib
 GUI_DESC=	Enable FLTK GUI
 
+PORTDOCS=	*
+
 DESKTOP_ENTRIES=	"Palomino" "${COMMENT}" "${PORTNAME}" \
-			"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+			"${PORTNAME}" "Game;ArcadeGame;" false
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MJOYSTICK}
-BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
-RUN_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
-.endif
-
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl mixer
 .endif
@@ -71,30 +68,34 @@ post-patch:
 	@${REINPLACE_CMD} -e '/FIND_PACKAGE(/ s|)| REQUIRED)|' \
 		${WRKSRC}/CMakeModules/libraries.cmake
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_OSSIM/ d' ${WRKSRC}/CMakeLists.txt
-.if empty(PORT_OPTIONS:MJOYSTICK)
+
+# Please look MOVED 2013-06-04
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_LINUX_JOYSTICK/ d' ${WRKSRC}/CMakeLists.txt
-.endif
-.if empty(PORT_OPTIONS:MSDL)
+
+.if ! ${PORT_OPTIONS:MSDL}
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_SDL/ d' ${WRKSRC}/CMakeLists.txt
 .endif
-.if empty(PORT_OPTIONS:MPLIB)
+
+.if ! ${PORT_OPTIONS:MPLIB}
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_PLIB/ d' ${WRKSRC}/CMakeLists.txt
 .endif
-.if empty(PORT_OPTIONS:MGUI)
+
+.if ! ${PORT_OPTIONS:MGUI}
 	@${REINPLACE_CMD} -e '/COMPILE_WITH_FLTK/ d' ${WRKSRC}/CMakeLists.txt
 .endif
+
 	@${REINPLACE_CMD} -e 's|string sDataDir|&="${DATADIR}/data/"|'\
-	       	${WRKSRC}/src/base/conf.cc
+		${WRKSRC}/src/base/conf.cc
 	@${REINPLACE_CMD} -e '/LUABIND_SCRIPTS_DIR/ s|"scripts"|"${DATADIR}/scripts"|' \
-	       	${WRKSRC}/src/lua_bind/defs.hh
+		${WRKSRC}/src/lua_bind/defs.hh
 	@${REINPLACE_CMD} -e 's|doc/html/|${DOCSDIR}/|' ${WRKSRC}/src/gui/gui.cc
 
 post-install:
-	${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/ && ${COPYTREE_SHARE} "data scripts" ${DATADIR}/
+	@${MKDIR} ${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}/
+	@${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${DOCSDIR})
 
 	${LN} -sf ${DOCSDIR}/images/palominoLogo.png \
 		${PREFIX}/share/pixmaps/${PORTNAME}.png

Modified: head/games/palomino/distinfo
==============================================================================
--- head/games/palomino/distinfo	Tue Jun 18 12:41:02 2013	(r321184)
+++ head/games/palomino/distinfo	Tue Jun 18 13:03:10 2013	(r321185)
@@ -1,5 +1,5 @@
-SHA256 (palomino_src_20121026.txz) = fee1f1d05c8cb8bb25484d01b03ffdce44b31fac54a68c27f82d017ddee29b76
-SIZE (palomino_src_20121026.txz) = 572424
+SHA256 (palomino_src_20130527.txz) = ae5be1a8e146030289ec75b2c44f0dde11641809ef57a572038cb746c64bceca
+SIZE (palomino_src_20130527.txz) = 572468
 SHA256 (palomino_data_misc_20091027.tar.bz2) = f5b7183ae98a7842dcc626de388d396a50c98011745bc6afca7da402c13fdac8
 SIZE (palomino_data_misc_20091027.tar.bz2) = 632943
 SHA256 (palomino_data_models_20090615.tar.bz2) = 53acdb00a61cbfe5faca7c30276ae76a2d0c8a169eff292b54fc9701bfbe885a

Modified: head/games/palomino/pkg-plist
==============================================================================
--- head/games/palomino/pkg-plist	Tue Jun 18 12:41:02 2013	(r321184)
+++ head/games/palomino/pkg-plist	Tue Jun 18 13:03:10 2013	(r321185)
@@ -1,52 +1,5 @@
 bin/palomino
 share/pixmaps/palomino.png
-%%DOCSDIR%%/coding.html
-%%DOCSDIR%%/compression.html
-%%DOCSDIR%%/crash.html
-%%DOCSDIR%%/docs.css
-%%DOCSDIR%%/images/arrowBlue.gif
-%%DOCSDIR%%/images/arrowGreen.gif
-%%DOCSDIR%%/images/arrowRed.gif
-%%DOCSDIR%%/images/arrowWhite.gif
-%%DOCSDIR%%/images/arrowYellow.gif
-%%DOCSDIR%%/images/favicon.png
-%%DOCSDIR%%/images/palominoLogo.png
-%%DOCSDIR%%/images/palomino_pegasus_50x40.png
-%%DOCSDIR%%/images/sprite1.png
-%%DOCSDIR%%/images/sprite2.png
-%%DOCSDIR%%/images/sprite3.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/issues.html
-%%DOCSDIR%%/lua_scripts.html
-%%DOCSDIR%%/manual.css
-%%DOCSDIR%%/manual.html
-%%DOCSDIR%%/math.html
-%%DOCSDIR%%/module_base.html
-%%DOCSDIR%%/module_base_configuration.html
-%%DOCSDIR%%/module_collision.html
-%%DOCSDIR%%/module_control.html
-%%DOCSDIR%%/module_fx.html
-%%DOCSDIR%%/module_game.html
-%%DOCSDIR%%/module_gfx.html
-%%DOCSDIR%%/module_graph.html
-%%DOCSDIR%%/module_gui.html
-%%DOCSDIR%%/module_hud.html
-%%DOCSDIR%%/module_init.html
-%%DOCSDIR%%/module_input.html
-%%DOCSDIR%%/module_lua.html
-%%DOCSDIR%%/module_math.html
-%%DOCSDIR%%/module_object.html
-%%DOCSDIR%%/module_physics.html
-%%DOCSDIR%%/module_program.html
-%%DOCSDIR%%/module_shader.html
-%%DOCSDIR%%/module_shadows.html
-%%DOCSDIR%%/module_sky.html
-%%DOCSDIR%%/module_sound.html
-%%DOCSDIR%%/module_view.html
-%%DOCSDIR%%/module_world.html
-%%DOCSDIR%%/rules.html
-%%DOCSDIR%%/scene.html
-%%DOCSDIR%%/terrain.html
 %%DATADIR%%/data/fonts/README.txt
 %%DATADIR%%/data/fonts/arial.ttf
 %%DATADIR%%/data/fonts/masque.ttf
@@ -516,5 +469,3 @@ share/pixmaps/palomino.png
 @dirrm %%DATADIR%%/data/fonts
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/images
-@dirrm %%DOCSDIR%%
_______________________________________________
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 William Grzybowski freebsd_committer freebsd_triage 2013-06-18 14:03:47 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!