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

8 files changed, 3 insertions, 284 deletions

diff --git a/emulators/netbsd32_compat16/DEINSTALL b/emulators/netbsd32_compat16/DEINSTALL
deleted file mode 100644
index bdf500b2920..00000000000
--- a/emulators/netbsd32_compat16/DEINSTALL
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 19:11:57 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	COMPAT_EMULSUBDIR=@COMPAT_EMULSUBDIR@
-
-	${RMDIR} -p ${PKG_PREFIX}/${COMPAT_EMULSUBDIR} 2>/dev/null || ${TRUE}
-
-	# clean up the symlink
-	${RM} -f /emul/netbsd32
-
-	# 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/netbsd32_compat16/DESCR b/emulators/netbsd32_compat16/DESCR
deleted file mode 100644
index aa17c646fc6..00000000000
--- a/emulators/netbsd32_compat16/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.6, on a 32-bit
-platform, running on a 64-bit host..  You still need the options COMPAT_15
-and COMPAT_NETBSD32 in your kernel configuration (and probably others; see
-options(4) for more information) to make use of NetBSD 1.6 binaries.
diff --git a/emulators/netbsd32_compat16/INSTALL b/emulators/netbsd32_compat16/INSTALL
deleted file mode 100644
index 5aff595eed5..00000000000
--- a/emulators/netbsd32_compat16/INSTALL
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: INSTALL,v 1.3 2005/01/11 05:12:56 hamajima Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	MACHINE_ARCH=@MACHINE_ARCH@
-	OBJECT_FMT=@OBJECT_FMT@
-
-	# Only create the symlink on certain platform/object combinations.  Note
-	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
-	#
-	create_emul_symlink=0
-	case ${MACHINE_ARCH} in
-		sparc64 | x86_64)
-			create_emul_symlink=1
-			;;
-	esac
-
-	if [ ${create_emul_symlink} = 1 ]
-	then
-		# Create a symlink from /emul/aout --> ${PKG_PREFIX}/emul/aout
-		# if it doesn't already exist.  Warn if we can't do this.
-		#
-		emul=netbsd32
-		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/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
index 97fcffd3d87..77719be1df1 100644
--- a/emulators/netbsd32_compat16/Makefile
+++ b/emulators/netbsd32_compat16/Makefile
@@ -1,65 +1,5 @@
-# $NetBSD: Makefile,v 1.17 2006/10/19 19:39:04 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.18 2007/08/21 22:49:30 jlam Exp $
 
-.if ${MACHINE_ARCH} == "sparc64"
-MACHINE32_ARCH=	sparc
-.elif ${MACHINE_ARCH} == "x86_64"
-MACHINE32_ARCH=	i386
-.else
-MACHINE32_ARCH=	${MACHINE_ARCH}
-.endif
+NETBSD_COMPAT32=	yes
 
