aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-05-25 20:13:29 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-05-25 20:13:29 +0000
commitf52b04d279fa88982e932520ef8cfae98adec8ab (patch)
tree9beea76fe4cf7f10978d2e19494ca5d345137c09
parent1e9e34311daeef44408e107f20837dcede5524e1 (diff)
downloadports-f52b04d279fa88982e932520ef8cfae98adec8ab.tar.gz
ports-f52b04d279fa88982e932520ef8cfae98adec8ab.zip
Notes
-rw-r--r--java/sablevm-classpath/Makefile1
-rw-r--r--java/sablevm-classpath/pkg-plist4
2 files changed, 3 insertions, 2 deletions
diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile
index 6da8238641be..81f21cd1bf20 100644
--- a/java/sablevm-classpath/Makefile
+++ b/java/sablevm-classpath/Makefile
@@ -42,7 +42,6 @@ PLIST_SUB+= WITHOUT_ZIP="" WITH_ZIP="@comment "
CONFIGURE_ARGS+= --with-compressed-classes=zip
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
PLIST_SUB+= WITHOUT_ZIP="@comment " WITH_ZIP=""
-PLIST_FILES+= ${DATADIR_REL}/libclasspath.jar ${DATADIR_REL}/resources.jar
.endif
.if defined(WITHOUT_GTK2)
diff --git a/java/sablevm-classpath/pkg-plist b/java/sablevm-classpath/pkg-plist
index 08f6de4bb176..1b9804652069 100644
--- a/java/sablevm-classpath/pkg-plist
+++ b/java/sablevm-classpath/pkg-plist
@@ -30,6 +30,8 @@ lib/sablevm-classpath/libjavautil.so
%%GTK2%%lib/sablevm-classpath/libjawtgnu.la
%%GTK2%%lib/sablevm-classpath/libjawtgnu.so
lib/security/classpath.security
+%%WITH_ZIP%%%%DATADIR%%/libclasspath.jar
+%%WITH_ZIP%%%%DATADIR%%/resources.jar
%%WITHOUT_ZIP%%%%DATADIR%%/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider
%%WITHOUT_ZIP%%%%DATADIR%%/META-INF/services/javax.xml.parsers.DocumentBuilderFactory
%%WITHOUT_ZIP%%%%DATADIR%%/META-INF/services/javax.xml.parsers.SAXParserFactory
@@ -5602,7 +5604,7 @@ lib/security/classpath.security
%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/gnu
%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/META-INF/services
%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/META-INF
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%
+@dirrm %%DATADIR%%
@dirrmtry lib/security
@dirrm lib/sablevm-classpath
%%WITH_ZIP%%@dirrm lib/sablevm/lib