support i386 a.out and ELF binary emulation for amd64.

10 files changed, 100 insertions, 44 deletions

diff --git a/emulators/netbsd32_compat14/INSTALL b/emulators/netbsd32_compat14/INSTALL
index 2cd1fa2f9cd..bba96f36602 100644
--- a/emulators/netbsd32_compat14/INSTALL
+++ b/emulators/netbsd32_compat14/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 19:07:10 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2005/01/11 05:12:56 hamajima Exp $
 
 case ${STAGE} in
 POST-INSTALL)
@@ -9,10 +9,11 @@ POST-INSTALL)
 	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
 	#
 	create_emul_symlink=0
-	if [ "${MACHINE_ARCH}" = "sparc64" ]
-	then
-		create_emul_symlink=1
-	fi
+	case ${MACHINE_ARCH} in
+		sparc64 | x86_64)
+			create_emul_symlink=1
+			;;
+	esac
 
 	if [ ${create_emul_symlink} = 1 ]
 	then
diff --git a/emulators/netbsd32_compat14/Makefile b/emulators/netbsd32_compat14/Makefile
index 0581129b985..9b162d57c7f 100644
--- a/emulators/netbsd32_compat14/Makefile
+++ b/emulators/netbsd32_compat14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/08/30 22:51:16 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/01/11 05:12:56 hamajima Exp $
 #
 
 DISTNAME=		compat14-${MACHINE32_ARCH}-${VERSION}
@@ -10,16 +10,21 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.4/index.html
 COMMENT=		32-bit shared libraries for NetBSD 1.4 (and earlier) compatibility
 
-DEPENDS+=		netbsd32_compat15>=1.0:../netbsd32_compat15
-
 VERSION=		1.4.3.1
+PKGREVISION=		1
 
 .if ${MACHINE_ARCH} == "sparc64"
 MACHINE32_ARCH=	sparc
+DEPENDS+=		netbsd32_compat15>=1.0:../netbsd32_compat15
+.elif ${MACHINE_ARCH} == "x86_64"
+MACHINE32_ARCH=	i386
+DEPENDS+=		netbsd32_compat16>=1.0:../netbsd32_compat16
 .else
 MACHINE32_ARCH=	${MACHINE_ARCH}
 .endif
+
 ONLY_FOR_PLATFORM=	NetBSD-*-sparc64
+ONLY_FOR_PLATFORM+=	NetBSD-2*-x86_64
 
 NO_MTREE=		# defined
 NO_BUILD=		# defined
@@ -40,6 +45,11 @@ EMULSUBDIR=		emul/aout
 COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
 COMPAT_XLIBDIR=		${EMULSUBDIR}/usr/X11R6/lib
 
+PLIST_SRC+=		${PKGDIR}/PLIST
+.if exists(${PKGDIR}/PLIST.${MACHINE32_ARCH})
+PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE32_ARCH}
+.endif
+
 PLIST_SUBST+=		COMPAT_LIBDIR=${COMPAT_LIBDIR} COMPAT_XLIBDIR=${COMPAT_XLIBDIR}
 
 do-install:
diff --git a/emulators/netbsd32_compat14/PLIST.i386 b/emulators/netbsd32_compat14/PLIST.i386
new file mode 100644
index 00000000000..ee0edbcc2c1
--- /dev/null
+++ b/emulators/netbsd32_compat14/PLIST.i386
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.i386,v 1.1 2005/01/11 05:12:56 hamajima Exp $
+${COMPAT_LIBDIR}/libi386.so.0.2
+${COMPAT_LIBDIR}/libkeycap.so.0.0
diff --git a/emulators/netbsd32_compat14/distinfo b/emulators/netbsd32_compat14/distinfo
index 0859c1f7c71..a744d68add3 100644
--- a/emulators/netbsd32_compat14/distinfo
+++ b/emulators/netbsd32_compat14/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/08/13 03:06:10 jdarrow Exp $
+$NetBSD: distinfo,v 1.4 2005/01/11 05:12:56 hamajima Exp $
 
+SHA1 (compat14-i386-1.4.3.1.tar.gz) = 7c00ede3cf18bfc437e9262f0e583bde5f134004
+Size (compat14-i386-1.4.3.1.tar.gz) = 1646083 bytes
 SHA1 (compat14-sparc-1.4.3.1.tar.gz) = 9c0e46ced11f1f56fde79158edebb12898ea4ffa
 Size (compat14-sparc-1.4.3.1.tar.gz) = 1831758 bytes
diff --git a/emulators/netbsd32_compat16/INSTALL b/emulators/netbsd32_compat16/INSTALL
index 06722471f67..5aff595eed5 100644
--- a/emulators/netbsd32_compat16/INSTALL
+++ b/emulators/netbsd32_compat16/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 19:11:57 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2005/01/11 05:12:56 hamajima Exp $
 
 case ${STAGE} in
 POST-INSTALL)
@@ -9,10 +9,11 @@ POST-INSTALL)
 	# that sparc64 a.out compatibility lives in /emul/aout, not /emul/netbsd32.
 	#
 	create_emul_symlink=0
