* Support netbsd-* as a valid platform in EMUL_PLATFORMS. Use the

  pkgsrc/emulator/compat* and pkgsrc/emulator/netbsd32_compat* packages
  to provide the necessary shared libraries to run dynamically linked
  NetBSD binaries from the days of yore.

* Add some additional compat* packages for completeness:

	compat15, compat20, compat30

* Modify the compat* packages so that "compatNM" only provides files
  that aren't in "NetBSD-N.(M+1)".  For example, compat12 only provides
  files that don't exist in NetBSD-1.3.x, compat13 only provides files
  that don't exist in NetBSD-1.4.x, etc.

  As a result, if you are running NetBSD-3.0/alpha and want to run a
  1.3 dynamically linked binary, there is an automatic dependency
  chain that causes the following packages to be installed:

	compat13, compat14, compat15, compat16, compat20

  There are some deviations from this dependency chain on platforms
  that have changed executable formats, e.g. i386, m68, sparc, etc.
  However, in general pkgsrc will require that you have the necessary
  COMPAT_* options in your kernel to match the installed compat*
  packages.  This restriction is an artificial one imposed by pkgsrc,
  but allows for a single set of distfiles to be used on all versions
  of NetBSD.

* Provide compat* package support for every supported architecture
  of NetBSD.  Verily, it is now possible to run 1.2 binaries on
  NetBSD-1.5.3/pc532 by installing the compat12 package from pkgsrc.
  Rejoice, one and all!

* The netbsd32_compat* packages mirror the corresponding compat*
  packages for use by sparc64 and x86_64 to allow running 32-bit
  binaries with COMPAT_NETBSD32 kernel support.  The "extras" packages
  supply the additional shared libraries from the corresponding release
  of NetBSD so that the set of files in /emul/netbsd32 will be complete.

* pkgsrc/emulators/compat_netbsd contains infrastructure files shared
  by all of the compat* packages.

15 files changed, 134 insertions, 157 deletions

diff --git a/emulators/compat13/DEINSTALL b/emulators/compat13/DEINSTALL
deleted file mode 100644
index 71e6814ac9d..00000000000
--- a/emulators/compat13/DEINSTALL
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 18:57:03 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_LIBDIR=@COMPAT_LIBDIR@
-
-	if [ "${MACHINE_ARCH}" = "mipsel" ]
-	then
-		${RM} -f ${PKG_PREFIX}/libexec/ld.so
-		${RMDIR} -p ${PKG_PREFIX}/libexec 2>/dev/null || ${TRUE}
-	fi
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_LIBDIR} 2>/dev/null || ${TRUE}
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat13/DESCR b/emulators/compat13/DESCR
index 555ddc7bf08..94bb0fab95c 100644
--- a/emulators/compat13/DESCR
+++ b/emulators/compat13/DESCR
@@ -1,4 +1,2 @@
-This package supplies the user files necessary for full compatibility with
-dynamically linked executables compiled under NetBSD 1.3.  You still need
-the option COMPAT_13 in your kernel configuration (and probably others;
-see options(4) for more information) to make use of NetBSD 1.3 binaries.
+This package supplies the user files needed to run dynamically linked
+executables compiled under NetBSD 1.3.
diff --git a/emulators/compat13/INSTALL b/emulators/compat13/INSTALL
deleted file mode 100644
index f3e467cb325..00000000000
--- a/emulators/compat13/INSTALL
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 18:57:03 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	if [ "${MACHINE_ARCH}" = "mipsel" ]
-	then
-		${LN} -sf ld.elf_so /usr/libexec/ld.so
-	fi
-
-	# Only create the symlink on certain platform/object combinations.
-	#
-	create_emul_symlink=0
-	if [ "${OBJECT_FMT}" = "ELF" ] && \
-	   [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "sparc" ]
-	then
-		create_emul_symlink=1
-	fi
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/out
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=aout
-		if [ "`cd /etc && cd ${PKG_PREFIX}/emul/$emul 2>/dev/null && pwd -P`" \
-		     != "`cd / && cd /emul/$emul 2>/dev/null && pwd -P`" ]
-		then
-			if [ -e /emul/$emul -o -L /emul/$emul ] || \
-			   [ \( -e /emul -o -L /emul \) -a ! -d /emul ]
-			then
-				${CAT} <<EOF
-==============================================================================
-	IMPORTANT:  You must create a symbolic link from /emul/$emul
-	to ${PKG_PREFIX}/emul/$emul in order for this package to work
-	properly.
-
-	(It seems there is something else located at /emul/$emul.)
-==============================================================================
-EOF
-			else
-				${MKDIR} -p /emul
-				${LN} -sf ${PKG_PREFIX}/emul/$emul /emul/$emul
-			fi
-		fi
-	fi
-
-	# Regenerate the shared library cache.  This should work on either
-	# a.out or on ELF with the 1.5 release.
-	#
-	( @LDCONFIG@ || ${TRUE} ) >/dev/null 2>&1
-	;;
-esac
diff --git a/emulators/compat13/MESSAGE b/emulators/compat13/MESSAGE
new file mode 100644
index 00000000000..12089785dc3
--- /dev/null
+++ b/emulators/compat13/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/08/21 22:49:06 jlam Exp $
+
+The COMPAT_13 option must be included in the kernel configuration (and
+possibly others; see options(4) for more information) to make use of
+NetBSD 1.3 binaries.
+===========================================================================
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index b9684342741..9fa24679568 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,53 +1,32 @@
-# $NetBSD: Makefile,v 1.28 2006/10/19 19:37:38 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.29 2007/08/21 22:49:06 jlam Exp $
 
