5 files changed, 110 insertions, 10 deletions

diff --git a/java/poseidon/Makefile b/java/poseidon/Makefile
index 369a1a95fb89..02e0b7d09ede 100644
--- a/java/poseidon/Makefile
+++ b/java/poseidon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	poseidon
-PORTVERSION=	2.4.1
+PORTVERSION=	2.5.0
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.gentleware.org/
 DISTNAME=	${PORTNAME}${EDI}-${PORTVERSION}
@@ -66,6 +66,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${DATADIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${DATADIR}
 .if(defined(POSEIDON_PE))
+	${INSTALL_DATA} ${WRKSRC}/LICENSE-concurrent.txt ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/templates/* ${DATADIR}/lib/templates
 	${INSTALL_DATA} ${WRKSRC}/lib/templates.zip ${DATADIR}/lib
 .endif
diff --git a/java/poseidon/distinfo b/java/poseidon/distinfo
index eebf6f13df04..cf8763a3acbe 100644
--- a/java/poseidon/distinfo
+++ b/java/poseidon/distinfo
@@ -1,6 +1,6 @@
-MD5 (poseidonCE-2.4.1.zip) = cd00ce622235a12f0c64b2fa2ad19109
-SIZE (poseidonCE-2.4.1.zip) = 27251958
-MD5 (poseidonSE-2.4.1.zip) = 4b3f2763dc02656ef479d7311f1ef24f
-SIZE (poseidonSE-2.4.1.zip) = 26816020
-MD5 (poseidonPE-2.4.1.zip) = f8a0c6837bac16d1ebbf4f23b4bc2305
-SIZE (poseidonPE-2.4.1.zip) = 29342659
+MD5 (poseidonCE-2.5.0.zip) = df05c7a4dd93cc6d1ad35833a980744b
+SIZE (poseidonCE-2.5.0.zip) = 30459069
+MD5 (poseidonSE-2.5.0.zip) = 831f8a45f9eabe3a0aef676c508f210e
+SIZE (poseidonSE-2.5.0.zip) = 31882886
+MD5 (poseidonPE-2.5.0.zip) = 8ed424428b5d5a3497237eefe6ecc9f2
+SIZE (poseidonPE-2.5.0.zip) = 32829436
diff --git a/java/poseidon/pkg-plist b/java/poseidon/pkg-plist
index 2ba266751a91..3d79946679db 100644
--- a/java/poseidon/pkg-plist
+++ b/java/poseidon/pkg-plist
@@ -1,8 +1,12 @@
 bin/poseidon
 %%DATADIR%%/bin/poseidon.sh
+%%DATADIR%%/lib/gw-mdr.jar
+%%DATADIR%%/lib/openide-fs.jar
+%%DATADIR%%/lib/openide-util.jar
+%%DATADIR%%/lib/org-openide-execution.jar
+%%DATADIR%%/lib/org-openide-io.jar
 %%DATADIR%%/lib/jmi.jar
 %%DATADIR%%/lib/umltojava.jar
-%%DATADIR%%/lib/jmitoolkit.jar
 %%DATADIR%%/lib/jdom.jar
 %%DATADIR%%/lib/jaxrpc.jar
 %%DATADIR%%/lib/alloy.jar
@@ -20,7 +24,6 @@ bin/poseidon
 %%DATADIR%%/lib/freehep-graphicsio-pdf.jar
 %%DATADIR%%/lib/codeGen.jar
 %%DATADIR%%/lib/commons-discovery.jar
-%%DATADIR%%/lib/openide.jar
 %%DATADIR%%/lib/antlr.jar
 %%DATADIR%%/lib/poseidon.jar
 %%DATADIR%%/lib/mof.jar
@@ -422,6 +425,24 @@ bin/poseidon
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/codegenguide/codegeneratesettings.png
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/codegenguide/top.png
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/codegenguide/generatorcontrollerdiagram.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/arrow_orig.psd
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/ee_button_collab_refresh.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/ee_button_cvs_refresh.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/generatorcontrollerdiagram.gif
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/logo_embee.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/port_add.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/poseidon.psd
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/proptab_state_action.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/proptab_state_composite.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/proptab_state_concurrent.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/proptab_state_guard.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/proptab_state_other.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/proptab_state_simple.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/proptab_state_transition.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/proptab_state_trigger.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/stereotype_button_minus.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/tb_state_addelem.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/tb_state_delelem.png
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/shape_opaque.png
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/tb_note.png
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/menu_view.png
@@ -1014,6 +1035,82 @@ bin/poseidon
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/icon_class.png
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/doctab_tb_redo.png
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/images/ee_button_renameproj.png
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/CATALOG.local
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/EE-EAP.txt
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/FAQ.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/FAQ.xml
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/PoseidonCodeGenFramework.xml
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/PoseidonUsersGuide.pdf
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/PoseidonUsersGuide.xml
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/PoseidonUsersGuide_html.xml
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/c5278.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/c5283.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/di-structure.txt
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/element_state.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/make-documentation.sh
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/ports.txt
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/poseidon2-openapi.zip
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/suse-html.dsl
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/suse-print.dsl
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x241.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6536.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6545.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6689.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6697.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6698.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6706.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6715.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6724.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6727.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6736.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6750.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6757.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6766.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6798.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6807.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6868.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6877.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6919.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6928.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7001.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7010.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7053.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7062.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7117.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7126.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7135.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7141.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7150.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7156.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7163.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7165.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7168.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7172.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7177.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7196.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7199.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7205.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7208.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7230.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7239.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7241.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7250.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7252.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7261.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7266.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7275.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7279.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7288.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7304.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7313.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7320.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7329.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7332.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7341.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7349.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7355.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7358.html
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x7364.html
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x2459.html
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/c5618.html
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6568.html
@@ -2008,7 +2105,6 @@ bin/poseidon
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x6940.html
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/c2911.html
 %%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide/x2645.html
-%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide.pdf
 %%PORTDOCS%%%%DATADIR%%/docs/FAQ.html
 %%PORTDOCS%%%%DATADIR%%/examples/Plugins/CoffeeMachine.zuml
 %%PORTDOCS%%%%DATADIR%%/examples/Plugins/CoffeeMachine_2.zuml
diff --git a/java/poseidon/pkg-plist.PE b/java/poseidon/pkg-plist.PE
index 27172968ca8d..b563f2af7b4d 100644
--- a/java/poseidon/pkg-plist.PE
+++ b/java/poseidon/pkg-plist.PE
@@ -519,6 +519,8 @@
 %%PORTDOCS%%%%DATADIR%%/docs/poseidon2-openapi/tree.html
 %%PORTDOCS%%%%DATADIR%%/docs/poseidon2-openapi/treecode.html
 %%PORTDOCS%%%%DATADIR%%/docs/poseidon2-openapi/treemenu.html
+%%DATADIR%%/LICENSE-concurrent.txt
+%%DATADIR%%/lib/floating-server.jar
 %%DATADIR%%/lib/jarImport.jar
 %%DATADIR%%/lib/mdlimport.jar
 %%DATADIR%%/lib/roundtripEngineering.jar
diff --git a/java/poseidon/pkg-plist.SE b/java/poseidon/pkg-plist.SE
index 7b2e787fc149..be23a67a4fea 100644
--- a/java/poseidon/pkg-plist.SE
+++ b/java/poseidon/pkg-plist.SE
@@ -1,2 +1,3 @@
 %%DATADIR%%/lib/templates.jar
 %%DATADIR%%/lib/umldoc.jar
+%%PORTDOCS%%%%DATADIR%%/docs/PoseidonUsersGuide.pdf