Consolidate and clean up compat11/compat12. Now there is only one pkg

(compat12), which uses MACHINE_ARCH and does not supply libkvm.

11 files changed, 21 insertions, 121 deletions

diff --git a/emulators/Makefile b/emulators/Makefile
index df7ee97b575..a056b11e10c 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 1998/08/12 22:44:31 tv Exp $
+# $NetBSD: Makefile,v 1.12 1998/08/13 02:17:37 tv Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/31 07:23:58 max Exp
 #
 
 #    SUBDIR += aftp
 #    SUBDIR += bsvc
-   SUBDIR += compat11
    SUBDIR += compat12
 #    SUBDIR += cpmemu
 #    SUBDIR += cpmtools
diff --git a/emulators/compat11/Makefile b/emulators/compat11/Makefile
deleted file mode 100644
index 8fff5c870a7..00000000000
--- a/emulators/compat11/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.8 1998/07/15 12:01:41 agc Exp $
-#
-
-DISTNAME=	compat11
-CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	_${ARCH}.tgz
-
-MAINTAINER=	tv@netbsd.org
-
-DEPENDS+=	compat12:../../emulators/compat12
-
-ONLY_FOR_ARCHS=	amiga atari hp300 i386 mac68k mvme68k pc532 sparc sun3
-
-MIRROR_DISTFILE= no
-HAS_CONFIGURE=	yes
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/usr/lib
-PLIST_SRC=	${WRKSRC}/.PLIST
-
-pre-configure:
-	@${INSTALL} -c -m 755 ${FILESDIR}/configure ${WRKSRC}
-
-.include "../../mk/bsd.pkg.mk"
-
-# for sun3x in 1.3.x, get sun3 package
-.if (${ARCH} == "sun3x")
-ARCH=	sun3
-.endif
diff --git a/emulators/compat11/files/configure b/emulators/compat11/files/configure
deleted file mode 100755
index 76ea2df55ab..00000000000
--- a/emulators/compat11/files/configure
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $NetBSD: configure,v 1.2 1998/05/08 21:33:21 tron Exp $
-# Configure package and create its Makefile and PLIST
-
-echo Configuring compat11 package
-
-for file in lib*.so*; do
-	echo >>Makefile "FILES+=$file"
-	echo >>.PLIST "lib/$file"
-done
-
-cat >>Makefile <<EOF
-
-install:
-	@echo Installing...
-	\${BSD_INSTALL_DATA} \${FILES} \${PREFIX}/lib
-EOF
-
-cat >>.PLIST <<EOF
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
-EOF
diff --git a/emulators/compat11/files/md5 b/emulators/compat11/files/md5
deleted file mode 100644
index 33f4df9124a..00000000000
--- a/emulators/compat11/files/md5
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:28 agc Exp $
-
-MD5 (compat11_amiga.tgz) = 877075de6cbe6bfb0c8827376b1850b8
-MD5 (compat11_atari.tgz) = 8dd47cf3088068b9ec2e09805615924c
-MD5 (compat11_hp300.tgz) = 5fe6d421a278b9a39d7d9dde9374d7f5
-MD5 (compat11_i386.tgz) = de73017fedbc06ca52853cf246d4f544
-MD5 (compat11_mac68k.tgz) = ae2a354b8f17d9f481e5b14f89b0798e
-MD5 (compat11_mvme68k.tgz) = f9b0582138acc8ad16fd70e4a8753e12
-MD5 (compat11_pc532.tgz) = c33ad5455ebfa047f25fd07c8de667e8
-MD5 (compat11_sparc.tgz) = 851a4d6dacdcd0ef07b4819aa627eb4e
-MD5 (compat11_sun3.tgz) = 3e27eb2b151b973c66667bb2f76f0c97
diff --git a/emulators/compat11/pkg/COMMENT b/emulators/compat11/pkg/COMMENT
deleted file mode 100644
index 7eb4dbcbf2e..00000000000
--- a/emulators/compat11/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Shared libraries for NetBSD 1.1 (and earlier) compatibility
diff --git a/emulators/compat11/pkg/DESCR b/emulators/compat11/pkg/DESCR
deleted file mode 100644
index a6460807eb3..00000000000
--- a/emulators/compat11/pkg/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.1 and earlier
-releases.  You still need the options COMPAT_11 and COMPAT_12 in your
-kernel configuration (and probably others; see options(4) for more
-information) to make use of NetBSD 1.1 binaries. 
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index ae7f594acf4..42caabe6d55 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.7 1998/07/15 12:01:42 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/08/13 02:17:39 tv Exp $
 #
 
-DISTNAME=	compat12
+DISTNAME=	compat12-1.2.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=	_${ARCH}.tgz
+EXTRACT_SUFX=	-${MACHINE_ARCH}.tar.gz
 
 MAINTAINER=	tv@netbsd.org
 
