- Update to 0.43

- Fix packaging

PR:		ports/70597
Submitted by:	Ronald Klop (maintainer)

8 files changed, 44 insertions, 50 deletions

diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index 27e7fe7baf37..e7c40474ff85 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jmp
-PORTVERSION=	0.42
+PORTVERSION=	0.43
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.khelekore.org/jmp/
 
@@ -53,4 +53,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME="${JAVA_HOME}"
 INSTALLS_SHLIB=	yes
 
+PLIST_FILES=	lib/libjmp.so lib/libjmp.so.0 \
+		share/locale/de/LC_MESSAGES/jmp.mo share/locale/sv/LC_MESSAGES/jmp.mo
+
 .include <bsd.port.mk>
diff --git a/java/jmp/distinfo b/java/jmp/distinfo
index 653d2f9e04d1..26bd356c9831 100644
--- a/java/jmp/distinfo
+++ b/java/jmp/distinfo
@@ -1,2 +1,2 @@
-MD5 (jmp-0.42.tar.gz) = f29b6f75526099fe94ff7c6ab06d4474
-SIZE (jmp-0.42.tar.gz) = 484703
+MD5 (jmp-0.43.tar.gz) = 312322a7d607597ac97b6d7033139caa
+SIZE (jmp-0.43.tar.gz) = 473897
diff --git a/java/jmp/files/patch-Makefile.am b/java/jmp/files/patch-Makefile.am
index 9795b08b1c4e..822ac4371e2b 100644
--- a/java/jmp/files/patch-Makefile.am
+++ b/java/jmp/files/patch-Makefile.am
@@ -1,19 +1,10 @@
 $FreeBSD$
 
---- Makefile.am	Tue May 13 22:11:38 2003
-+++ Makefile.am	Tue May 13 22:12:05 2003
-@@ -42,12 +42,12 @@
- 	gcc -shared -o $@ ${OBJECTS} -Wl,--kill-at
- 
- jmp/JMPController.class : java/jmp/JMPController.java	
--	javac -sourcepath java -d . $<
-+	${JAVAC} -sourcepath java -d . $<
- 
- # javah does not update file modification time, so touch it
- # otherwise we will remake file every time
- jmp_JMPController.h: jmp/JMPController.class
--	javah jmp.JMPController
-+	${JAVAH} jmp.JMPController
- 	@touch jmp_JMPController.h
- 
- javadocs:
+--- Makefile.am.orig	Mon May 31 00:17:56 2004
++++ Makefile.am	Wed Aug 18 00:28:51 2004
+@@ -50 +50 @@
+-	javac -sourcepath ${top_srcdir}/java -d . $<
++	${JAVAC} -sourcepath ${top_srcdir}/java -d . $<
+@@ -55 +55 @@
+-	javah -classpath . jmp.JMPController
++	${JAVAH} -classpath . jmp.JMPController
diff --git a/java/jmp/files/patch-Makefile.in b/java/jmp/files/patch-Makefile.in
index 847866fdbb7f..c0d80c265ac1 100644
--- a/java/jmp/files/patch-Makefile.in
+++ b/java/jmp/files/patch-Makefile.in
@@ -1,19 +1,10 @@
 $FreeBSD$
 
---- Makefile.in	Tue May 13 22:11:43 2003
-+++ Makefile.in	Tue May 13 22:12:29 2003
-@@ -598,12 +598,12 @@
- 	gcc -shared -o $@ ${OBJECTS} -Wl,--kill-at
- 
- jmp/JMPController.class : java/jmp/JMPController.java	
--	javac -sourcepath java -d . $<
-+	${JAVAC} -sourcepath java -d . $<
- 
- # javah does not update file modification time, so touch it
- # otherwise we will remake file every time
- jmp_JMPController.h: jmp/JMPController.class
--	javah jmp.JMPController
-+	${JAVAH} jmp.JMPController
- 	@touch jmp_JMPController.h
- 
- javadocs:
+--- Makefile.in.orig	Tue Aug 17 18:52:26 2004
++++ Makefile.in	Wed Aug 18 00:29:11 2004
+@@ -639 +639 @@
+-	javac -sourcepath ${top_srcdir}/java -d . $<
++	${JAVAC} -sourcepath ${top_srcdir}/java -d . $<
+@@ -644 +644 @@
+-	javah -classpath . jmp.JMPController
++	${JAVAH} -classpath . jmp.JMPController
diff --git a/java/jmp/files/patch-instance_owners.c b/java/jmp/files/patch-instance_owners.c
index dd8ec178992f..089201d12f89 100644
--- a/java/jmp/files/patch-instance_owners.c
+++ b/java/jmp/files/patch-instance_owners.c
@@ -1,14 +1,10 @@
-$FreeBSD$
-
---- instance_owners.c.orig	Fri Jun 25 02:20:42 2004
-+++ instance_owners.c	Fri Jun 25 02:28:35 2004
+--- /tmp/instance_owners.c	Wed Aug 18 20:23:20 2004
++++ instance_owners.c	Wed Aug 18 20:24:24 2004
 @@ -16,0 +17,4 @@
 +#if __FreeBSD__ < 5
 +#define PRId32 "d"
 +#endif
 +
-@@ -205,0 +210 @@
-+    GtkWidget* menuitem;
-@@ -207 +212 @@
--    GtkWidget* menuitem = gtk_menu_item_new_with_label (buf);
+@@ -207 +211 @@
+-    omenu = gtk_menu_new ();
 +    menuitem = gtk_menu_item_new_with_label (buf);
diff --git a/java/jmp/files/patch-jmp.c b/java/jmp/files/patch-jmp.c
new file mode 100644
index 000000000000..99792eb29b23
--- /dev/null
+++ b/java/jmp/files/patch-jmp.c
@@ -0,0 +1,9 @@
+$FreeBSD$
+
+--- jmp.c.orig	Wed Aug 18 00:13:25 2004
++++ jmp.c	Wed Aug 18 00:14:03 2004
+@@ -1883,0 +1884 @@
++	int locks;
+@@ -1886 +1887 @@
+-	int locks = timerstacks_get_need_locks ();
++	locks = timerstacks_get_need_locks ();
diff --git a/java/jmp/files/patch-methodlist_menu.c b/java/jmp/files/patch-methodlist_menu.c
new file mode 100644
index 000000000000..e8a96c7a0485
--- /dev/null
+++ b/java/jmp/files/patch-methodlist_menu.c
@@ -0,0 +1,9 @@
+$FreeBSD$
+
+--- methodlist_menu.c.orig	Wed Aug 18 00:14:57 2004
++++ methodlist_menu.c	Wed Aug 18 00:15:44 2004
+@@ -58,0 +59 @@
++	mvector* mmv;
+@@ -65 +66 @@
+-	mvector* mmv = gv (mm);
++	mmv = gv (mm);
diff --git a/java/jmp/pkg-plist b/java/jmp/pkg-plist
deleted file mode 100644
index 60fef1525cfa..000000000000
--- a/java/jmp/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/libjmp.la
-lib/libjmp.so
-lib/libjmp.so.0
-share/locale/de/LC_MESSAGES/jmp.mo
-share/locale/sv/LC_MESSAGES/jmp.mo