Add support for NetBSD 4.0 compatibility through installing compat40

and netbsd32_compat40 packages.  The compat40 packages are currently
built by comparing the 4.0 release against the 20071230 version of
HEAD.

Commit approved by <agc>.

6 files changed, 162 insertions, 0 deletions

diff --git a/emulators/compat40/DESCR b/emulators/compat40/DESCR
new file mode 100644
index 00000000000..8d53c368cb9
--- /dev/null
+++ b/emulators/compat40/DESCR
@@ -0,0 +1,2 @@
+This package supplies the user files needed to run dynamically linked
+executables compiled under NetBSD 4.0.
diff --git a/emulators/compat40/MESSAGE b/emulators/compat40/MESSAGE
new file mode 100644
index 00000000000..ffeb8986c98
--- /dev/null
+++ b/emulators/compat40/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/12/31 20:06:39 jlam Exp $
+
+The COMPAT_40 option must be included in the kernel configuration (and
+possibly others; see options(4) for more information) to make use of
+NetBSD 4.0 binaries.
+===========================================================================
diff --git a/emulators/compat40/Makefile b/emulators/compat40/Makefile
new file mode 100644
index 00000000000..dd1c6bae406
--- /dev/null
+++ b/emulators/compat40/Makefile
@@ -0,0 +1,64 @@
+# $NetBSD: Makefile,v 1.1 2007/12/31 20:06:39 jlam Exp $
+
+COMPAT_PKG=		compat40	# for compat_netbsd/Makefile.common
+NETBSD_VERSION=		4.0
+
+HOMEPAGE=		http://www.NetBSD.org/releases/formal-4/index.html
+COMMENT=		Shared libraries for NetBSD 4.0 compatibility
+
+.if defined(NETBSD_COMPAT32)
+EMUL_PLATFORMS=		netbsd-i386 netbsd-sparc
+
+ACCEPTABLE_NETBSD=	NetBSD-3.99.* NetBSD-4.[0-9]			\
+			NetBSD-4.[1-8][0-9]* NetBSD-4.9[0-8]*		\
+			NetBSD-4.99.* NetBSD-[5-9]* NetBSD-[1-9][0-9]*
+.else
+EMUL_PLATFORMS=		netbsd-alpha netbsd-arm netbsd-i386 netbsd-m68k	\
+			netbsd-mipseb netbsd-mipsel netbsd-powerpc	\
+			netbsd-sh3eb netbsd-sh3el netbsd-sparc		\
+			netbsd-sparc64 netbsd-x86_64
+
+# XXX These platforms are currently not supported or broken.
+#EMUL_PLATFORMS=	netbsd-vax
+
+ONLY_FOR_PLATFORM=	NetBSD-4.99.*-* NetBSD-[5-9]*-* NetBSD-[1-9][0-9]*-*
+.endif
+
+.include "../../emulators/compat_netbsd/Makefile.common"
+
+DISTNAME=		compat40-${EMUL_ARCH}-${COMPAT_VERSION}
+COMPAT_VERSION=		4.0
+
+# XXX Until NetBSD 5.0 is released, we fetch the distfiles into a date-specific
+# XXX subdirectory where the date corresponds to the build of HEAD against
+# XXX which these compat40 packages were generated.
+#
+DIST_SUBDIR=		20071230
+
+# For COMPAT_NETBSD32, we need to depend on the compat40-extras package
+# on NetBSD-4.0 to supply the missing shared libraries; otherwise, we
+# just depend on the compat50 package for the missing shared libraries.
+#
+.if defined(NETBSD_COMPAT32)
+COMPAT_EXTRAS=	# empty
+.  for _netbsd_ in ${ACCEPTABLE_NETBSD}
+COMPAT_EXTRAS=	netbsd32_compat40-extras-${COMPAT_VERSION}{,nb*}:../../emulators/netbsd32_compat40-extras
+.  endfor
+.  if !empty(COMPAT_EXTRAS)
+DEPENDS+=	${COMPAT_EXTRAS}
+.  else
+# XXX This package doesn't exist yet.
+#DEPENDS+=	netbsd32_compat50>=5.0:../../emulators/netbsd32_compat50
+.  endif
+#
+# We need to depend on the compat50 package to supply shared libraries
+# missing from compat40 on NetBSD>5.x.
+#
+.elif empty(OS_VERSION:M[0-4].*) && empty(OS_VERSION:M5.[0-9]) && \
+      empty(OS_VERSION:M5.[0-9].*) && empty(OS_VERSION:M5.[1-8][0-9].*) && \
+      empty(OS_VERSION:M5.9[0-8]*)
+# XXX This package doesn't exist yet.
+#DEPENDS+=	compat50>=5.0:../../emulators/compat50
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat40/PLIST b/emulators/compat40/PLIST
new file mode 100644
index 00000000000..82d14b859ab
--- /dev/null
+++ b/emulators/compat40/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2007/12/31 20:06:39 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libpthread_dbg.so.0
+${EMULSUBDIRSLASH}usr/lib/libpthread_dbg.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libssh.so.5
+${EMULSUBDIRSLASH}usr/lib/libssh.so.5.0
+@dirrm ${EMULSUBDIRSLASH}usr/lib
+@dirrm ${EMULSUBDIRSLASH}usr
diff --git a/emulators/compat40/distinfo b/emulators/compat40/distinfo
new file mode 100644
index 00000000000..a504ad12521
--- /dev/null
+++ b/emulators/compat40/distinfo
@@ -0,0 +1,38 @@
+$NetBSD: distinfo,v 1.1 2007/12/31 20:06:40 jlam Exp $
+
+SHA1 (20071230/compat40-alpha-4.0.tar.bz2) = 836b30ccdf3f8f54a651c42c0a5a7818cd06d535
+RMD160 (20071230/compat40-alpha-4.0.tar.bz2) = b6a8a08ffaab06c3ec7d39ea62e06202d02d5871
+Size (20071230/compat40-alpha-4.0.tar.bz2) = 111405 bytes
+SHA1 (20071230/compat40-arm-4.0.tar.bz2) = a8e6cf8647c4313584a9a78f40cdeb884e90a664
+RMD160 (20071230/compat40-arm-4.0.tar.bz2) = 2493d728d68e2727815b98a78f90ee3d97d16c4c
+Size (20071230/compat40-arm-4.0.tar.bz2) = 94148 bytes
+SHA1 (20071230/compat40-i386-4.0.tar.bz2) = bbe24e5b9f779557cd356949d3d62fc5365c5485
+RMD160 (20071230/compat40-i386-4.0.tar.bz2) = f9a3d197b95def78406bd626fc95d8c3934e4184
+Size (20071230/compat40-i386-4.0.tar.bz2) = 92478 bytes
+SHA1 (20071230/compat40-m68k-4.0.tar.bz2) = 04c57c35e16f7e27cfd9f098010ac43ff34be83c
+RMD160 (20071230/compat40-m68k-4.0.tar.bz2) = 3335d3a91e683c5c89a7aa69bfc0a33cc9d0f07d
+Size (20071230/compat40-m68k-4.0.tar.bz2) = 98942 bytes
+SHA1 (20071230/compat40-mipseb-4.0.tar.bz2) = e6c211b2a3ea15ff878913134571dea3fc0449bf
+RMD160 (20071230/compat40-mipseb-4.0.tar.bz2) = 0ece15da35495cc1ce3e9d52482a392c5e0f8c2d
+Size (20071230/compat40-mipseb-4.0.tar.bz2) = 95186 bytes
+SHA1 (20071230/compat40-mipsel-4.0.tar.bz2) = 67b51abab5bcf252cbc3042436971a1adbd15b75
+RMD160 (20071230/compat40-mipsel-4.0.tar.bz2) = 132666f4eaf022c90abc340d4d5e0d222fd57bb8
+Size (20071230/compat40-mipsel-4.0.tar.bz2) = 96384 bytes
+SHA1 (20071230/compat40-powerpc-4.0.tar.bz2) = 37df20dd8a6adf9e10cd6249c68b6c3a397100ce
+RMD160 (20071230/compat40-powerpc-4.0.tar.bz2) = ea48f2a8cecda64cfcc4b810e8a60411059a80b6
+Size (20071230/compat40-powerpc-4.0.tar.bz2) = 100987 bytes
+SHA1 (20071230/compat40-sh3eb-4.0.tar.bz2) = 761aab766afa49864cf4e800224a59531d935d6c
+RMD160 (20071230/compat40-sh3eb-4.0.tar.bz2) = f6faf2f61610543a7ed1a560d8a0f59901eae2d7
+Size (20071230/compat40-sh3eb-4.0.tar.bz2) = 103513 bytes
+SHA1 (20071230/compat40-sh3el-4.0.tar.bz2) = 03fd74f811a692fd7383f246052b6353cefab1b3
+RMD160 (20071230/compat40-sh3el-4.0.tar.bz2) = c6dfa9b1f22f92f536499c9989b1f8e2ef02fd51
+Size (20071230/compat40-sh3el-4.0.tar.bz2) = 102351 bytes
+SHA1 (20071230/compat40-sparc-4.0.tar.bz2) = cba88e97bba4f708ea35e38ffbd7ed4341d0efe2
+RMD160 (20071230/compat40-sparc-4.0.tar.bz2) = 1266ce0e7b064e16b8aaf9044fa48c6d527e83b9
+Size (20071230/compat40-sparc-4.0.tar.bz2) = 98322 bytes
+SHA1 (20071230/compat40-sparc64-4.0.tar.bz2) = a98fe9f5383488e468d89febbe5d4af246eb1cc0
+RMD160 (20071230/compat40-sparc64-4.0.tar.bz2) = 9e6c1f45697c7327573b8b77583d8bfc0423e5bb
+Size (20071230/compat40-sparc64-4.0.tar.bz2) = 101630 bytes
+SHA1 (20071230/compat40-x86_64-4.0.tar.bz2) = 92eb513a0ec0b62127c66654b1528de6e66d6ef5
+RMD160 (20071230/compat40-x86_64-4.0.tar.bz2) = 5e28688b7f828fe176661dc876b36c8277e3f992
+Size (20071230/compat40-x86_64-4.0.tar.bz2) = 102891 bytes
diff --git a/emulators/compat40/emulator.mk b/emulators/compat40/emulator.mk
new file mode 100644
index 00000000000..003aa718d52
--- /dev/null
+++ b/emulators/compat40/emulator.mk
@@ -0,0 +1,44 @@
+# $NetBSD: emulator.mk,v 1.1 2007/12/31 20:06:40 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-4.0
+
+EMUL_EXEC_FMT=		ELF
+EMULSUBDIR=		emul/netbsd
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.netbsd}
+
+# For COMPAT_NETBSD32, we always need the dependency to supply 32-bit
+# shared libaries for NetBSD-4.0.
+#
+.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \
+    ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64"))
+EMULSUBDIR=		emul/netbsd32
+OPSYS_EMULDIR=		${_OPSYS_EMULDIR.netbsd32}
+
+DEPENDS_netbsd-4.0.base?=	netbsd32_compat40>=4.0:../../emulators/netbsd32_compat40
+#
+# We need to depend on the compat40 package to supply missing shared
+# libraries only on NetBSD>4.0.
+#
+.elif empty(OS_VERSION:M[0-3].*) && empty(OS_VERSION:M4.[0-9]) && \
+      empty(OS_VERSION:M4.[0-9].*) && empty(OS_VERSION:M4.[1-8][0-9].*) && \
+      empty(OS_VERSION:M4.9[0-8]*)
+DEPENDS_netbsd-4.0.base?=	compat40>=4.0:../../emulators/compat40
+.endif