From owner-svn-ports-all@FreeBSD.ORG Mon Mar 24 00:05:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9FAB9265; Mon, 24 Mar 2014 00:05:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8B9196E2; Mon, 24 Mar 2014 00:05:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2O05B7J072884; Mon, 24 Mar 2014 00:05:11 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2O059kL072873; Mon, 24 Mar 2014 00:05:09 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201403240005.s2O059kL072873@svn.freebsd.org> From: Rusmir Dusko Date: Mon, 24 Mar 2014 00:05:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348910 - in head/games/domination: . files 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.17 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: Mon, 24 Mar 2014 00:05:11 -0000 Author: nemysis Date: Mon Mar 24 00:05:09 2014 New Revision: 348910 URL: http://svnweb.freebsd.org/changeset/ports/348910 QAT: https://qat.redports.org/buildarchive/r348910/ Log: - Bump PORTREVISION for pkg-plist change - Change Makefile header, use my name and @FreeBSD.org email - Fix typo - Add USES dos2unix - Break lines around 80 characters - Remove todo.txt from DOCS - Add pkg-deinstall - Remove *.cmd, only for OS X - Unmute install *.sh - Change files/domination-*.in, remove -Djava.ext.dirs="%%DATADIR%%" - Change WWW Added: head/games/domination/files/pkg-deinstall.in (contents, props changed) Modified: head/games/domination/Makefile head/games/domination/files/domination-FlashGUI.in head/games/domination/files/domination-Increment1GUI.in head/games/domination/files/domination-SimpleGUI.in head/games/domination/files/domination-SwingGUI.in head/games/domination/pkg-descr head/games/domination/pkg-plist Modified: head/games/domination/Makefile ============================================================================== --- head/games/domination/Makefile Mon Mar 24 00:04:32 2014 (r348909) +++ head/games/domination/Makefile Mon Mar 24 00:05:09 2014 (r348910) @@ -1,10 +1,11 @@ -# Created by: nemysis +# Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= domination PORTVERSION= 1.1.1.5 +PORTREVISION= 1 CATEGORIES= games java -MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/d/D/}/${PORTVERSION}/:game \ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME:S/d/D/}/${PORTVERSION}/:game \ http://domination.sourceforge.net/maps/ DISTFILES= ${PORTNAME:S/d/D/}_${DISTVERSION}${EXTRACT_SUFX}:game \ ${MAPS:S/$/.zip/} @@ -16,7 +17,8 @@ COMMENT= Board game that is a bit like t LICENSE= GPLv3 -USES= zip:infozip +USES= dos2unix zip:infozip +DOS2UNIX_GLOB= *.txt *.ini *.htm *.cards *.map USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes @@ -27,28 +29,27 @@ WRKSRC= ${WRKDIR}/${PORTNAME:S/d/D/} MAPS= solar bigeurope google europass europe artic sudamerica \ MiddleEast-Qatar kosova Falkland-Islands england sw_baltic \ spain swiss france austria austria-hungary eire haiti brasil \ - benelux canada germany northeurope germany1871 Deutsches_Reich_1871 \ - eesti estonia mexico serbia fletzmap greece North_of_Italy \ - bayern berlin navarra Illes_Balears calw wuppertal kerzell \ - ennepe-ruhr-kreis cologne saarland andorra catalunya astadt \ - dortmund rio_de_janeiro caribbean Nuremberg_Public_Transit \ - discworld aztec GTA_SAN_AN middleearth LOTR2 wow randland \ - Riskopoly SuperRiskopoly trivia chutes sudoku conquest \ - chrono_trigger startrek usa8 civilwar usa hawaii ohio nyc \ - zertina fortress estlandr periodictable sylsia troisdorf \ - wolken castle naerr cow westfalenhalle union rub gymnasium \ - simpsons_world simpsons germany2 - -PORTDOCS= ChangeLog.txt ReadMe.txt commands.txt todo.txt + benelux canada germany northeurope germany1871 \ + Deutsches_Reich_1871 eesti estonia mexico serbia fletzmap \ + greece North_of_Italy bayern berlin navarra Illes_Balears \ + calw wuppertal kerzell ennepe-ruhr-kreis cologne saarland \ + andorra catalunya astadt dortmund rio_de_janeiro caribbean \ + Nuremberg_Public_Transit discworld aztec GTA_SAN_AN \ + middleearth LOTR2 wow randland Riskopoly SuperRiskopoly \ + trivia chutes sudoku conquest chrono_trigger startrek usa8 \ + civilwar usa hawaii ohio nyc zertina fortress estlandr \ + periodictable sylsia troisdorf wolken castle naerr cow \ + westfalenhalle union rub gymnasium simpsons_world simpsons \ + germany2 +PORTDOCS= ChangeLog.txt ReadMe.txt commands.txt OPTIONS_DEFINE= DOCS DATADIR= ${JAVASHAREDIR}/${PORTNAME} -SUB_FILES= ${PORTNAME}-FlashGUI \ - ${PORTNAME}-Increment1GUI \ - ${PORTNAME}-SimpleGUI \ - ${PORTNAME}-SwingGUI +SUB_FILES= ${PORTNAME}-FlashGUI ${PORTNAME}-Increment1GUI \ + ${PORTNAME}-SimpleGUI ${PORTNAME}-SwingGUI \ + pkg-deinstall DESKTOP_ENTRIES="Domination" "" "${PORTNAME}" \ "${PORTNAME}-SwingGUI" "Game;StrategyGame;" "" @@ -62,10 +63,10 @@ post-extract-script: do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ - "help lib maps resources saves *.jar *.cmd *.htm *.txt *.ini" \ + "help lib maps resources saves *.jar *.htm *.txt *.ini" \ ${STAGEDIR}${DATADIR}) ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-* ${STAGEDIR}${PREFIX}/bin/ - @(cd ${WRKSRC} && ${INSTALL_SCRIPT} *.sh ${STAGEDIR}${DATADIR}) + (cd ${WRKSRC} && ${INSTALL_SCRIPT} *.sh ${STAGEDIR}${DATADIR}) @(cd ${STAGEDIR}${DATADIR} && ${CHMOD} 774 saves) ${LN} -sf ${DATADIR}/resources/icon.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png Modified: head/games/domination/files/domination-FlashGUI.in ============================================================================== --- head/games/domination/files/domination-FlashGUI.in Mon Mar 24 00:04:32 2014 (r348909) +++ head/games/domination/files/domination-FlashGUI.in Mon Mar 24 00:05:09 2014 (r348910) @@ -5,5 +5,5 @@ export JAVA_VERSION="%%JAVA_VERSION%%" -cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" \ --Djava.ext.dirs="%%DATADIR%%" -cp Domination.jar net.yura.domination.ui.flashgui.MainMenu "${@}" +cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ +-cp Domination.jar net.yura.domination.ui.flashgui.MainMenu "${@}" Modified: head/games/domination/files/domination-Increment1GUI.in ============================================================================== --- head/games/domination/files/domination-Increment1GUI.in Mon Mar 24 00:04:32 2014 (r348909) +++ head/games/domination/files/domination-Increment1GUI.in Mon Mar 24 00:05:09 2014 (r348910) @@ -5,5 +5,5 @@ export JAVA_VERSION="%%JAVA_VERSION%%" -cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" \ --Djava.ext.dirs="%%DATADIR%%" -cp Domination.jar net.yura.domination.ui.increment1gui.Increment1Frame "${@}" +cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ +-cp Domination.jar net.yura.domination.ui.increment1gui.Increment1Frame "${@}" Modified: head/games/domination/files/domination-SimpleGUI.in ============================================================================== --- head/games/domination/files/domination-SimpleGUI.in Mon Mar 24 00:04:32 2014 (r348909) +++ head/games/domination/files/domination-SimpleGUI.in Mon Mar 24 00:05:09 2014 (r348910) @@ -5,5 +5,5 @@ export JAVA_VERSION="%%JAVA_VERSION%%" -cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" \ --Djava.ext.dirs="%%DATADIR%%" -cp Domination.jar net.yura.domination.ui.simplegui.RiskGUI "${@}" +cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ +-cp Domination.jar net.yura.domination.ui.simplegui.RiskGUI "${@}" Modified: head/games/domination/files/domination-SwingGUI.in ============================================================================== --- head/games/domination/files/domination-SwingGUI.in Mon Mar 24 00:04:32 2014 (r348909) +++ head/games/domination/files/domination-SwingGUI.in Mon Mar 24 00:05:09 2014 (r348910) @@ -5,5 +5,5 @@ export JAVA_VERSION="%%JAVA_VERSION%%" -cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -Djava.ext.dirs="%%DATADIR%%" \ --Djava.ext.dirs="%%DATADIR%%" -cp Domination.jar net.yura.domination.ui.swinggui.SwingGUIFrame "${@}" +cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ +-cp Domination.jar net.yura.domination.ui.swinggui.SwingGUIFrame "${@}" Added: head/games/domination/files/pkg-deinstall.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/domination/files/pkg-deinstall.in Mon Mar 24 00:05:09 2014 (r348910) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +if [ "$2" = "POST-DEINSTALL" ]; then + echo "" + echo "" + echo "===============================================================================" + echo "" + echo "After deinstallation, some files may stay in %%DATADIR%%," + echo "you can delete them with" + echo "" + echo " /bin/rm -fr %%DATADIR%%" + echo "" + echo "===============================================================================" + echo "" +fi Modified: head/games/domination/pkg-descr ============================================================================== --- head/games/domination/pkg-descr Mon Mar 24 00:04:32 2014 (r348909) +++ head/games/domination/pkg-descr Mon Mar 24 00:05:09 2014 (r348910) @@ -7,4 +7,4 @@ Written in java it includes a map editor network play, single player, hotseat, 5 user interfaces and many more features, it works in all OSs that run java. -WWW: http://yura.net/projects/domination/ +WWW: http://domination.sourceforge.net/ Modified: head/games/domination/pkg-plist ============================================================================== --- head/games/domination/pkg-plist Mon Mar 24 00:04:32 2014 (r348909) +++ head/games/domination/pkg-plist Mon Mar 24 00:05:09 2014 (r348910) @@ -3,18 +3,13 @@ bin/domination-Increment1GUI bin/domination-SimpleGUI bin/domination-SwingGUI %%DATADIR%%/ChangeLog.txt -%%DATADIR%%/CommandLine.cmd %%DATADIR%%/CommandLine.sh %%DATADIR%%/Domination.jar -%%DATADIR%%/FlashGUI.cmd %%DATADIR%%/FlashGUI.htm %%DATADIR%%/FlashGUI.sh -%%DATADIR%%/Increment1GUI.cmd %%DATADIR%%/Increment1GUI.sh %%DATADIR%%/ReadMe.txt -%%DATADIR%%/SimpleGUI.cmd %%DATADIR%%/SimpleGUI.sh -%%DATADIR%%/SwingGUI.cmd %%DATADIR%%/SwingGUI.htm %%DATADIR%%/SwingGUI.sh %%DATADIR%%/commands.txt @@ -497,14 +492,13 @@ bin/domination-SwingGUI %%DATADIR%%/maps/zertina_pic.jpg %%DATADIR%%/resources/icon.ico %%DATADIR%%/resources/icon.png -%%DATADIR%%/run.cmd %%DATADIR%%/run.sh %%DATADIR%%/todo.txt share/pixmaps/domination.png -@dirrm %%DATADIR%%/saves +@dirrmtry %%DATADIR%%/saves @dirrm %%DATADIR%%/resources @dirrm %%DATADIR%%/maps/preview @dirrm %%DATADIR%%/maps @dirrm %%DATADIR%%/lib @dirrm %%DATADIR%%/help -@dirrm %%DATADIR%% +@dirrmtry %%DATADIR%%