11 files changed, 23 insertions, 15 deletions

diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 18751fa28727..cf4863bd61ce 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A GNU project to create a free Java class library
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 
-USE_AUTOTOOLS=	libtool:15
 #USE_GNOME=	gtk20 libartlgpl2 pkgconfig
 USE_JAVA=	yes
 USE_JIKES=	yes
diff --git a/java/diablo-jdk13/Makefile b/java/diablo-jdk13/Makefile
index 8683f29e11ca..379b62e9ef73 100644
--- a/java/diablo-jdk13/Makefile
+++ b/java/diablo-jdk13/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
 .if !defined(WITHOUT_PLUGIN)
 FORBIDDEN=	Vulnerabilities in the browser plugin
-RUN_DEPENDS+=	${LOCALBASE}/lib/libglib12.so:${PORTSDIR}/devel/glib12 \
-		${X11BASE}/lib/libgtk12.so:${PORTSDIR}/x11-toolkits/gtk12 \
+RUN_DEPENDS+=	${LOCALBASE}/lib/libglib-12.so:${PORTSDIR}/devel/glib12 \
+		${X11BASE}/lib/libgtk-12.so:${PORTSDIR}/x11-toolkits/gtk12 \
 		${LOCALBASE}/lib/libnspr4.so:${PORTSDIR}/devel/nspr
 .endif
 .if defined(WITH_JAPANESE_FONTS)
diff --git a/java/diablo-jre13/Makefile b/java/diablo-jre13/Makefile
index 6927cad88a51..420abe2b54c9 100644
--- a/java/diablo-jre13/Makefile
+++ b/java/diablo-jre13/Makefile
@@ -21,8 +21,8 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
 .if !defined(WITHOUT_PLUGIN)
 FORBIDDEN=	Vulnerabilities in the browser plugin
-RUN_DEPENDS+=	${LOCALBASE}/lib/libglib12.so:${PORTSDIR}/devel/glib12 \
-		${X11BASE}/lib/libgtk12.so:${PORTSDIR}/x11-toolkits/gtk12 \
+RUN_DEPENDS+=	${LOCALBASE}/lib/libglib-12.so:${PORTSDIR}/devel/glib12 \
+		${X11BASE}/lib/libgtk-12.so:${PORTSDIR}/x11-toolkits/gtk12 \
 		${LOCALBASE}/lib/libnspr4.so:${PORTSDIR}/devel/nspr
 .endif
 .if defined(WITH_JAPANESE_FONTS)
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 11165461fbb0..154c20781c42 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jc
 PORTVERSION=	1.4.7
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=jcvm/
@@ -19,7 +20,6 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 MAN1=		jc.1
 
-USE_AUTOTOOLS=	libtool:15
 USE_JAVA=	yes
 USE_GMAKE=	yes
 JAVA_BUILD=	jre
diff --git a/java/jc/pkg-plist b/java/jc/pkg-plist
index 3f2c4fb33065..cbde3c243ffb 100644
--- a/java/jc/pkg-plist
+++ b/java/jc/pkg-plist
@@ -3,5 +3,6 @@ bin/jc
 bin/jcgen
 bin/jcjavah
 etc/jc.conf
+lib/libjc.la
 lib/libjc.so
 lib/libjc.so.1
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index a37f8d68e525..d7b48542eeea 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -23,9 +23,8 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 .if defined(WITH_PLUGIN)
 FORBIDDEN=	Vulnerabilities in the browser plugin
-LIB_DEPENDS=	glib12.3:$(PORTSDIR)/devel/glib12 \
-		gtk12.2:$(PORTSDIR)/x11-toolkits/gtk12 \
-		nspr4.1:$(PORTSDIR)/devel/nspr
+USE_GNOME+=	gtk12
+LIB_DEPENDS=	nspr4.1:$(PORTSDIR)/devel/nspr
 .endif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index 1826a51d2c60..8ee8396a6c59 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	jmp
 PORTVERSION=	0.49
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.khelekore.org/jmp/
 
