diff options
author | Herve Quiroz <hq@FreeBSD.org> | 2004-12-24 15:04:14 +0000 |
---|---|---|
committer | Herve Quiroz <hq@FreeBSD.org> | 2004-12-24 15:04:14 +0000 |
commit | c97a0ab8d14c4393781eaea90941a284b94ddcdd (patch) | |
tree | 82e8d7d30f982d85d81cb3219b991b75f4a1671b | |
parent | - Enable GD support for nice graphs (diff) |
- Register CONFLICTS with java/kaffe and java/javavmwrapper
- Use %%DATADIR%% to calm portlint
Notes
Notes:
svn path=/head/; revision=125072
-rw-r--r-- | java/kaffe-devel/Makefile | 2 | ||||
-rw-r--r-- | java/kaffe-devel/pkg-plist | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/kaffe-devel/Makefile b/java/kaffe-devel/Makefile index 3834489843de..e7ac1505f71b 100644 --- a/java/kaffe-devel/Makefile +++ b/java/kaffe-devel/Makefile @@ -20,6 +20,8 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ gmp.6:${PORTSDIR}/math/libgmp4 +CONFLICTS= kaffe-1.[!1].* javavmwrapper-2.* + WRKSRC= ${WRKDIR}/kaffe-${PORTVERSION} NOT_FOR_ARCHS= amd64 alpha diff --git a/java/kaffe-devel/pkg-plist b/java/kaffe-devel/pkg-plist index 819dcdc787e8..088ef0ae38d7 100644 --- a/java/kaffe-devel/pkg-plist +++ b/java/kaffe-devel/pkg-plist @@ -68,8 +68,8 @@ jre/lib/%%ARCH%%/libzip.so jre/lib/security/java.security jre/lib/rt.jar lib/kjc.jar -share/kaffe/BUILD_ENVIRONMENT -share/kaffe/license.terms +%%DATADIR%%/BUILD_ENVIRONMENT +%%DATADIR%%/license.terms @dirrm include/kaffe @dirrm jre/bin @dirrm jre/lib/%%ARCH%% |