Use a more easily scalable method of removing files that are shared with

the JRE package.  Also clean up the PLIST so that this package deinstalls
cleanly on i386.

3 files changed, 53 insertions, 24 deletions

diff --git a/lang/blackdown-jdk13/Makefile b/lang/blackdown-jdk13/Makefile
index e6902c7aa8d..04dff4efb96 100644
--- a/lang/blackdown-jdk13/Makefile
+++ b/lang/blackdown-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/11/25 14:08:22 schmonz Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/29 11:02:58 jlam Exp $
 #
 
 BASENAME=	j2sdk
@@ -11,24 +11,23 @@ DEPENDS=	blackdown-jre13>=1:../../lang/blackdown-jre13
 
 .include "../../lang/blackdown-jre13/Makefile.common"
 
-PLIST_SRC=	${PKGDIR}/PLIST
+PLIST_SRC=	# empty
 .if ${BLACKDOWN_ARCH} == "i386"
 PLIST_SRC+=	${PKGDIR}/PLIST.i386
 .endif
+PLIST_SRC+=	${PKGDIR}/PLIST
 
-# these are part of JRE
+# Remove parts that are in common with the JRE.
+#
 post-extract:
-	cd ${WRKSRC}/jre/bin;						\
-	for i in * .java_wrapper; do					\
-		if [ -f $$i ]; then					\
-			${RM} -f $$i ${WRKSRC}/bin/$$i;			\
-		else							\
+	common=`${SED} -e "s,\\$${BLACKDOWN_ARCH},${BLACKDOWN_ARCH},g" ${FILESDIR}/common | ${AWK} '/^#.*/ { next } /^$$/ { next } { print }'`; \
+	cd ${WRKSRC}; for i in $$common; do				\
+		if [ -d $$i ]; then					\
 			${RM} -rf $$i;					\
-		fi							\
+		else							\
+			${RM} -f $$i;					\
+		fi;							\
 	done
-	${RM} -rf ${WRKSRC}/jre
-	${RM} -f ${WRKSRC}/LICENSE ${WRKSRC}/CHANGES			\
-		${WRKSRC}/COPYRIGHT ${WRKSRC}/README ${WRKSRC}/INSTALL
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/lang/blackdown-jdk13/PLIST b/lang/blackdown-jdk13/PLIST
index 862e607b198..315f1a6e350 100644
--- a/lang/blackdown-jdk13/PLIST
+++ b/lang/blackdown-jdk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/11/25 14:08:22 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/01/29 11:02:58 jlam Exp $
 README.html
 bin/HtmlConverter
 bin/${BLACKDOWN_ARCH}/green_threads/appletviewer
@@ -626,12 +626,6 @@ man/man1/native2ascii.1
 man/man1/rmic.1
 man/man1/serialver.1
 src.jar
-@unexec ${RMDIR} %D/man/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ja/man1 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ja 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/man/ 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/${BLACKDOWN_ARCH} 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib 2>/dev/null || ${TRUE}
 @dirrm include/linux
 @dirrm include-old/linux
 @dirrm include-old
@@ -731,8 +725,3 @@ src.jar
 @dirrm demo/applets/Animator
 @dirrm demo/applets
 @dirrm demo
-@unexec ${RMDIR} %D/bin/${BLACKDOWN_ARCH}/native_threads 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/bin/${BLACKDOWN_ARCH}/green_threads 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/bin/${BLACKDOWN_ARCH} 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/bin 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D 2>/dev/null || ${TRUE}
diff --git a/lang/blackdown-jdk13/files/common b/lang/blackdown-jdk13/files/common
new file mode 100644
index 00000000000..79518a4412b
--- /dev/null
+++ b/lang/blackdown-jdk13/files/common
@@ -0,0 +1,41 @@
+# $NetBSD: common,v 1.1 2003/01/29 11:02:59 jlam Exp $
+
+CHANGES
+COPYRIGHT
+INSTALL
+LICENSE
+README
+bin/.java_wrapper
+bin/JavaPluginControlPanel
+bin/awt_robot
+bin/j2sdk-config
+bin/java
+bin/keytool
+bin/policytool
+bin/rmid
+bin/rmiregistry
+bin/tnameserv
+bin/${BLACKDOWN_ARCH}/green_threads/java
+bin/${BLACKDOWN_ARCH}/green_threads/keytool
+bin/${BLACKDOWN_ARCH}/green_threads/policytool
+bin/${BLACKDOWN_ARCH}/green_threads/rmid
+bin/${BLACKDOWN_ARCH}/green_threads/rmiregistry
+bin/${BLACKDOWN_ARCH}/green_threads/tnameserv
+bin/${BLACKDOWN_ARCH}/native_threads/java
+bin/${BLACKDOWN_ARCH}/native_threads/java_vm
+bin/${BLACKDOWN_ARCH}/native_threads/keytool
+bin/${BLACKDOWN_ARCH}/native_threads/policytool
+bin/${BLACKDOWN_ARCH}/native_threads/rmid
+bin/${BLACKDOWN_ARCH}/native_threads/rmiregistry
+bin/${BLACKDOWN_ARCH}/native_threads/tnameserv
+jre
+man/ja_JP.eucJP/man1/java.1.gz
+man/ja_JP.eucJP/man1/keytool.1.gz
+man/ja_JP.eucJP/man1/rmid.1.gz
+man/ja_JP.eucJP/man1/rmiregistry.1.gz
+man/ja_JP.eucJP/man1/tnameserv.1.gz
+man/man1/java.1.gz
+man/man1/keytool.1.gz
+man/man1/rmid.1.gz
+man/man1/rmiregistry.1.gz
+man/man1/tnameserv.1.gz