-DISTNAME=		compat13-${MACHINE_ARCH}${PKGMINOR}
-PKGNAME=		compat13-1.3.3
-PKGREVISION=		2
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
+DISTNAME=		compat13	# overridden below
+NETBSD_VERSION=		1.3
+PKGREVISION=		3
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.3/index.html
-COMMENT=		Shared libraries for NetBSD 1.3 (and earlier) compatibility
-
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-arm NetBSD-*-arm32	\
-			NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-mipsel	\
-			NetBSD-*-ns32k NetBSD-*-sparc
-NOT_FOR_PLATFORM=	NetBSD-1.3*-*
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-FILES_SUBST+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
-FILES_SUBST+=		OBJECT_FMT=${OBJECT_FMT:Q}
-FILES_SUBST+=		LDCONFIG=${LDCONFIG:Q}
-
-.include "../../mk/bsd.prefs.mk"
-
-# This installs in /usr (or /emul/aout/usr) to avoid dynamic linker annoyances
-.if ${OBJECT_FMT} == "ELF" && \
-    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")
-EMULSUBDIR=		emul/aout
-COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
-.elif ${OPSYS} == "NetBSD"
-LOCALBASE=		/usr
-COMPAT_LIBDIR=		lib
-.endif
+COMMENT=		Shared libraries for NetBSD 1.3 compatibility
+
+EMUL_PLATFORMS=		netbsd-alpha netbsd-arm netbsd-i386 netbsd-m68k	\
+			netbsd-mipsel netbsd-ns32k netbsd-sparc
+
+ONLY_FOR_PLATFORM=	NetBSD-1.3[A-Z]*-* NetBSD-1.[4-9]*-*		\
+			NetBSD-[2-9]*-* NetBSD-[1-9][0-9]*-*
 
-.if ${MACHINE_ARCH} == "alpha"
-PKGMINOR=	nb1
+.include "../../emulators/compat_netbsd/Makefile.common"
+
+.if (${EMUL_PLATFORM} == "netbsd-arm")
+DISTNAME=		compat13-${EMUL_ARCH}-1.3.2
 .else
-PKGMINOR=
+DISTNAME=		compat13-${EMUL_ARCH}-1.3.3
 .endif
 
-PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR:Q}
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${COMPAT_LIBDIR}
-	${INSTALL_DATA} ${WRKDIR}/lib*.so* ${PREFIX}/${COMPAT_LIBDIR}
+# We need to depend on the compat14 package to supply shared libraries
+# missing from compat13 on NetBSD>1.4.
+#
+.if empty(OS_VERSION:M0.[0-9]*) && empty(OS_VERSION:M1.[0-3]*) && \
+    empty(OS_VERSION:M1.4) && empty(OS_VERSION:M1.4.*)
+DEPENDS+=		compat14>=1.4:../../emulators/compat14
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat13/PLIST b/emulators/compat13/PLIST
deleted file mode 100644
index f474e8dee17..00000000000
--- a/emulators/compat13/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:25 zuntum Exp $
-${COMPAT_LIBDIR}/libedit.so.1.0
-${COMPAT_LIBDIR}/libg++.so.4.0
-${COMPAT_LIBDIR}/libstdc++.so.0.1
-${COMPAT_LIBDIR}/libutil.so.4.2
diff --git a/emulators/compat13/PLIST.ELF b/emulators/compat13/PLIST.ELF
new file mode 100644
index 00000000000..5e59b3a4c0c
--- /dev/null
+++ b/emulators/compat13/PLIST.ELF
@@ -0,0 +1,15 @@
+@comment $NetBSD: PLIST.ELF,v 1.1 2007/08/21 22:49:06 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libamu.so.0
+${EMULSUBDIRSLASH}usr/lib/libamu.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libbfd.so.0
+${EMULSUBDIRSLASH}usr/lib/libbfd.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libedit.so.1
+${EMULSUBDIRSLASH}usr/lib/libedit.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libg++.so.4
+${EMULSUBDIRSLASH}usr/lib/libg++.so.4.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.0.1
+${EMULSUBDIRSLASH}usr/lib/libutil.so.4
+${EMULSUBDIRSLASH}usr/lib/libutil.so.4.2
+@dirrm ${EMULSUBDIRSLASH}usr/lib
+@dirrm ${EMULSUBDIRSLASH}usr
diff --git a/emulators/compat13/PLIST.a.out b/emulators/compat13/PLIST.a.out
new file mode 100644
index 00000000000..cbb260e2b64
--- /dev/null
+++ b/emulators/compat13/PLIST.a.out
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST.a.out,v 1.1 2007/08/21 22:49:06 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libamu.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libedit.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libg++.so.4.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.0.1
+${EMULSUBDIRSLASH}usr/lib/libutil.so.4.2
+@dirrm ${EMULSUBDIRSLASH}usr/lib
+@dirrm ${EMULSUBDIRSLASH}usr
diff --git a/emulators/compat13/PLIST.alpha b/emulators/compat13/PLIST.alpha
deleted file mode 100644
index a26f534715f..00000000000
--- a/emulators/compat13/PLIST.alpha
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.alpha,v 1.1 2001/10/31 23:55:50 zuntum Exp $
-${COMPAT_LIBDIR}/libcurses.so.2.1
-${COMPAT_LIBDIR}/libcurses.so.2
diff --git a/emulators/compat13/PLIST.i386 b/emulators/compat13/PLIST.i386
new file mode 100644
index 00000000000..3a0c1f12ed9
--- /dev/null
+++ b/emulators/compat13/PLIST.i386
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.i386,v 1.1 2007/08/21 22:49:07 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libbfd.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libkvm.so.4.0
diff --git a/emulators/compat13/PLIST.m68k b/emulators/compat13/PLIST.m68k
new file mode 100644
index 00000000000..acd4151bc8b
--- /dev/null
+++ b/emulators/compat13/PLIST.m68k
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.m68k,v 1.1 2007/08/21 22:49:07 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libbfd.so.0.0
diff --git a/emulators/compat13/PLIST.mipsel b/emulators/compat13/PLIST.mipsel
new file mode 100644
index 00000000000..b1ff70ee988
--- /dev/null
+++ b/emulators/compat13/PLIST.mipsel
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.mipsel,v 1.1 2007/08/21 22:49:07 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libkvm.so.4
+${EMULSUBDIRSLASH}usr/lib/libkvm.so.4.0
diff --git a/emulators/compat13/PLIST.sparc b/emulators/compat13/PLIST.sparc
new file mode 100644
index 00000000000..dabaabef6cb
--- /dev/null
+++ b/emulators/compat13/PLIST.sparc
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.sparc,v 1.1 2007/08/21 22:49:07 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libbfd.so.0.0
diff --git a/emulators/compat13/distinfo b/emulators/compat13/distinfo
index b4547cb8c32..127657ab272 100644
--- a/emulators/compat13/distinfo
+++ b/emulators/compat13/distinfo
@@ -1,26 +1,23 @@
-$NetBSD: distinfo,v 1.6 2006/05/11 18:58:40 veego Exp $
+$NetBSD: distinfo,v 1.7 2007/08/21 22:49:07 jlam Exp $
 
