4 files changed, 64 insertions, 49 deletions
diff --git a/java/poseidon/Makefile b/java/poseidon/Makefile
index f2c74385aea3..f65786e2c699 100644
--- a/java/poseidon/Makefile
+++ b/java/poseidon/Makefile
@@ -6,41 +6,38 @@
 #
 
 PORTNAME=	poseidon
-PORTVERSION=	2.6.0
+PORTVERSION=	3.0.1
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.gentleware.org/ \
 		http://download.gentleware.org/ \
 		ftp://download.gentleware.biz/ \
 		http://download.gentleware.biz/ \
 		ftp://ftp.beine-computer.de/pub/distfiles/
-DISTNAME=	${PORTNAME}${EDI}-${PORTVERSION}
+DISTNAME=	${PORTNAME}${EDITION}-${PORTVERSION}.01
 
 MAINTAINER=	tux@pinguru.net
 COMMENT=	A popular UML CASE tool
 
+WRKSRC=		${WRKDIR}/${PORTNAME}${EDITION}-${PORTVERSION}
+
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.4+
 USE_REINPLACE=	yes
 NO_BUILD=	yes
 NO_PACKAGE=	"Redistribution is not permitted"
 NO_CDROM=	${NO_PACKAGE}
 RESTRICTED=	${NO_PACKAGE}
 
-.for edition in SE PE
-. if defined(POSEIDON_${edition})
-EDI=	${edition}
-. endif
-.endfor
-.if !defined(EDI)
-EDI=	CE
+EDITION=	CE
+.if defined(WITH_EDITION)
+EDITION=	${WITH_EDITION}
 .endif
-
 DATAFILES=	LICENSE.txt lib
-.if defined(POSEIDON_PE)
+.if ${EDITION} == "PE"
 DATAFILES+=	LICENSE-concurrent.txt
 .endif
-.if !defined(POSEIDON_SE) && !defined(POSEIDON_PE)
+.if ${EDITION} == "CE"
 DATAFILES+=	license-keys.txt
 .endif
 PLIST_FILES=	bin/poseidon %%DATADIR%%/bin/poseidon.sh
@@ -50,22 +47,22 @@ PORTDOCS=	*
 PLIST_FILES+=	%%DATADIR%%/docs %%DATADIR%%/examples
 .endif
 
+SUB_FILES=	poseidon.sh
+SUB_LIST=	JAVA_HOME="${JAVA_HOME}" EDITION="${EDITION}"
+
 pre-fetch:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "There is a free usable edition of Poseidon for UML,"
 	@${ECHO_MSG} "the Community Edition, which is installed by default."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you like to install the Standard Edition or the Professional Edition"
-	@${ECHO_MSG} "please specify POSEIDON_SE=yes for the Standard Edition"
-	@${ECHO_MSG} "or POSEIDON_PE=yes for the Professional Edition."
+	@${ECHO_MSG} "please specify WITH_EDITION=SE for the Standard Edition"
+	@${ECHO_MSG} "or WITH_EDITION=PE for the Professional Edition."
 	@${ECHO_MSG}
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%JAVA_HOME%%,${JAVA_HOME}," ${WRKSRC}/bin/poseidon.sh
-
 do-install:
 	${MKDIR} ${DATADIR}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/poseidon.sh ${DATADIR}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/poseidon.sh ${DATADIR}/bin/
 	${LN} -s ${DATADIR}/bin/poseidon.sh ${PREFIX}/bin/poseidon
 	cd ${WRKSRC}/ \
 	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \
