Use REQD_DIRS instead of MAKE_DIRS for directories under ${PREFIX} so

that these directories will be conditionally removed (based on reference
counts), regardless of the value of PKG_CONFIG.  Bump the PKGREVISION
for packages that were modified as a result.

12 files changed, 24 insertions, 22 deletions

diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index c7fda342552..51dff9146c5 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/08/20 19:16:23 jlam Exp $
 #
 
 VERSION=	1.1.8
 PKGNAME=	jdk-${VERSION}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/ \
 		ftp://ftp.de.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 54ea1406d2f..91277af211b 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2005/08/20 19:16:23 jlam Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		6
+PKGREVISION=		7
 
 CONFLICTS+=		kaffe-nox11-[0-9]*
 
diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile
index 2d4d87fef03..234e86a8854 100644
--- a/lang/sablevm-classpath-gui/Makefile
+++ b/lang/sablevm-classpath-gui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:18 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/20 19:16:23 jlam Exp $
 #
 
 .include "../../lang/sablevm-classpath/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT+=	(GUI libraries)
 
 DEPENDS+=	sablevm-classpath>=1.1.3nb1:../../lang/sablevm-classpath
diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile
index 7c259db9c7e..fee410675c9 100644
--- a/lang/sablevm-classpath/Makefile
+++ b/lang/sablevm-classpath/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:15:02 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/20 19:16:23 jlam Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 INFO_FILES=		hacking.info vmintegration.info
 
diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile
index fea461c700c..47609005c45 100644
--- a/lang/sablevm/Makefile
+++ b/lang/sablevm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/20 19:16:23 jlam Exp $
 #
 
 DISTNAME=	sablevm-1.1.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sablevm/} \
 		http://devel.sablevm.org/download/1.1.3/
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 0afe3e3bbbb..3da67aa4508 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2005/01/30 23:18:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/20 19:16:23 jlam Exp $
 
 DISTNAME=	j2sdk-1_3_1_15-linux-i586
 PKGNAME=	sun-jdk13-1.0.15
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Development Kit 1.3.1
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 7e5b5c73883..7b84aa9e7e6 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2005/04/18 15:39:04 jschauma Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/20 19:16:23 jlam Exp $
 
 DISTNAME=	j2sdk-1_4_2_08-linux-i586
 PKGNAME=	sun-jdk14-2.8
-PKGREVISION=	# none
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index 112f5444c15..80ddd697df4 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 18:23:16 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/20 19:16:23 jlam Exp $
 
 DISTNAME=	jdk-1_5_0_04-linux-i586
 PKGNAME=	sun-jdk15-5.0.4
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.5.0
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index d53a3159ecb..97c7cafd7d7 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/20 19:16:23 jlam Exp $
 
 DISTNAME=	j2re-1_3_1_15-linux-i586
 PKGNAME=	sun-jre13-1.0.15
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index ea1972a58ee..5b178909b41 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.27 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/20 19:16:23 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=	j2re-1_4_2_08-linux-i586
 PKGNAME=	sun-jre14-2.8
-PKGREVISION=	# none
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.2
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index 7eb26596334..b80aae5c630 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/20 19:16:23 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=	jre-1_5_0_04-linux-i586
 PKGNAME=	sun-jre15-5.0.4
+PKGREVISION=	1
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.5.0
diff --git a/lang/win32-jdk/Makefile b/lang/win32-jdk/Makefile
index 0c66b4f46fa..3d351427251 100644
--- a/lang/win32-jdk/Makefile
+++ b/lang/win32-jdk/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2005/01/30 23:18:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/20 19:16:23 jlam Exp $
 #
 # Interix-only "JDK" for pkgsrc, implemented as a script wrapper around the
 # Win32 Sun JDK/JRE.
 #
 
 DISTNAME=		win32-jdk-0.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang java
 MASTER_SITES=		# empty
 DISTFILES=		# empty