From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 4 18:50:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CA00C1065670 for ; Thu, 4 Oct 2012 18:50:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A1A598FC16 for ; Thu, 4 Oct 2012 18:50:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q94IoAs0002867 for ; Thu, 4 Oct 2012 18:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q94IoAiv002866; Thu, 4 Oct 2012 18:50:10 GMT (envelope-from gnats) Resent-Date: Thu, 4 Oct 2012 18:50:10 GMT Resent-Message-Id: <201210041850.q94IoAiv002866@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, nemysis Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 738E61065670 for ; Thu, 4 Oct 2012 18:46:09 +0000 (UTC) (envelope-from nemysis@gmx.ch) Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23]) by mx1.freebsd.org (Postfix) with SMTP id E183B8FC16 for ; Thu, 4 Oct 2012 18:46:08 +0000 (UTC) Received: (qmail invoked by alias); 04 Oct 2012 18:46:06 -0000 Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201] by mail.gmx.net (mp001) with SMTP; 04 Oct 2012 20:46:06 +0200 Received: by something.email.com (sSMTP sendmail emulation); Thu, 04 Oct 2012 20:46:05 +0200 Message-Id: <20121004184609.738E61065670@hub.freebsd.org> Date: Thu, 04 Oct 2012 20:46:05 +0200 From: nemysis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: gamato@users.sf.net Subject: ports/172331: [PATCH] games/castlevox: Makefile changed, OptionsNG, DESKTOP_ENTRIES... X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Oct 2012 18:50:10 -0000 >Number: 172331 >Category: ports >Synopsis: [PATCH] games/castlevox: Makefile changed, OptionsNG, DESKTOP_ENTRIES... >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 04 18:50:10 UTC 2012 >Closed-Date: >Last-Modified: >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: Makefile changed +DISTNAME= ${PORTNAME}-linux +DIST_SUBDIR= java +COMMENT= Fast world domination game +WRKSRC= ${WRKDIR}/${PORTNAME}PC +PLIST_FILES= bin/${PORTNAME} \ + share/pixmaps/${PORTNAME}.png +PORTDATA= * +PORTDOCS= README_Vox.txt docs/ +SUB_FILES= ${PORTNAME} +DESKTOP_ENTRIES="Castle Vox" "${COMMENT}" "${PORTNAME}" \ + "${PORTNAME}" "Game;StrategyGame;" ${FALSE} - OptionsNG +.include - Rework do-install: do-install: - Rework CastleVox.in files/CastleVox.in Removed file(s): - pkg-plist Port maintainer (gamato@users.sf.net) is cc'd. 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 WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy. WARN: Makefile: only one MASTER_SITE configured. Consider adding additional mirrors. 0 fatal errors and 2 warnings found. port test: clean >Fix: --- CastleVox-1.2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/games/castlevox/Makefile ./Makefile --- /usr/ports/games/castlevox/Makefile 2012-10-04 18:57:49.000000000 +0200 +++ ./Makefile 2012-10-04 20:25:44.000000000 +0200 @@ -1,4 +1,4 @@ -# Created by: Martin Otto +# Created by Martin Otto # # $FreeBSD: ports/games/castlevox/Makefile,v 1.1 2012/10/04 16:57:49 jgh Exp $ @@ -6,27 +6,45 @@ PORTVERSION= 1.2 CATEGORIES= games java MASTER_SITES= http://sillysoft.net/download/ -DISTNAME= CastleVox-linux +DISTNAME= ${PORTNAME}-linux +DIST_SUBDIR= java MAINTAINER= gamato@users.sf.net -COMMENT= A fast world domination game +COMMENT= Fast world domination game FETCH_ARGS= -Fpr USE_JAVA= yes JAVA_VERSION= 1.6+ +NO_BUILD= yes + +WRKSRC= ${WRKDIR}/${PORTNAME}PC + +PLIST_FILES= bin/${PORTNAME} \ + share/pixmaps/${PORTNAME}.png -WRKSRC= ${WRKDIR}/CastleVoxPC +PORTDATA= * +PORTDOCS= README_Vox.txt docs/ DATADIR= ${JAVASHAREDIR}/${PORTNAME} -NO_BUILD= yes -SUB_FILES= CastleVox +SUB_FILES= ${PORTNAME} + +DESKTOP_ENTRIES="Castle Vox" "${COMMENT}" "${PORTNAME}" \ + "${PORTNAME}" "Game;StrategyGame;" ${FALSE} + +.include do-install: - @${MKDIR} ${DATADIR} - (cd ${WRKSRC}/ && ${COPYTREE_SHARE} \*.jar ${DATADIR}) - ${INSTALL_DATA} ${WRKSRC}/VoxIcon.png ${DATADIR} - (cd ${WRKSRC}/ && ${COPYTREE_SHARE} Support ${DATADIR}) - (cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs ${DATADIR}) - ${INSTALL_SCRIPT} ${WRKDIR}/CastleVox ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin + + ${MKDIR} ${DATADIR} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} "Support *.jar" ${DATADIR}) + + ${INSTALL_DATA} ${WRKSRC}/VoxIcon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png + +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README_Vox.txt ${DOCSDIR} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR}) +.endif .include diff -ruN --exclude=CVS /usr/ports/games/castlevox/distinfo ./distinfo --- /usr/ports/games/castlevox/distinfo 2012-10-04 18:57:49.000000000 +0200 +++ ./distinfo 2012-08-30 00:07:25.000000000 +0200 @@ -1,2 +1,2 @@ -SHA256 (CastleVox-linux.tar.gz) = 9fb7fffc3b8e15ca947f056f494cffc612d092e53a073538f382ca7b84132880 -SIZE (CastleVox-linux.tar.gz) = 27979326 +SHA256 (java/CastleVox-linux.tar.gz) = 9fb7fffc3b8e15ca947f056f494cffc612d092e53a073538f382ca7b84132880 +SIZE (java/CastleVox-linux.tar.gz) = 27979326 diff -ruN --exclude=CVS /usr/ports/games/castlevox/files/CastleVox.in ./files/CastleVox.in --- /usr/ports/games/castlevox/files/CastleVox.in 2012-10-04 18:57:49.000000000 +0200 +++ ./files/CastleVox.in 2012-10-04 20:13:56.000000000 +0200 @@ -2,7 +2,7 @@ # # $FreeBSD: ports/games/castlevox/files/CastleVox.in,v 1.1 2012/10/04 16:57:49 jgh Exp $ -echo "Castle Vox: Starting up..." -cd "%%DATADIR%%" -JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" \ --Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/VoxCore.jar" "$@" +export JAVA_VERSION="%%JAVA_VERSION%%" + +cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" \ +-Djava.ext.dirs="%%DATADIR%%" -jar "%%DATADIR%%/VoxCore.jar" "${@}" diff -ruN --exclude=CVS /usr/ports/games/castlevox/pkg-plist ./pkg-plist --- /usr/ports/games/castlevox/pkg-plist 2012-10-04 18:57:49.000000000 +0200 +++ ./pkg-plist 1970-01-01 01:00:00.000000000 +0100 @@ -1,75 +0,0 @@ -bin/CastleVox -%%DATADIR%%/VoxCore.jar -%%DATADIR%%/VoxIcon.png -%%DATADIR%%/jide-charts.jar -%%DATADIR%%/jide-common.jar -%%DATADIR%%/jogg-0.0.7.jar -%%DATADIR%%/jorbis-0.0.15.jar -%%DATADIR%%/tritonus_share.jar -%%DATADIR%%/vorbisspi1.0.3.jar -%%DATADIR%%/Support/Maps/Hex Barons.voxb -%%DATADIR%%/Support/Maps/Tutorial Map.voxb -%%DATADIR%%/Support/Maps/World War II.voxb -%%DATADIR%%/Support/Music/CV_Civil War.ogg -%%DATADIR%%/Support/Music/CV_Main Theme.ogg -%%DATADIR%%/Support/Music/CV_Medieval.ogg -%%DATADIR%%/Support/Music/CV_Modern Military.ogg -%%DATADIR%%/Support/Music/CV_Roman.ogg -%%DATADIR%%/Support/Music/CV_Victory.ogg -%%DATADIR%%/Support/Themes/MB Hex Barons/overground.png -%%DATADIR%%/Support/Themes/MB Hex Barons/updater1.txt -%%DATADIR%%/Support/Themes/MB Hex Barons/updater2.txt -%%DATADIR%%/Support/Themes/MB Hex Barons/updater3.txt -%%DATADIR%%/Support/Themes/MB Hex Barons/updater4.txt -%%DATADIR%%/Support/Themes/MB Hex Barons/updater5.txt -%%DATADIR%%/Support/Themes/MB WW2 World/foreground.jpg -%%DATADIR%%/Support/Themes/MB WW2 World/overground.png -%%DATADIR%%/Support/Themes/MB WW2 World/unit_castle.png -%%DATADIR%%/Support/Themes/MB WW2 World/unit_knight.png -%%DATADIR%%/Support/Themes/MB WW2 World/unit_pawn.png -%%DATADIR%%/Support/Themes/MB WW2 World/updater1.txt -%%DATADIR%%/Support/Themes/MB WW2 World/updater2.txt -%%DATADIR%%/Support/Themes/MB WW2 World/updater3.txt -%%DATADIR%%/Support/Themes/MB WW2 World/updater4.txt -%%DATADIR%%/Support/Themes/MB WW2 World/updater5.txt -%%DATADIR%%/Support/Themes/MB WW2 World/updater6.txt -%%DATADIR%%/Support/Themes/MB WW2 World/updater7.txt -%%DATADIR%%/Support/Themes/MB WW2 World/updater8.txt -%%DATADIR%%/Support/Themes/MB WW2 World/updater9.txt -%%DATADIR%%/Support/Themes/Tutorial Map/foreground.jpg -%%DATADIR%%/Support/Themes/Tutorial Map/overground.png -%%DATADIR%%/Support/Themes/Tutorial Map/updater1.txt -%%DATADIR%%/Support/Themes/Tutorial Map/updater2.txt -%%DATADIR%%/Support/Themes/Tutorial Map/updater3.txt -%%DATADIR%%/Support/Themes/Tutorial Map/updater4.txt -%%DATADIR%%/Support/Themes/Tutorial Map/updater5.txt -%%DATADIR%%/docs/Castle_Vox_Instructions.html -%%DATADIR%%/docs/Castle_Vox_Shortcuts.html -%%DATADIR%%/docs/Castle_Vox_Version_History.html -%%DATADIR%%/docs/docs_files/Bonus.png -%%DATADIR%%/docs/docs_files/Chat.png -%%DATADIR%%/docs/docs_files/Conflict.png -%%DATADIR%%/docs/docs_files/Main_Interface.png -%%DATADIR%%/docs/docs_files/Network.png -%%DATADIR%%/docs/docs_files/PIwindow.png -%%DATADIR%%/docs/docs_files/Plugins.png -%%DATADIR%%/docs/docs_files/Units_castle.png -%%DATADIR%%/docs/docs_files/Units_knight.png -%%DATADIR%%/docs/docs_files/Units_pawn.png -%%DATADIR%%/docs/docs_files/bg.jpg -%%DATADIR%%/docs/docs_files/footer.jpg -%%DATADIR%%/docs/docs_files/header.jpg -%%DATADIR%%/docs/docs_files/moving.png -%%DATADIR%%/docs/docs_files/prefs.png -%%DATADIR%%/docs/docs_files/recruit.png -%%DATADIR%%/docs/docs_files/teammate.png -@dirrm %%DATADIR%%/docs/docs_files -@dirrm %%DATADIR%%/docs -@dirrm %%DATADIR%%/Support/Themes/Tutorial Map -@dirrm %%DATADIR%%/Support/Themes/MB WW2 World -@dirrm %%DATADIR%%/Support/Themes/MB Hex Barons -@dirrm %%DATADIR%%/Support/Themes -@dirrm %%DATADIR%%/Support/Music -@dirrm %%DATADIR%%/Support/Maps -@dirrm %%DATADIR%%/Support -@dirrm %%DATADIR%% --- CastleVox-1.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: