From owner-svn-ports-all@FreeBSD.ORG Tue Jun 18 13:03:11 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BA01BFBE; Tue, 18 Jun 2013 13:03:11 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AB5F418C1; Tue, 18 Jun 2013 13:03:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ID3BRf056087; Tue, 18 Jun 2013 13:03:11 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ID3Blx056083; Tue, 18 Jun 2013 13:03:11 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201306181303.r5ID3Blx056083@svn.freebsd.org> From: William Grzybowski Date: Tue, 18 Jun 2013 13:03:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321185 - head/games/palomino X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jun 2013 13:03:11 -0000 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 [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 -.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%%