- Fix build/install problems

PR:		120959
Reported by:	Andrew Reilly <areilly@bigpond.net.au>
Submitted by:	Bjoern Koenig <bkoenig@alpha-tierchen.de> (maintainer)

java/sablevm-classpath/Makefile

@@ -8,7 +8,7 @@
 
 PORTNAME=	sablevm-classpath
 PORTVERSION=	1.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sablevm
@@ -18,10 +18,11 @@ COMMENT=	Classpath of SableVM
 
 BUILD_DEPENDS=	jikes:${PORTSDIR}/java/jikes
 
-OPTIONS=	GTK2 "Enable Gtk+ AWT peer" ON \
+OPTIONS=	ZIP "Compress class library" ON \
+		GTK2 "Enable Gtk+ AWT peer" ON \
 		CAIRO "Use Cairo based Graphics2D" OFF
 
-CONFLICTS=	classpath-*
+CONFLICTS=	classpath-[0-9]*
 
 USE_XORG=	x11 ice xtst sm
 GNU_CONFIGURE=	yes
@@ -34,6 +35,16 @@ CONFIGURE_ENV=	CFLAGS="-I${PREFIX}/include -L${PREFIX}/lib -I${LOCALBASE}/includ
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_ZIP)
+CONFIGURE_ARGS+=	--with-compressed-classes=no
+PLIST_SUB+=		WITHOUT_ZIP=""
+.else
+CONFIGURE_ARGS+=	--with-compressed-classes=zip
+BUILD_DEPENDS+=		zip:${PORTSDIR}/archivers/zip
+PLIST_SUB+=		WITHOUT_ZIP="@comment "
+PLIST_FILES+=		${DATADIR_REL}/libclasspath.jar ${DATADIR_REL}/resources.jar
+.endif
+
 .if defined(WITHOUT_GTK2)
 CONFIGURE_ARGS+=	--disable-gtk-peer
 PLIST_SUB+=		GTK2="@comment "

java/sablevm-classpath/files/patch-lib-Makefile

@@ -0,0 +1,24 @@
+--- lib/Makefile.in.orig	2007-03-30 06:29:03.000000000 +0000
++++ lib/Makefile.in	2008-02-22 18:45:25.000000000 +0000
+@@ -494,10 +494,10 @@
+ sinclude $(JAVA_DEPEND)
+ 
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@install-data-hook:
+-@INSTALL_COMPRESSED_CLASS_FILES_TRUE@	mkdir -p $(JAVA_HOME)/{lib,jre/lib}
++@INSTALL_COMPRESSED_CLASS_FILES_TRUE@	mkdir -p $(JAVA_HOME)/lib $(JAVA_HOME)/jre/lib
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	-unlink $(JAVA_HOME)/jre/lib/rt.jar
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	for f in $(pkgdata_DATA) ; do \
+-@INSTALL_COMPRESSED_CLASS_FILES_TRUE@	  rm -f $(JAVA_HOME)/{lib,jre/lib}/$$f ; \
++@INSTALL_COMPRESSED_CLASS_FILES_TRUE@	  rm -f $(JAVA_HOME)/lib/$$f $(JAVA_HOME)/jre/lib/$$f ; \
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	  $(LN_S) $(pkgdatadir)/$$f $(JAVA_HOME)/lib/$$f ; \
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	  $(LN_S) ../../lib/$$f $(JAVA_HOME)/jre/lib/$$f ; \
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	done
+@@ -505,7 +505,7 @@
+ 
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@uninstall-hook:
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	for f in $(pkgdata_DATA) ; do \
+-@INSTALL_COMPRESSED_CLASS_FILES_TRUE@	  rm -f $(JAVA_HOME)/{lib,jre/lib}/$$f ; \
++@INSTALL_COMPRESSED_CLASS_FILES_TRUE@	  rm -f $(JAVA_HOME)/lib/$$f $(JAVA_HOME)/jre/lib/$$f ; \
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	done
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	-unlink $(JAVA_HOME)/jre/lib/rt.jar
+ @INSTALL_COMPRESSED_CLASS_FILES_TRUE@	-(cd $(JAVA_HOME) && rmdir -p lib jre/lib)