* 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.

6 files changed, 238 insertions, 0 deletions

diff --git a/emulators/compat16-extras/DESCR b/emulators/compat16-extras/DESCR
new file mode 100644
index 00000000000..c7af558b8ec
--- /dev/null
+++ b/emulators/compat16-extras/DESCR
@@ -0,0 +1,4 @@
+This package supplies the extra user files needed to run dynamically
+linked executables compiled under NetBSD 1.6, including user files
+that might be found in NetBSD versions beyond 1.6 that are missing
+from the pkgsrc/emulators/compat16 package.
diff --git a/emulators/compat16-extras/Makefile b/emulators/compat16-extras/Makefile
new file mode 100644
index 00000000000..2bedad4d3a2
--- /dev/null
+++ b/emulators/compat16-extras/Makefile
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:17 jlam Exp $
+
+DISTNAME=		compat16-extras		# overridden below
+NETBSD_VERSION=		1.6
+
+HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.6/index.html
+COMMENT=		Additional shared libraries for NetBSD 1.6 compatibility
+
+EMUL_PLATFORMS=		netbsd-i386 netbsd-sparc
+
+.include "../../emulators/compat_netbsd/Makefile.common"
+
+DISTNAME=		compat16-extras-${EMUL_ARCH}-1.6.2
+
+# This package should only be installed for COMPAT_NETBSD32 emulation
+# on machines running NetBSD-1.6.
+#
+.if defined(NETBSD_COMPAT32)
+ACCEPTABLE_NETBSD=	NetBSD-1.5[A-Z]* NetBSD-1.6 NetBSD-1.6.*
+.else
+NOT_FOR_PLATFORM=	NetBSD-*-${MACHINE_ARCH}
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat16-extras/PLIST b/emulators/compat16-extras/PLIST
new file mode 100644
index 00000000000..8de7dc71417
--- /dev/null
+++ b/emulators/compat16-extras/PLIST
@@ -0,0 +1,100 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/21 22:49:17 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libICE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libICE.so.6.3
+${EMULSUBDIRSLASH}usr/X11R6/lib/libSM.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libSM.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.6.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXi.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXi.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXp.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXp.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXt.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXt.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXtst.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXtst.so.6.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/liboldX.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/liboldX.so.6.0
+${EMULSUBDIRSLASH}usr/lib/i18n/libBIG5.so.4
+${EMULSUBDIRSLASH}usr/lib/i18n/libBIG5.so.4.0
+${EMULSUBDIRSLASH}usr/lib/i18n/libEUC.so.4
+${EMULSUBDIRSLASH}usr/lib/i18n/libEUC.so.4.0
+${EMULSUBDIRSLASH}usr/lib/i18n/libEUCTW.so.4
+${EMULSUBDIRSLASH}usr/lib/i18n/libEUCTW.so.4.0
+${EMULSUBDIRSLASH}usr/lib/i18n/libISO2022.so.4
+${EMULSUBDIRSLASH}usr/lib/i18n/libISO2022.so.4.0
+${EMULSUBDIRSLASH}usr/lib/i18n/libMSKanji.so.4
+${EMULSUBDIRSLASH}usr/lib/i18n/libMSKanji.so.4.0
+${EMULSUBDIRSLASH}usr/lib/i18n/libUTF8.so.4
+${EMULSUBDIRSLASH}usr/lib/i18n/libUTF8.so.4.0
+${EMULSUBDIRSLASH}usr/lib/libamu.so.2
+${EMULSUBDIRSLASH}usr/lib/libamu.so.2.1
+${EMULSUBDIRSLASH}usr/lib/libasn1.so.6
+${EMULSUBDIRSLASH}usr/lib/libasn1.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libbz2.so.1
+${EMULSUBDIRSLASH}usr/lib/libbz2.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libc.so.12
+${EMULSUBDIRSLASH}usr/lib/libc.so.12.83.2
+${EMULSUBDIRSLASH}usr/lib/libcdk.so.1
+${EMULSUBDIRSLASH}usr/lib/libcdk.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libcom_err.so.4
+${EMULSUBDIRSLASH}usr/lib/libcom_err.so.4.1
+${EMULSUBDIRSLASH}usr/lib/libcrypt.so.0
+${EMULSUBDIRSLASH}usr/lib/libcrypt.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libedit.so.2
+${EMULSUBDIRSLASH}usr/lib/libedit.so.2.6
+${EMULSUBDIRSLASH}usr/lib/libgnumalloc.so.0
+${EMULSUBDIRSLASH}usr/lib/libgnumalloc.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libintl.so.0
+${EMULSUBDIRSLASH}usr/lib/libintl.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libipsec.so.2
+${EMULSUBDIRSLASH}usr/lib/libipsec.so.2.0
+${EMULSUBDIRSLASH}usr/lib/libkadm.so.5
+${EMULSUBDIRSLASH}usr/lib/libkadm.so.5.0
+${EMULSUBDIRSLASH}usr/lib/libkdb.so.5
+${EMULSUBDIRSLASH}usr/lib/libkdb.so.5.0
+${EMULSUBDIRSLASH}usr/lib/libkstream.so.2
+${EMULSUBDIRSLASH}usr/lib/libkstream.so.2.0
+${EMULSUBDIRSLASH}usr/lib/libkvm.so.5
+${EMULSUBDIRSLASH}usr/lib/libkvm.so.5.1
+${EMULSUBDIRSLASH}usr/lib/libm.so.0
+${EMULSUBDIRSLASH}usr/lib/libm.so.0.1
+${EMULSUBDIRSLASH}usr/lib/libossaudio.so.0
+${EMULSUBDIRSLASH}usr/lib/libossaudio.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libpcap.so.1
+${EMULSUBDIRSLASH}usr/lib/libpcap.so.1.2
+${EMULSUBDIRSLASH}usr/lib/libpci.so.0
+${EMULSUBDIRSLASH}usr/lib/libpci.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libposix.so.0
+${EMULSUBDIRSLASH}usr/lib/libposix.so.0.1
+${EMULSUBDIRSLASH}usr/lib/libresolv.so.1
+${EMULSUBDIRSLASH}usr/lib/libresolv.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libroken.so.12
+${EMULSUBDIRSLASH}usr/lib/libroken.so.12.2
+${EMULSUBDIRSLASH}usr/lib/libskey.so.1
+${EMULSUBDIRSLASH}usr/lib/libskey.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libsl.so.2
+${EMULSUBDIRSLASH}usr/lib/libsl.so.2.0
+${EMULSUBDIRSLASH}usr/lib/libss.so.4
+${EMULSUBDIRSLASH}usr/lib/libss.so.4.0
+${EMULSUBDIRSLASH}usr/lib/libtermcap.so.0
+${EMULSUBDIRSLASH}usr/lib/libtermcap.so.0.5
+${EMULSUBDIRSLASH}usr/lib/libtermlib.so.0
+${EMULSUBDIRSLASH}usr/lib/libtermlib.so.0.5
+${EMULSUBDIRSLASH}usr/lib/libusbhid.so.1
+${EMULSUBDIRSLASH}usr/lib/libusbhid.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libwrap.so.0
+${EMULSUBDIRSLASH}usr/lib/libwrap.so.0.2
+${EMULSUBDIRSLASH}usr/lib/libz.so.0
+${EMULSUBDIRSLASH}usr/lib/libz.so.0.2
+${EMULSUBDIRSLASH}usr/libexec/ld.elf_so
+${EMULSUBDIRSLASH}usr/libexec/ld.so
+@dirrm ${EMULSUBDIRSLASH}usr/libexec
+@dirrm ${EMULSUBDIRSLASH}usr/lib/i18n
+@dirrm ${EMULSUBDIRSLASH}usr/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
+@dirrm ${EMULSUBDIRSLASH}usr
diff --git a/emulators/compat16-extras/PLIST.i386 b/emulators/compat16-extras/PLIST.i386
new file mode 100644
index 00000000000..650621f12f0
--- /dev/null
+++ b/emulators/compat16-extras/PLIST.i386
@@ -0,0 +1,98 @@
+@comment $NetBSD: PLIST.i386,v 1.1 2007/08/21 22:49:17 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libFS.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libFS.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libFS.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so.1.3
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so.4.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so.6.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.7
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.7.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so.6.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so.1.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.1.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.2.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so.4.11
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so.2.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libexpat.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so.9
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so.9.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libpsres.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libpsres.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libpsres.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbfile.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbfile.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbfile.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbui.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbui.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbui.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libm387.so.0
+${EMULSUBDIRSLASH}usr/lib/libm387.so.0.0
diff --git a/emulators/compat16-extras/PLIST.sparc b/emulators/compat16-extras/PLIST.sparc
new file mode 100644
index 00000000000..1a56d52fd14
--- /dev/null
+++ b/emulators/compat16-extras/PLIST.sparc
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.sparc,v 1.1 2007/08/21 22:49:17 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so.6.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so.6.3
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so.6.0
diff --git a/emulators/compat16-extras/distinfo b/emulators/compat16-extras/distinfo
new file mode 100644
index 00000000000..e9fbf420d45
--- /dev/null
+++ b/emulators/compat16-extras/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2007/08/21 22:49:17 jlam Exp $
+
+SHA1 (compat16-extras-i386-1.6.2.tar.bz2) = 99bea740ae6f158e9af3da28e763e2b747437b8f
+RMD160 (compat16-extras-i386-1.6.2.tar.bz2) = 8dd72d861531bd00db90d462244986415076399c
+Size (compat16-extras-i386-1.6.2.tar.bz2) = 3506953 bytes
+SHA1 (compat16-extras-sparc-1.6.2.tar.bz2) = aa59568f73bbdb6d6f5dc2f97b94006cf58e7834
+RMD160 (compat16-extras-sparc-1.6.2.tar.bz2) = 507b051de677a85111d0de45a6c218271b571ba2
+Size (compat16-extras-sparc-1.6.2.tar.bz2) = 1595142 bytes