@@ -37,7 +38,6 @@ CFLAGS+=	-DJMPDEBUG -g
 CFLAGS+=	-O3
 .endif
 
-USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
@@ -55,7 +55,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME="${JAVA_HOME}"
 INSTALLS_SHLIB=	yes
 
-PLIST_FILES=	lib/libjmp.so lib/libjmp.so.0 \
+PLIST_FILES=	lib/libjmp.la lib/libjmp.so lib/libjmp.so.0 \
 		share/locale/de/LC_MESSAGES/jmp.mo \
 		share/locale/sv/LC_MESSAGES/jmp.mo
 
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index 68c499a11c8c..e59e829ca22b 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kaffe
 PORTVERSION=	1.1.7.r1
+PORTREVISION=	1
 CATEGORIES=	java devel
 #MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 MASTER_SITES=	http://www.kaffe.org/~robilad/
@@ -28,10 +29,8 @@ RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_ICONV=	yes
-LIBTOOLFLAGS=
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist
index 61b83363ee7f..7ba538432db2 100644
--- a/java/kaffe/pkg-plist
+++ b/java/kaffe/pkg-plist
@@ -48,28 +48,37 @@ jre/lib/%%ARCH%%/libgtkpeer.la
 jre/lib/%%ARCH%%/libgtkpeer.so
 jre/lib/%%ARCH%%/libgtkpeer.so.0
 jre/lib/%%ARCH%%/libjavaio-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libjavaio.la
 jre/lib/%%ARCH%%/libjavaio.so
 jre/lib/%%ARCH%%/libjavalang-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libjavalang.la
 jre/lib/%%ARCH%%/libjavalang.so
 jre/lib/%%ARCH%%/libjavanet-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libjavanet.la
 jre/lib/%%ARCH%%/libjavanet.so
 jre/lib/%%ARCH%%/libjavanio-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libjavanio.la
 jre/lib/%%ARCH%%/libjavanio.so
 jre/lib/%%ARCH%%/libjawtgnu.la
 jre/lib/%%ARCH%%/libjawtgnu.so
 jre/lib/%%ARCH%%/libjawtgnu.so.0
 jre/lib/%%ARCH%%/libkaffevm-%%PORTVER%%.so
-jre/lib/%%ARCH%%/libkaffevm.a
+jre/lib/%%ARCH%%/libkaffevm.la
 jre/lib/%%ARCH%%/libkaffevm.so
 jre/lib/%%ARCH%%/libmanagement-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libmanagement.la
 jre/lib/%%ARCH%%/libmanagement.so
 jre/lib/%%ARCH%%/libmath-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libmath.la
 jre/lib/%%ARCH%%/libmath.so
 jre/lib/%%ARCH%%/libsecurity-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libsecurity.la
 jre/lib/%%ARCH%%/libsecurity.so
 jre/lib/%%ARCH%%/libtritonusesd-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libtritonusesd.la
 jre/lib/%%ARCH%%/libtritonusesd.so
 jre/lib/%%ARCH%%/libzip-%%PORTVER%%.so
+jre/lib/%%ARCH%%/libzip.la
 jre/lib/%%ARCH%%/libzip.so
 lib/logging.properties
 lib/security/classpath.security
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index 236e4ebcd18e..282c680d2740 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sablevm
 PORTVERSION=	1.1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=sablevm
diff --git a/java/sablevm/pkg-plist b/java/sablevm/pkg-plist
index e455953d43f2..d8c3b33340da 100644
--- a/java/sablevm/pkg-plist
+++ b/java/sablevm/pkg-plist
@@ -4,6 +4,7 @@ include/jni.h
 include/jni_system_specific.h
 lib/libsablevm-%%PORTVERSION%%.so
 lib/libsablevm.a
+lib/libsablevm.la
 lib/libsablevm.so
 lib/sablevm/awt/font.properties
 lib/sablevm/logging.properties