Note that some of the installed files are config files and use

bsd.pkg.install.mk to handle the file copying and directory handling.
Bump PKGREVISION of lang/kaffe to 1.

4 files changed, 46 insertions, 12 deletions

diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 224cbcb392e..a3c27628037 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2003/01/26 01:00:22 fredb Exp $
+# $NetBSD: Makefile,v 1.44 2003/01/29 10:58:50 jlam Exp $
 #
 
 DISTNAME=		kaffe-1.0.7
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.kaffe.org/pub/kaffe/v1.0.x-production/
 
@@ -9,9 +10,10 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.kaffe.org/
 COMMENT=		Virtual machine capable of running Java(tm) code
 
-USE_BUILDLINK2=		YES
-USE_X11=		YES
-USE_LIBTOOL=		YES
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_X11=		yes
+USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 TEST_TARGET=		check
 
@@ -21,7 +23,14 @@ GNU_CONFIGURE=		yes
 CPPFLAGS+=		-Dunix
 
 JVM_HOME=		${LOCALBASE}/java/kaffe
-NO_MTREE=		# defined, since we change PREFIX below
+NO_MTREE=		yes	# since we change PREFIX below
+
+OWN_DIRS=	${PREFIX}
+OWN_DIRS+=	${PREFIX}/jre
+OWN_DIRS+=	${PREFIX}/jre/lib
+OWN_DIRS+=	${PREFIX}/jre/lib/security
+SUPPORT_FILES=	${PREFIX}/jre/lib/security/java.security.default	\
+		${PREFIX}/jre/lib/security/java.security
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/kaffe/PLIST b/lang/kaffe/PLIST
index f359c30dbbf..cf83be1162d 100644
--- a/lang/kaffe/PLIST
+++ b/lang/kaffe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/10/13 07:33:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/29 10:58:50 jlam Exp $
 bin/appletviewer
 bin/install-jar
 bin/jar
@@ -68,7 +68,7 @@ jre/lib/microsoft.jar
 jre/lib/pjava.jar
 jre/lib/rmi.jar
 jre/lib/rt.jar
-jre/lib/security/java.security
+jre/lib/security/java.security.default
 jre/lib/servlet.jar
 lib/kjc.jar
 lib/tools.jar
@@ -77,12 +77,8 @@ man/man1/kaffe.1
 @dirrm man/man1
 @dirrm man
 @dirrm lib
-@dirrm jre/lib/security
 @dirrm jre/lib/${MACHINE_ARCH}
-@dirrm jre/lib
 @dirrm jre/bin
-@dirrm jre
 @dirrm include/kaffe
 @dirrm include
 @dirrm bin
-@unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo
index 24f3307ad48..62b57c17c8b 100644
--- a/lang/kaffe/distinfo
+++ b/lang/kaffe/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/07/27 21:26:21 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2003/01/29 10:58:50 jlam Exp $
 
 SHA1 (kaffe-1.0.7.tar.gz) = 4f839362b9e1fbdb6c7af8f69663e5b0bf922e8e
 Size (kaffe-1.0.7.tar.gz) = 4248252 bytes
 SHA1 (patch-aa) = 66da985c6ba6891adca4c73351f990081e24e4e4
 SHA1 (patch-ab) = 5b68b671ed1a455cbe76bc316d9ea278fdf67349
+SHA1 (patch-ac) = 5947ff51d8db1988b57a609febf19c9d74d4c614
diff --git a/lang/kaffe/patches/patch-ac b/lang/kaffe/patches/patch-ac
new file mode 100644
index 00000000000..87e9cdbf400
--- /dev/null
+++ b/lang/kaffe/patches/patch-ac
@@ -0,0 +1,28 @@
+$NetBSD: patch-ac,v 1.3 2003/01/29 10:58:51 jlam Exp $
+
+--- libraries/clib/security/Makefile.in.orig	Wed Jan 29 02:57:21 2003
++++ libraries/clib/security/Makefile.in
+@@ -268,18 +268,18 @@ install-securityDATA: $(security_DATA)
+ 	$(mkinstalldirs) $(DESTDIR)$(securitydir)
+ 	@list='$(security_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p; \
++	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p.default"; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(securitydir)/$$p.default; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p; \
++	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p.default"; \
++	    $(INSTALL_DATA) $$p $(DESTDIR)$(securitydir)/$$p.default; \
+ 	  fi; fi; \
+ 	done
+ 
+ uninstall-securityDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	list='$(security_DATA)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(securitydir)/$$p; \
++	  rm -f $(DESTDIR)$(securitydir)/$$p.default; \
+ 	done
+ 
+ tags: TAGS