-.if ${MACHINE32_ARCH} == "sparc"
-DISTNAME=		compat16-${MACHINE32_ARCH}
-.else
-DISTNAME=		compat16-${MACHINE32_ARCH}-1.6.0
-.endif
-PKGNAME=		netbsd32_compat16-1.0
-PKGREVISION=		1
-CATEGORIES=		emulators
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.6/index.html
-COMMENT=		32-bit shared libraries for NetBSD 1.6 (and earlier) compatibility
-
-CONFLICTS=		netbsd32_compat15-[0-9]*
-
-ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-sparc64
-ONLY_FOR_PLATFORM+=	NetBSD-[2-9]*-x86_64
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
-NO_MTREE=		yes
-NO_BUILD=		yes
-CHECK_SHLIBS_SUPPORTED=	no
-
-FILES_SUBST+=		COMPAT_EMULSUBDIR=${COMPAT_EMULSUBDIR: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"
-
-EMULSUBDIR=		emul/netbsd32
-COMPAT_LIBDIR=		${PREFIX}/${EMULSUBDIR}/usr/lib
-COMPAT_LIBEXECDIR=	${PREFIX}/${EMULSUBDIR}/usr/libexec
-COMPAT_XLIBDIR=		${PREFIX}/${EMULSUBDIR}/usr/X11R6/lib
-
-PLIST_SUBST+=		COMPAT_EMULSUBDIR=${EMULSUBDIR:Q}
-
-# XXX using pax to copy symlinks properly.
-do-install:
-	${INSTALL_DATA_DIR} ${COMPAT_LIBDIR}
-	${INSTALL_DATA_DIR} ${COMPAT_XLIBDIR}
-	${INSTALL_DATA_DIR} ${COMPAT_LIBEXECDIR}
-	(cd ${WRKDIR}/usr/lib; ${PAX} -rwv lib*.so* i18n/lib*.so* ${COMPAT_LIBDIR})
-	(cd ${WRKDIR}/usr/X11R6/lib; ${PAX} -rwv lib*.so* ${COMPAT_XLIBDIR})
-	(cd ${WRKDIR}/usr/libexec; ${PAX} -rwv ld.*so ${COMPAT_LIBEXECDIR})
-	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} \
-		${COMPAT_LIBDIR}/lib*.so* ${COMPAT_LIBDIR}/i18n/lib*.so* \
-		${COMPAT_XLIBDIR}/lib*.so* ${COMPAT_LIBEXECDIR}/ld.*so
-	${CHMOD} 555 ${COMPAT_LIBDIR}/lib*.so* ${COMPAT_LIBDIR}/i18n/lib*.so* \
-		  ${COMPAT_XLIBDIR}/lib*.so* ${COMPAT_LIBEXECDIR}/ld.*so
-
-.include "../../mk/bsd.pkg.mk"
+.include "${.CURDIR}/../compat16/Makefile"
diff --git a/emulators/netbsd32_compat16/PLIST b/emulators/netbsd32_compat16/PLIST
deleted file mode 100644
index 806a3d81870..00000000000
--- a/emulators/netbsd32_compat16/PLIST
+++ /dev/null
@@ -1,128 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2005/02/21 21:18:28 veego Exp $
-${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2.1
-${COMPAT_EMULSUBDIR}/usr/lib/libasn1.so.6
-${COMPAT_EMULSUBDIR}/usr/lib/libasn1.so.6.0
-${COMPAT_EMULSUBDIR}/usr/lib/libbz2.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libbz2.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libc.so.12
-${COMPAT_EMULSUBDIR}/usr/lib/libc.so.12.83
-${COMPAT_EMULSUBDIR}/usr/lib/libcdk.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libcdk.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libcom_err.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libcom_err.so.4.1
-${COMPAT_EMULSUBDIR}/usr/lib/libcrypt.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libcrypt.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libcrypto.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libcrypto.so.1.1
-${COMPAT_EMULSUBDIR}/usr/lib/libcurses.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libcurses.so.5.0
-${COMPAT_EMULSUBDIR}/usr/lib/libdes.so.6
-${COMPAT_EMULSUBDIR}/usr/lib/libdes.so.6.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libBIG5.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libBIG5.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libEUC.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libEUC.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libEUCTW.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libEUCTW.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libISO2022.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libISO2022.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libMSKanji.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libMSKanji.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libUTF8.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/i18n/libUTF8.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libedit.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libedit.so.2.6
-${COMPAT_EMULSUBDIR}/usr/lib/libform.so.3
-${COMPAT_EMULSUBDIR}/usr/lib/libform.so.3.0
-${COMPAT_EMULSUBDIR}/usr/lib/libgnumalloc.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libgnumalloc.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libgssapi.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libgssapi.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libhdb.so.8
-${COMPAT_EMULSUBDIR}/usr/lib/libhdb.so.8.0
-${COMPAT_EMULSUBDIR}/usr/lib/libintl.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libintl.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libipsec.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libipsec.so.2.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm.so.5.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm5clnt.so.7
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm5clnt.so.7.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm5srv.so.8
-${COMPAT_EMULSUBDIR}/usr/lib/libkadm5srv.so.8.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkafs.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkafs.so.5.1
-${COMPAT_EMULSUBDIR}/usr/lib/libkdb.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkdb.so.5.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkrb.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkrb.so.5.1
-${COMPAT_EMULSUBDIR}/usr/lib/libkrb5.so.18
-${COMPAT_EMULSUBDIR}/usr/lib/libkrb5.so.18.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkstream.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libkstream.so.2.0
-${COMPAT_EMULSUBDIR}/usr/lib/libkvm.so.5
-${COMPAT_EMULSUBDIR}/usr/lib/libkvm.so.5.1
-${COMPAT_EMULSUBDIR}/usr/lib/libm.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libm.so.0.1
-${COMPAT_EMULSUBDIR}/usr/lib/libmenu.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libmenu.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libobjc.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libobjc.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libossaudio.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libossaudio.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libpcap.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libpcap.so.1.2
-${COMPAT_EMULSUBDIR}/usr/lib/libpci.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libpci.so.0.0
-${COMPAT_EMULSUBDIR}/usr/lib/libposix.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libposix.so.0.1
-${COMPAT_EMULSUBDIR}/usr/lib/libresolv.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libresolv.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libroken.so.12
-${COMPAT_EMULSUBDIR}/usr/lib/libroken.so.12.2
-${COMPAT_EMULSUBDIR}/usr/lib/libskey.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libskey.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libsl.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libsl.so.2.0
-${COMPAT_EMULSUBDIR}/usr/lib/libss.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libss.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libssl.so.2
-${COMPAT_EMULSUBDIR}/usr/lib/libssl.so.2.1
-${COMPAT_EMULSUBDIR}/usr/lib/libstdc++.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libstdc++.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libtelnet.so.4
-${COMPAT_EMULSUBDIR}/usr/lib/libtelnet.so.4.0
-${COMPAT_EMULSUBDIR}/usr/lib/libtermcap.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libtermcap.so.0.5
-${COMPAT_EMULSUBDIR}/usr/lib/libtermlib.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libtermlib.so.0.5
-${COMPAT_EMULSUBDIR}/usr/lib/libusbhid.so.1
-${COMPAT_EMULSUBDIR}/usr/lib/libusbhid.so.1.0
-${COMPAT_EMULSUBDIR}/usr/lib/libutil.so.6
-${COMPAT_EMULSUBDIR}/usr/lib/libutil.so.6.0
-${COMPAT_EMULSUBDIR}/usr/lib/libwrap.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libwrap.so.0.2
-${COMPAT_EMULSUBDIR}/usr/lib/libz.so.0
-${COMPAT_EMULSUBDIR}/usr/lib/libz.so.0.2
-${COMPAT_EMULSUBDIR}/usr/libexec/ld.elf_so
-${COMPAT_EMULSUBDIR}/usr/libexec/ld.so
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0
diff --git a/emulators/netbsd32_compat16/PLIST.sparc64 b/emulators/netbsd32_compat16/PLIST.sparc64
deleted file mode 100644
index 06f9c71c957..00000000000
--- a/emulators/netbsd32_compat16/PLIST.sparc64
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.sparc64,v 1.1 2005/02/21 21:18:28 veego Exp $
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.1
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXIE.so.6.0
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.3
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.0
diff --git a/emulators/netbsd32_compat16/PLIST.x86_64 b/emulators/netbsd32_compat16/PLIST.x86_64
deleted file mode 100644
index cf2e1c1f795..00000000000
--- a/emulators/netbsd32_compat16/PLIST.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.x86_64,v 1.1 2005/02/21 21:18:28 veego Exp $
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.2
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.4
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.2
diff --git a/emulators/netbsd32_compat16/distinfo b/emulators/netbsd32_compat16/distinfo
deleted file mode 100644
index 9136ff9988e..00000000000
--- a/emulators/netbsd32_compat16/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 18:49:19 agc Exp $
-
-SHA1 (compat16-sparc.tar.bz2) = f5cb874b06e2664582bf06680a952cf7bb571aaa
-Size (compat16-sparc.tar.bz2) = 2550861 bytes
-SHA1 (compat16-i386-1.6.0.tar.bz2) = 04c2fc19591941bb4ae79a2a909e5871b37dc33a
-RMD160 (compat16-i386-1.6.0.tar.bz2) = 175e64b53435ae1c2af3a143f3001ba6df7dad20
-Size (compat16-i386-1.6.0.tar.bz2) = 2478593 bytes