-	if [ "${MACHINE_ARCH}" = "sparc64" ]
-	then
-		create_emul_symlink=1
-	fi
+	case ${MACHINE_ARCH} in
+		sparc64 | x86_64)
+			create_emul_symlink=1
+			;;
+	esac
 
 	if [ ${create_emul_symlink} = 1 ]
 	then
diff --git a/emulators/netbsd32_compat16/Makefile b/emulators/netbsd32_compat16/Makefile
index 615894fd0cd..fd74ae94add 100644
--- a/emulators/netbsd32_compat16/Makefile
+++ b/emulators/netbsd32_compat16/Makefile
@@ -1,14 +1,21 @@
-# $NetBSD: Makefile,v 1.7 2003/11/23 05:22:34 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/11 05:12:56 hamajima Exp $
 #
 
 .if ${MACHINE_ARCH} == "sparc64"
 MACHINE32_ARCH=	sparc
+.elif ${MACHINE_ARCH} == "x86_64"
+MACHINE32_ARCH=	i386
 .else
 MACHINE32_ARCH=	${MACHINE_ARCH}
 .endif
 
+.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
@@ -19,7 +26,8 @@ COMMENT=		32-bit shared libraries for NetBSD 1.6 (and earlier) compatibility
 
 CONFLICTS=		netbsd32_compat15-[0-9]*
 
-ONLY_FOR_PLATFORM=	NetBSD-*-sparc64
+ONLY_FOR_PLATFORM=	NetBSD-2*-sparc64
+ONLY_FOR_PLATFORM+=	NetBSD-2*-x86_64
 
 NO_MTREE=		# defined
 NO_BUILD=		# defined
@@ -40,6 +48,11 @@ COMPAT_LIBDIR=		${PREFIX}/${EMULSUBDIR}/usr/lib
 COMPAT_LIBEXECDIR=	${PREFIX}/${EMULSUBDIR}/usr/libexec
 COMPAT_XLIBDIR=		${PREFIX}/${EMULSUBDIR}/usr/X11R6/lib
 
+PLIST_SRC+=		${PKGDIR}/PLIST
+.if exists(${PKGDIR}/PLIST.${MACHINE32_ARCH})
+PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE32_ARCH}
+.endif
+
 PLIST_SUBST+=		COMPAT_EMULSUBDIR=${EMULSUBDIR}
 
 # XXX using pax to copy symlinks properly.
diff --git a/emulators/netbsd32_compat16/PLIST b/emulators/netbsd32_compat16/PLIST
index 96c42011ec6..2599ff2f90b 100644
--- a/emulators/netbsd32_compat16/PLIST
+++ b/emulators/netbsd32_compat16/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/08 16:23:02 mrg Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/01/11 05:12:56 hamajima Exp $
 ${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2
 ${COMPAT_EMULSUBDIR}/usr/lib/libamu.so.2.1
 ${COMPAT_EMULSUBDIR}/usr/lib/libasn1.so.6
@@ -105,31 +105,5 @@ ${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/X11R6/lib/libICE.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6
-${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6.0
-${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/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/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/libXext.so.6.3
-${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/libXmu.so.6.0
-${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
 ${COMPAT_EMULSUBDIR}/usr/libexec/ld.elf_so
 ${COMPAT_EMULSUBDIR}/usr/libexec/ld.so
diff --git a/emulators/netbsd32_compat16/PLIST.i386 b/emulators/netbsd32_compat16/PLIST.i386
new file mode 100644
index 00000000000..cb3d88781a8
--- /dev/null
+++ b/emulators/netbsd32_compat16/PLIST.i386
@@ -0,0 +1,23 @@
+@comment $NetBSD: PLIST.i386,v 1.1 2005/01/11 05:12:56 hamajima Exp $
+${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/libX11.so.6.2
+${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/libXext.so.6.4
+${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/libXmu.so.6.2
+${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.sparc b/emulators/netbsd32_compat16/PLIST.sparc
new file mode 100644
index 00000000000..14660934fb7
--- /dev/null
+++ b/emulators/netbsd32_compat16/PLIST.sparc
@@ -0,0 +1,27 @@
+@comment $NetBSD: PLIST.sparc,v 1.1 2005/01/11 05:12:56 hamajima Exp $
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6
+${COMPAT_EMULSUBDIR}/usr/X11R6/lib/libPEX5.so.6.0
+${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/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/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/libXext.so.6.3
+${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/libXmu.so.6.0
+${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/distinfo b/emulators/netbsd32_compat16/distinfo
index bcb20c92432..aa436277932 100644
--- a/emulators/netbsd32_compat16/distinfo
+++ b/emulators/netbsd32_compat16/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/08 16:23:02 mrg Exp $
+$NetBSD: distinfo,v 1.2 2005/01/11 05:12:56 hamajima Exp $
 
 SHA1 (compat16-sparc.tar.bz2) = f5cb874b06e2664582bf06680a952cf7bb571aaa
 Size (compat16-sparc.tar.bz2) = 2550861 bytes
+SHA1 (compat16-i386-1.6.0.tar.bz2) = 04c2fc19591941bb4ae79a2a909e5871b37dc33a
+Size (compat16-i386-1.6.0.tar.bz2) = 2478593 bytes