-SHA1 (compat13-alphanb1.tar.gz) = 4e1fc306eb880dc3ba8a0906406da082fd6e6ca5
-RMD160 (compat13-alphanb1.tar.gz) = c09fa92bdef88fe7e5dd5ca28dfe13d0e045b840
-Size (compat13-alphanb1.tar.gz) = 478199 bytes
-SHA1 (compat13-arm.tar.gz) = 0dcae05d5ec15968665a71ab0a058f3b2a3d2f87
-RMD160 (compat13-arm.tar.gz) = 28232358015d5ab0a06ad0b5a7600426223d58b6
-Size (compat13-arm.tar.gz) = 247143 bytes
-SHA1 (compat13-arm32.tar.gz) = 0dcae05d5ec15968665a71ab0a058f3b2a3d2f87
-RMD160 (compat13-arm32.tar.gz) = 28232358015d5ab0a06ad0b5a7600426223d58b6
-Size (compat13-arm32.tar.gz) = 247143 bytes
-SHA1 (compat13-i386.tar.gz) = 4a33dd2381e790e3e71fccf4bb9f65a7d0859b9a
-RMD160 (compat13-i386.tar.gz) = e50d869813cd19bb079d8457a5b9f8e521b9e94e
-Size (compat13-i386.tar.gz) = 236494 bytes
-SHA1 (compat13-m68k.tar.gz) = a438a2d5f11106e431a8bba3061727069c5ec360
-RMD160 (compat13-m68k.tar.gz) = 6069d3e7790510eb7b6a3e543f670c9d3ecc89a2
-Size (compat13-m68k.tar.gz) = 231047 bytes
-SHA1 (compat13-mipsel.tar.gz) = 6dc5fefcd47db2d967b250ec628ac00495c35117
-RMD160 (compat13-mipsel.tar.gz) = 37b3e542dc407b21eb536effc64dd127a51a6d66
-Size (compat13-mipsel.tar.gz) = 411250 bytes
-SHA1 (compat13-ns32k.tar.gz) = 98068ed599e6ac2e79ea3ce1b7fb3df4510fc171
-RMD160 (compat13-ns32k.tar.gz) = f9f101da7df71bff97376a8aa4c0635450650f53
-Size (compat13-ns32k.tar.gz) = 223997 bytes
-SHA1 (compat13-sparc.tar.gz) = 67797480c5828792b434c5b06ab1ea02be3ad6b5
-RMD160 (compat13-sparc.tar.gz) = 0dbe2059a89039b20648bf6ca56e4df65ff66524
-Size (compat13-sparc.tar.gz) = 244099 bytes
+SHA1 (compat13-alpha-1.3.3.tar.bz2) = 86fe2ff55a7328f57937e23fe7bac0172409e34a
+RMD160 (compat13-alpha-1.3.3.tar.bz2) = 92d82b602c89abe22297330cb464fce7df543b32
+Size (compat13-alpha-1.3.3.tar.bz2) = 613383 bytes
+SHA1 (compat13-arm-1.3.2.tar.bz2) = cd36b50172be875f52e3217fd9620a56c8d2a4ab
+RMD160 (compat13-arm-1.3.2.tar.bz2) = 8d3e149d855586b604d141d01d5f98c740ba5a89
+Size (compat13-arm-1.3.2.tar.bz2) = 228628 bytes
+SHA1 (compat13-i386-1.3.3.tar.bz2) = 63d3d11db6336fb53483cc5944145c4e4591218c
+RMD160 (compat13-i386-1.3.3.tar.bz2) = a449a828a92a74fb61972f43c42caace5e798aa6
+Size (compat13-i386-1.3.3.tar.bz2) = 331383 bytes
+SHA1 (compat13-m68k-1.3.3.tar.bz2) = 85086dda93e1b7b03218f62ed98e56d61b166279
+RMD160 (compat13-m68k-1.3.3.tar.bz2) = a788e1901f5ee7f3c525910960088737b911d946
+Size (compat13-m68k-1.3.3.tar.bz2) = 345858 bytes
+SHA1 (compat13-mipsel-1.3.3.tar.bz2) = c50530683d6f0c0a11480325c355f90071865faf
+RMD160 (compat13-mipsel-1.3.3.tar.bz2) = 6aab300b2dc90f32138c38637366c5ff0f9f0cc6
+Size (compat13-mipsel-1.3.3.tar.bz2) = 598916 bytes
+SHA1 (compat13-ns32k-1.3.3.tar.bz2) = f0138bb3d0d97f0b0e288ae244a8741d2c2c02b9
+RMD160 (compat13-ns32k-1.3.3.tar.bz2) = 603ba24e38200adf2ef5b5bd1e7ed037c75f1912
+Size (compat13-ns32k-1.3.3.tar.bz2) = 313797 bytes
+SHA1 (compat13-sparc-1.3.3.tar.bz2) = 66281f29e50ce98091c8262fc25f86a6f42a5642
+RMD160 (compat13-sparc-1.3.3.tar.bz2) = fbd3731cd6155c8a125340a7233ea114b95550ec
+Size (compat13-sparc-1.3.3.tar.bz2) = 380197 bytes
diff --git a/emulators/compat13/emulator.mk b/emulators/compat13/emulator.mk
new file mode 100644
index 00000000000..7a5dc8f8f57
--- /dev/null
+++ b/emulators/compat13/emulator.mk
@@ -0,0 +1,47 @@
+# $NetBSD: emulator.mk,v 1.1 2007/08/21 22:49:07 jlam Exp $
+#
+# This file is included by netbsd-compat.mk in the emulator framework.
+#
+# Variables set by this file:
+#
+# EMUL_DISTRO
+#	The NetBSD distribution used to provide the files.
+#
+# EMUL_EXEC_FMT
+#	The executable format of the emulated operating system.
+#
+# EMULSUBDIR
+#	Path relative to ${PREFIX} where the files and directories are
+#	located, e.g. emul/aout.
+#
+# DEPENDS_${EMUL_DISTRO}.*
+#	A table that maps "modules" to NetBSD package dependencies.
+#
+
+EMUL_DISTRO=		netbsd-1.3
+
+# i386 and sparc switched from a.out to ELF post-1.4.
+# arm, m68k and vax switched from a.out to ELF post-1.5.
+# ns32k never switched from a.out.
+#
+.if (${EMUL_ARCH} == "arm") || (${EMUL_ARCH} == "i386") || \
+    (${EMUL_ARCH} == "m68k") || (${EMUL_ARCH} == "ns32k") || \
+    (${EMUL_ARCH} == "sparc") || (${EMUL_ARCH} == "vax")
+EMUL_EXEC_FMT=		a.out
+.else
+EMUL_EXEC_FMT=		ELF
+.endif
+
+.if (${NATIVE_EXEC_FMT} == "ELF") && (${EMUL_EXEC_FMT} == "a.out")
+EMULSUBDIR=		emul/aout
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.aout}
+.else
+EMULSUBDIR=		emul/netbsd
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.netbsd}
+.endif
+
+# We need a dependency only for NetBSD>1.3.x.
+.if empty(OS_VERSION:M0.[0-9]*) && empty(OS_VERSION:M1.[0-2]*) && \
+    empty(OS_VERSION:M1.3) && empty(OS_VERSION:M1.3.*)
+DEPENDS_netbsd-1.3.base?=	compat13>=1.3:../../emulators/compat13
+.endif