diff --git a/java/poseidon/distinfo b/java/poseidon/distinfo
index 51bf3d81f07a..7a48dc761773 100644
--- a/java/poseidon/distinfo
+++ b/java/poseidon/distinfo
@@ -1,6 +1,6 @@
-MD5 (poseidonCE-2.6.0.zip) = 923f62d535a89abbbc37ae4542bce98d
-SIZE (poseidonCE-2.6.0.zip) = 26818857
-MD5 (poseidonSE-2.6.0.zip) = 64e355b4c026482f4364e35f5829c73c
-SIZE (poseidonSE-2.6.0.zip) = 26352677
-MD5 (poseidonPE-2.6.0.zip) = 5a3dea170e47a48976e4503aadbf816e
-SIZE (poseidonPE-2.6.0.zip) = 37777065
+MD5 (poseidonSE-3.0.1.01.zip) = c1954f0058e1759b564c731acfbd6c6f
+SIZE (poseidonSE-3.0.1.01.zip) = 20360744
+MD5 (poseidonPE-3.0.1.01.zip) = 0d85e7b93d4d2f96a23119e63a54c40a
+SIZE (poseidonPE-3.0.1.01.zip) = 21410388
+MD5 (poseidonCE-3.0.1.01.zip) = 1f92eb815d9d815f23f6d18a863b1747
+SIZE (poseidonCE-3.0.1.01.zip) = 20766540
diff --git a/java/poseidon/files/patch-poseidon.sh b/java/poseidon/files/patch-poseidon.sh
deleted file mode 100644
index cde85879d93c..000000000000
--- a/java/poseidon/files/patch-poseidon.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-
---- bin/poseidon.sh.orig	Fri Sep 24 11:55:20 2004
-+++ bin/poseidon.sh	Mon Nov 22 00:58:46 2004
-@@ -1,4 +1,9 @@
--#!/bin/bash
-+#!/bin/sh
-+
-+JAVA_HOME="/usr/local/jdk1.4.2"
-+POSEIDONCE_HOME="$HOME/.poseidon"
-+POSEIDONSE_HOME="$HOME/.poseidon"
-+POSEIDONPE_HOME="$HOME/.poseidon"
- 
- resolvePath() {
- 	cmd=`basename "${1}"`
-@@ -29,7 +34,7 @@
- cmd=`resolvePath "$0"`
- echo "Absolute path: $cmd"
- instdir=`dirname "$cmd"`
--if [[ ! (-z "$1")]] ; then
-+if [ -n "$1" ] ; then
-     project=`resolvePath "$1"`
-     echo "Project to load: $project"
-     loglevel=$2
diff --git a/java/poseidon/files/poseidon.sh.in b/java/poseidon/files/poseidon.sh.in
new file mode 100644
index 000000000000..d0cfcc756890
--- /dev/null
+++ b/java/poseidon/files/poseidon.sh.in
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_HOME=${JAVA_HOME:-"%%JAVA_HOME%%"}
+POSEIDON_HOME="$HOME/.poseidon"
+
+if [ ! -d "$JAVA_HOME" ] ; then
+    echo "Could not find a JDK."
+    echo "Either you have to install a JDK (1.4 or up),"
+    echo "or you have to set JAVA_HOME to your JDK installation directory."
+    exit
+fi
+
+JAVACMD="$JAVA_HOME/bin/java"
+
+ulimit -s 2048
+
+cmd="`realpath "$0"`"
+echo "Absolute path: $cmd"
+instdir="`dirname "$cmd"`"
+if [ -n "$1" ] ; then
+    project="`realpath "$1"`"
+    echo "Project to load: $project"
+    loglevel=$2
+else
+    project=
+    loglevel=
+fi
+
+cd "$instdir"
+
+CLASSPATH="../lib/floating-server.jar:../lib/poseidon.jar:../lib/umlplugin.jar"
+CLASSPATH="$CLASSPATH:$JAVA_HOME/jre/lib/rt.jar" # for compilation
+
+export CLASSPATH
+
+# increase memory here, if required (e. g. -Xmx256m)
+POSEIDON_ADDITIONAL_JAVA_ARGS="-Xms64m -Xmx160m"
+POSEIDON_PLATFORM_JAVA_ARGS=
+
+"$JAVACMD" $POSEIDON_PLATFORM_JAVA_ARGS $POSEIDON_ADDITIONAL_JAVA_ARGS -Dposeidon.java.home="$JAVA_HOME" -Dposeidon.user.dir.%%EDITION%%="$POSEIDON_HOME" com.gentleware.poseidon.Poseidon "$project"