Index: head/games/jin/Makefile =================================================================== --- head/games/jin/Makefile (revision 477193) +++ head/games/jin/Makefile (revision 477194) @@ -1,42 +1,45 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= jin PORTVERSION= 2.14.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -DISTNAME= ${PORTNAME}-${PORTVERSION}-unix +DISTNAME= ${PORTNAME}-${PORTVERSION}-source -MAINTAINER= nivit@FreeBSD.org +MAINTAINER= mi@aldan.algebra.com COMMENT= Graphical client for chess servers -NO_BUILD= yes +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/src/free/jin/legal/copyright.txt + +RUN_DEPENDS= ${JAVAJARDIR}/bsh.jar:lang/bsh +BUILD_DEPENDS= ${RUN_DEPENDS} + +USES= dos2unix +DOS2UNIX_GLOB= *.java *.txt USE_JAVA= yes -JAVA_VERSION= 1.6+ +USE_ANT= yes +MAKE_ARGS+= -lib ${JAVAJARDIR}/bsh.jar + SUB_FILES= ${PORTNAME} -SUB_LIST= JINJAR=${JINJAR} +SUB_LIST= JINJAR=${JINJAR:Q} JAVA_VERSION=${JAVA_PORT_VERSION:R} DATADIR= ${JAVASHAREDIR}/${PORTNAME} +EXTRACT_AFTER_ARGS= --exclude 'bsh*.jar' \ + --exclude os-specific/unix/jin \ + --exclude jgoodies-windows.jar + JINJAR= ${PORTNAME}.jar WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -FIND_DIRS= . -type d -FIND_DATA= . -type f -RM_FILES= ${PORTNAME} README changelog.txt gpl.txt - -post-extract: -.for f in ${RM_FILES} - @${RM} ${WRKSRC}/${f} -.endfor - do-install: - @${MKDIR} ${STAGEDIR}${DATADIR} - @cd ${WRKSRC} && ${FIND} ${FIND_DIRS} -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} ";" - @cd ${WRKSRC} && ${FIND} ${FIND_DATA} -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} ";" - @${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${FIND} ${WRKSRC} -empty -delete + cd ${WRKSRC}/build && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/games/jin/distinfo =================================================================== --- head/games/jin/distinfo (revision 477193) +++ head/games/jin/distinfo (revision 477194) @@ -1,2 +1,3 @@ -SHA256 (jin-2.14.1-unix.tar.gz) = 07652a896ec36f037ba9fd0af0d714a24aaf478926c9adb3677d45b5bfb08544 -SIZE (jin-2.14.1-unix.tar.gz) = 17579169 +TIMESTAMP = 1534015381 +SHA256 (jin-2.14.1-source.tar.gz) = 7f3c346d42dffbeee07a1a0db2bb2ce4f3174b82fa8b9a581c0933df153671d6 +SIZE (jin-2.14.1-source.tar.gz) = 17854073 Index: head/games/jin/files/jin.in =================================================================== --- head/games/jin/files/jin.in (revision 477193) +++ head/games/jin/files/jin.in (revision 477194) @@ -1,5 +1,5 @@ #!/bin/sh # $FreeBSD$ cd %%DATADIR%% -JAVA_VERSION="%%JAVA_VERSION%%" \ -exec "%%LOCALBASE%%/bin/java" -jar %%DATADIR%%/%%JINJAR%% "$@" +export JAVA_VERSION="%%JAVA_VERSION%%+" +exec "%%LOCALBASE%%/bin/java" -cp %%JAVAJARDIR%%/bsh.jar:%%JINJAR%% free.jin.JinApplication "$@" Index: head/games/jin/files/patch-build.xml =================================================================== --- head/games/jin/files/patch-build.xml (nonexistent) +++ head/games/jin/files/patch-build.xml (revision 477194) @@ -0,0 +1,22 @@ +--- build.xml 2007-03-04 19:55:00 -0500 ++++ build.xml 2018-08-11 17:06:49 -0400 +@@ -21,5 +21,4 @@ + + +- + + +@@ -60,6 +59,4 @@ + includes="**" + classpathref="compile.class.path"> +- +- + + +@@ -72,6 +69,4 @@ + includes="**" + classpath="${classes.dir}"> +- +- + + Property changes on: head/games/jin/files/patch-build.xml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/jin/files/patch-new-bsh =================================================================== --- head/games/jin/files/patch-new-bsh (nonexistent) +++ head/games/jin/files/patch-new-bsh (revision 477194) @@ -0,0 +1,34 @@ +The Beanshell API has evolved since 2007, when Jin was last released... + + -mi + +--- src/free/jin/gamelogger/LoggingRule.java 2007-03-04 19:55:00 EDT ++++ src/free/jin/gamelogger/LoggingRule.java 2018-08-11 15:50:42 EDT +@@ -24,4 +24,5 @@ + import bsh.Interpreter; + import bsh.EvalError; ++import bsh.ParseException; + + +@@ -105,5 +106,5 @@ + Object val = bsh.eval(condition); + if (!(val instanceof Boolean)) +- throw new EvalError("Not a boolean expression"); ++ throw new ParseException(condition + ": Not a boolean expression"); + + this.condition = condition; +--- src/free/jin/scripter/CommandsScriptDialog.java 2007-03-04 19:54:59 EDT ++++ src/free/jin/scripter/CommandsScriptDialog.java 2018-08-11 15:55:06 EDT +@@ -32,4 +32,5 @@ + + import bsh.EvalError; ++import bsh.ParseException; + import bsh.Interpreter; + import free.jin.I18n; +@@ -176,5 +177,5 @@ + Object val = bsh.eval(condition); + if (!(val instanceof Boolean)) +- throw new EvalError("Not a boolean expression"); ++ throw new ParseException(condition + ": Not a boolean expression"); + } catch (EvalError e){ + I18n i18n = I18n.get(CommandsScriptDialog.class); Property changes on: head/games/jin/files/patch-new-bsh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/jin/pkg-plist =================================================================== --- head/games/jin/pkg-plist (revision 477193) +++ head/games/jin/pkg-plist (revision 477194) @@ -1,81 +1,76 @@ bin/jin %%DATADIR%%/actions/askquestion.jar %%DATADIR%%/actions/getserverhelp.jar %%DATADIR%%/actions/seek.jar %%DATADIR%%/chess.jar -%%DATADIR%%/copyright.txt -%%DATADIR%%/icon.png %%DATADIR%%/jin.jar %%DATADIR%%/libs/board.jar -%%DATADIR%%/libs/bsh-core-1.2b7.jar %%DATADIR%%/libs/console.jar %%DATADIR%%/libs/fics/timesealing.jar %%DATADIR%%/libs/icc/timestamping.jar %%DATADIR%%/libs/scripter.jar %%DATADIR%%/libs/seek.jar %%DATADIR%%/libs/sound.jar %%DATADIR%%/lnfs/jgoodies-plastic.jar %%DATADIR%%/lnfs/kunststoff.jar %%DATADIR%%/lnfs/liquid.jar %%DATADIR%%/lnfs/metouia.jar %%DATADIR%%/plugins/actions.jar %%DATADIR%%/plugins/fics/board.jar %%DATADIR%%/plugins/fics/console.jar %%DATADIR%%/plugins/fics/scripter.jar %%DATADIR%%/plugins/fics/seek.jar %%DATADIR%%/plugins/fics/sound.jar %%DATADIR%%/plugins/gamelogger.jar %%DATADIR%%/plugins/icc/board.jar %%DATADIR%%/plugins/icc/console.jar %%DATADIR%%/plugins/icc/scripter.jar %%DATADIR%%/plugins/icc/seek.jar %%DATADIR%%/plugins/icc/sound.jar %%DATADIR%%/resources/boards/cold-marble.zip %%DATADIR%%/resources/boards/crampled-paper.zip %%DATADIR%%/resources/boards/gray-tiles.zip %%DATADIR%%/resources/boards/green-marble.zip %%DATADIR%%/resources/boards/icc/wooden-light.zip %%DATADIR%%/resources/boards/pale-wood.zip %%DATADIR%%/resources/boards/plain.zip %%DATADIR%%/resources/boards/red-marble.zip %%DATADIR%%/resources/boards/slate.zip %%DATADIR%%/resources/boards/winter.zip %%DATADIR%%/resources/boards/wooden-dark.zip %%DATADIR%%/resources/pieces/adventure.zip %%DATADIR%%/resources/pieces/alfonso-x.zip %%DATADIR%%/resources/pieces/alpha.zip %%DATADIR%%/resources/pieces/berlin.zip %%DATADIR%%/resources/pieces/condal.zip %%DATADIR%%/resources/pieces/eyes.zip %%DATADIR%%/resources/pieces/fantasy.zip %%DATADIR%%/resources/pieces/fics/eboard.zip %%DATADIR%%/resources/pieces/freak.zip %%DATADIR%%/resources/pieces/harlequin.zip %%DATADIR%%/resources/pieces/icc/blitzin.zip %%DATADIR%%/resources/pieces/icc/bookup.zip %%DATADIR%%/resources/pieces/icc/dyche1.zip %%DATADIR%%/resources/pieces/icc/dyche2.zip %%DATADIR%%/resources/pieces/icc/dyche3.zip %%DATADIR%%/resources/pieces/kingdom.zip %%DATADIR%%/resources/pieces/leipzig.zip %%DATADIR%%/resources/pieces/line.zip %%DATADIR%%/resources/pieces/lucena.zip %%DATADIR%%/resources/pieces/magnetic.zip %%DATADIR%%/resources/pieces/mark.zip %%DATADIR%%/resources/pieces/marroquin.zip %%DATADIR%%/resources/pieces/maya.zip %%DATADIR%%/resources/pieces/medieval.zip %%DATADIR%%/resources/pieces/merida.zip %%DATADIR%%/resources/pieces/motif.zip %%DATADIR%%/resources/pieces/prmi.zip %%DATADIR%%/resources/pieces/skulls.zip %%DATADIR%%/resources/pieces/smart.zip %%DATADIR%%/resources/pieces/spatial.zip %%DATADIR%%/resources/pieces/usual.zip %%DATADIR%%/resources/pieces/utrecht.zip %%DATADIR%%/resources/pieces/xboard.zip %%DATADIR%%/servers/chessclub.jar %%DATADIR%%/servers/freechess.jar %%DATADIR%%/util.jar -@dir %%DATADIR%%/actions/fics -@dir %%DATADIR%%/actions/icc