-ONLY_FOR_ARCHS=	amiga atari hp300 i386 mac68k mvme68k pc532 sparc sun3
+ONLY_FOR_ARCHS=	i386 m68k ns32k sparc
 
-MIRROR_DISTFILE= no
-HAS_CONFIGURE=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/usr/lib
-PLIST_SRC=	${WRKSRC}/.PLIST
 
-post-extract:
-	@${INSTALL} -c -m 755 ${FILESDIR}/configure ${WRKSRC}
+do-install:
+	${INSTALL_DATA} ${WRKDIR}/lib*.so* ${PREFIX}/lib/
 
 .include "../../mk/bsd.pkg.mk"
-
-# for sun3x in 1.3.x, get sun3 package
-.if (${ARCH} == "sun3x")
-ARCH=		sun3
-.endif
diff --git a/emulators/compat12/files/configure b/emulators/compat12/files/configure
deleted file mode 100755
index d1c7d2195ed..00000000000
--- a/emulators/compat12/files/configure
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $NetBSD: configure,v 1.2 1998/05/08 21:22:35 tron Exp $
-# Configure package and create its Makefile and PLIST
-
-echo Configuring compat12 package
-
-for file in lib*.so*; do
-	echo >>Makefile "FILES+=$file"
-	echo >>.PLIST "lib/$file"
-done
-
-cat >>Makefile <<EOF
-
-install:
-	@echo Installing...
-	\${BSD_INSTALL_DATA} \${FILES} \${PREFIX}/lib
-EOF
-
-cat >>.PLIST <<EOF
-@exec /sbin/ldconfig || /usr/bin/true
-@unexec /sbin/ldconfig || /usr/bin/true
-EOF
diff --git a/emulators/compat12/files/md5 b/emulators/compat12/files/md5
index 61fd52b1d1c..43b40d71590 100644
--- a/emulators/compat12/files/md5
+++ b/emulators/compat12/files/md5
@@ -1,11 +1,6 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:28 agc Exp $
+$NetBSD: md5,v 1.3 1998/08/13 02:17:39 tv Exp $
 
-MD5 (compat12_amiga.tgz) = d9d2939fc4607c498bddb34c47e051f5
-MD5 (compat12_atari.tgz) = 258286a20c74f07eeaf770c159f65cad
-MD5 (compat12_hp300.tgz) = 76f7eda9ecd6830ba52ec748e2db7d9a
-MD5 (compat12_i386.tgz) = 1be7cc9e943c3010ea32d8c3e188db4a
-MD5 (compat12_mac68k.tgz) = ef69cadb5b7b4a9389060fa51949294a
-MD5 (compat12_mvme68k.tgz) = 7acb6bbdafd8412e8a467c8923c596ee
-MD5 (compat12_pc532.tgz) = 5ee4752065e2431812fb7201e3be90ea
-MD5 (compat12_sparc.tgz) = 687bd864d1ee5436f349f58cb59384f0
-MD5 (compat12_sun3.tgz) = 7765a72206b21a222d1e778c3cb7cabe
+MD5 (compat12-i386.tar.gz) = 25497f20330197262e513ebfb8fa9247
+MD5 (compat12-m68k.tar.gz) = 7711595a3916be92d518f5904ea55f92
+MD5 (compat12-ns32k.tar.gz) = 415f7a3d735036908c358814d28d82ba
+MD5 (compat12-sparc.tar.gz) = 2f28e7761826eb69ba03c0426e28fbc6
diff --git a/emulators/compat12/pkg/DESCR b/emulators/compat12/pkg/DESCR
index 61691c032f8..07ae50cd3db 100644
--- a/emulators/compat12/pkg/DESCR
+++ b/emulators/compat12/pkg/DESCR
@@ -1,5 +1,5 @@
 This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.2 (and 1.2.1) and
-earlier releases.  You still need the option COMPAT_12 in your kernel
-configuration (and probably others; see options(4) for more information) 
-to make use of NetBSD 1.2 binaries. 
+dynamically linked executables compiled under NetBSD 1.1 through 1.2.1. 
+You still need the option COMPAT_12 in your kernel configuration (and
+probably others; see options(4) for more information) to make use of
+NetBSD 1.2 binaries. 
diff --git a/emulators/compat12/pkg/PLIST b/emulators/compat12/pkg/PLIST
new file mode 100644
index 00000000000..46b19bba62f
--- /dev/null
+++ b/emulators/compat12/pkg/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 1998/08/13 02:17:39 tv Exp $
+lib/libedit.so.0.0
+lib/libg++.so.2.0
+lib/libg++.so.3.0
+lib/libutil.so.3.2