From 1b34b0959c93d57aac750435fc3f4a4b465c42fc Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 3 Jun 2005 17:16:09 +0000 Subject: [PATCH] [1] Add missing dependency on zip. [2] Convert to use javavmwrapper (installing to its own PREFIX). [3] Add to devel category, matching Sun JDKs. Submitted by: [1] krismail Reviewed by: [2,3] hq, previous version --- java/kaffe/Makefile | 14 ++++++++++---- java/kaffe/pkg-plist | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile index c7d324fbd8d2..3b71b0325acd 100644 --- a/java/kaffe/Makefile +++ b/java/kaffe/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaffe PORTVERSION= 1.1.5 -CATEGORIES= java +CATEGORIES= java devel MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/ MAINTAINER= anholt@FreeBSD.org @@ -17,8 +17,9 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ gmp.6:${PORTSDIR}/math/libgmp4 - -CONFLICTS= kaffe-1.[!1].* javavmwrapper-2.* +BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip +RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \ + javavm:${PORTSDIR}/java/javavmwrapper WRKSRC= ${WRKDIR}/kaffe-${PORTVERSION} @@ -30,7 +31,11 @@ USE_ICONV= yes LIBTOOLFLAGS= INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib --with-iconv-prefix=${LOCALBASE} +CONFIGURE_ARGS= CPPFLAGS=-I${LOCALBASE}/include \ + LDFLAGS=-L${LOCALBASE}/lib \ + --with-iconv-prefix=${LOCALBASE} +PREFIX= ${LOCALBASE}/kaffe +NO_MTREE= yes USE_GNOME= esound gtk20 libartlgpl2 WANT_GNOME= esound @@ -49,5 +54,6 @@ post-install: @${MKDIR} ${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/BUILD_ENVIRONMENT ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/license.terms ${DATADIR} + -@${LOCALBASE}/bin/registervm ${PREFIX}/bin/java .include diff --git a/java/kaffe/pkg-plist b/java/kaffe/pkg-plist index d0f80a82c825..fcea283d4e90 100644 --- a/java/kaffe/pkg-plist +++ b/java/kaffe/pkg-plist @@ -1,3 +1,4 @@ +@unexec %%LOCALBASE%%/bin/unregistervm %%PREFIX%%/bin/java bin/appletviewer bin/install-jar bin/jar @@ -80,10 +81,23 @@ lib/awt/font.properties %%DATADIR%%/license.terms share/locale/fr/LC_MESSAGES/kaffe.mo share/locale/zh_TW/LC_MESSAGES/kaffe.mo +@dirrm bin +@dirrm lib/awt +@dirrm lib @dirrm include/kaffe +@dirrm include @dirrm jre/bin @dirrm jre/lib/%%ARCH%% @dirrm jre/lib/security @dirrm jre/lib @dirrm jre +@dirrm man/man1 +@dirrm man @dirrm share/kaffe +@dirrm share/locale/fr/LC_MESSAGES +@dirrm share/locale/fr +@dirrm share/locale/zh_TW/LC_MESSAGES +@dirrm share/locale/zh_TW +@dirrm share/locale +@dirrm share +@exec %%LOCALBASE%%/bin/registervm %%PREFIX%%/bin/java