Date: Wed, 18 Aug 2004 20:30:43 +0200 From: Ronald Klop <ronald@cs.vu.nl> To: Volker Stolz <vs@freebsd.org>, freebsd-ports-bugs@freebsd.org Subject: Re: ports/70597: Update port jmp to 0.43 and fix pkg-plist (patch incl.) Message-ID: <opscxxphleydasmi@outgoing.local> In-Reply-To: <200408181542.i7IFgluq034087@freefall.freebsd.org> References: <200408181542.i7IFgluq034087@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Sorry, here is a new (well tested) patch.
diff -ruN0 jmp-0.42/Makefile jmp/Makefile
--- jmp-0.42/MakefileFri Jul 9 10:10:02 2004
+++ jmp/MakefileWed Aug 18 20:18:31 2004
@@ -9 +9 @@
-PORTVERSION=0.42
+PORTVERSION=0.43
diff -ruN0 jmp-0.42/distinfo jmp/distinfo
--- jmp-0.42/distinfoFri Jul 9 10:10:02 2004
+++ jmp/distinfoWed Aug 18 20:18:31 2004
@@ -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 -ruN0 jmp-0.42/files/patch-Makefile.am jmp/files/patch-Makefile.am
--- jmp-0.42/files/patch-Makefile.amThu May 15 18:34:36 2003
+++ jmp/files/patch-Makefile.amWed Aug 18 20:18:31 2004
@@ -3,17 +3,8 @@
---- Makefile.amTue May 13 22:11:38 2003
-+++ Makefile.amTue 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.origMon May 31 00:17:56 2004
++++ Makefile.amWed 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 -ruN0 jmp-0.42/files/patch-Makefile.in jmp/files/patch-Makefile.in
--- jmp-0.42/files/patch-Makefile.inThu May 15 18:34:36 2003
+++ jmp/files/patch-Makefile.inWed Aug 18 20:18:31 2004
@@ -3,17 +3,8 @@
---- Makefile.inTue May 13 22:11:43 2003
-+++ Makefile.inTue 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.origTue Aug 17 18:52:26 2004
++++ Makefile.inWed 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 -ruN0 jmp-0.42/files/patch-instance_owners.c
jmp/files/patch-instance_owners.c
--- jmp-0.42/files/patch-instance_owners.cFri Jul 9 10:10:02 2004
+++ jmp/files/patch-instance_owners.cWed Aug 18 20:25:04 2004
@@ -1,4 +1,2 @@
-$FreeBSD: ports/java/jmp/files/patch-instance_owners.c,v 1.2 2004/06/25
04:32:08 glewis Exp $
-
---- instance_owners.c.origFri Jun 25 02:20:42 2004
-+++ instance_owners.cFri Jun 25 02:28:35 2004
+--- /tmp/instance_owners.cWed Aug 18 20:23:20 2004
++++ instance_owners.cWed Aug 18 20:24:24 2004
@@ -10,4 +8,2 @@
-@@ -205,0 +210 @@
-+ GtkWidget* menuitem;
-@@ -207 +212 @@
-- GtkWidget* menuitem = gtk_menu_item_new_with_label (buf);
+@@ -207 +211 @@
+- omenu = gtk_menu_new ();
diff -ruN0 jmp-0.42/files/patch-jmp.c jmp/files/patch-jmp.c
--- jmp-0.42/files/patch-jmp.cThu Jan 1 01:00:00 1970
+++ jmp/files/patch-jmp.cWed Aug 18 20:18:31 2004
@@ -0,0 +1,9 @@
+$FreeBSD$
+
+--- jmp.c.origWed Aug 18 00:13:25 2004
++++ jmp.cWed 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 -ruN0 jmp-0.42/files/patch-methodlist_menu.c
jmp/files/patch-methodlist_menu.c
--- jmp-0.42/files/patch-methodlist_menu.cThu Jan 1 01:00:00 1970
+++ jmp/files/patch-methodlist_menu.cWed Aug 18 20:18:31 2004
@@ -0,0 +1,9 @@
+$FreeBSD$
+
+--- methodlist_menu.c.origWed Aug 18 00:14:57 2004
++++ methodlist_menu.cWed Aug 18 00:15:44 2004
+@@ -58,0 +59 @@
++mvector* mmv;
+@@ -65 +66 @@
+-mvector* mmv = gv (mm);
++mmv = gv (mm);
diff -ruN0 jmp-0.42/pkg-plist jmp/pkg-plist
--- jmp-0.42/pkg-plistThu May 15 18:34:36 2003
+++ jmp/pkg-plistWed Aug 18 20:18:31 2004
@@ -1 +0,0 @@
-lib/libjmp.la
--
Ronald Klop
Vrije Universiteit, Amsterdam, The Netherlands
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?opscxxphleydasmi>