diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2008-05-22 09:55:38 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2008-05-22 09:55:38 +0000 |
commit | af49d11845d857785f58aee616ffe1781aa87d99 (patch) | |
tree | 62ef267269b67cdca18bb7511c6b10439688138a /java | |
parent | Update port: comms/bluez-firmware email maintainer, typo's (diff) |
- Fix build
Submitted by: pavbot/maintainer
Notes
Notes:
svn path=/head/; revision=213517
Diffstat (limited to 'java')
-rw-r--r-- | java/sablevm-classpath/Makefile | 6 | ||||
-rw-r--r-- | java/sablevm-classpath/pkg-plist | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile index 4a8190a079c0..6da8238641be 100644 --- a/java/sablevm-classpath/Makefile +++ b/java/sablevm-classpath/Makefile @@ -8,7 +8,7 @@ PORTNAME= sablevm-classpath PORTVERSION= 1.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sablevm @@ -37,11 +37,11 @@ CONFIGURE_ENV= CFLAGS="-I${PREFIX}/include -L${PREFIX}/lib -I${LOCALBASE}/includ .if defined(WITHOUT_ZIP) CONFIGURE_ARGS+= --with-compressed-classes=no -PLIST_SUB+= WITHOUT_ZIP="" +PLIST_SUB+= WITHOUT_ZIP="" WITH_ZIP="@comment " .else CONFIGURE_ARGS+= --with-compressed-classes=zip BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -PLIST_SUB+= WITHOUT_ZIP="@comment " +PLIST_SUB+= WITHOUT_ZIP="@comment " WITH_ZIP="" PLIST_FILES+= ${DATADIR_REL}/libclasspath.jar ${DATADIR_REL}/resources.jar .endif diff --git a/java/sablevm-classpath/pkg-plist b/java/sablevm-classpath/pkg-plist index af1c4326c9cb..08f6de4bb176 100644 --- a/java/sablevm-classpath/pkg-plist +++ b/java/sablevm-classpath/pkg-plist @@ -1,5 +1,10 @@ include/jawt.h include/jawt_md.h +%%WITH_ZIP%%lib/sablevm/lib/libclasspath.jar +%%WITH_ZIP%%lib/sablevm/lib/resources.jar +%%WITH_ZIP%%lib/sablevm/jre/lib/libclasspath.jar +%%WITH_ZIP%%lib/sablevm/jre/lib/resources.jar +%%WITH_ZIP%%lib/sablevm/jre/lib/rt.jar %%GTK2%%lib/sablevm-classpath/libgtkpeer-1.13.so %%GTK2%%lib/sablevm-classpath/libgtkpeer.la %%GTK2%%lib/sablevm-classpath/libgtkpeer.so @@ -5598,5 +5603,9 @@ lib/security/classpath.security %%WITHOUT_ZIP%%@dirrm %%DATADIR%%/META-INF/services %%WITHOUT_ZIP%%@dirrm %%DATADIR%%/META-INF %%WITHOUT_ZIP%%@dirrm %%DATADIR%% -@dirrm lib/security +@dirrmtry lib/security @dirrm lib/sablevm-classpath +%%WITH_ZIP%%@dirrm lib/sablevm/lib +%%WITH_ZIP%%@dirrm lib/sablevm/jre/lib +%%WITH_ZIP%%@dirrm lib/sablevm/jre +%%WITH_ZIP%%@dirrm lib/sablevm |