summaryrefslogtreecommitdiff
path: root/emulators/compat16
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/compat16')
-rw-r--r--emulators/compat16/DESCR4
-rw-r--r--emulators/compat16/MESSAGE8
-rw-r--r--emulators/compat16/Makefile63
-rw-r--r--emulators/compat16/PLIST33
-rw-r--r--emulators/compat16/PLIST.alpha11
-rw-r--r--emulators/compat16/PLIST.arm11
-rw-r--r--emulators/compat16/PLIST.i386149
-rw-r--r--emulators/compat16/PLIST.m68k11
-rw-r--r--emulators/compat16/PLIST.mipseb11
-rw-r--r--emulators/compat16/PLIST.mipsel11
-rw-r--r--emulators/compat16/PLIST.powerpc9
-rw-r--r--emulators/compat16/PLIST.sparc11
-rw-r--r--emulators/compat16/PLIST.sparc6411
-rw-r--r--emulators/compat16/PLIST.vax7
-rw-r--r--emulators/compat16/distinfo35
-rw-r--r--emulators/compat16/emulator.mk43
16 files changed, 259 insertions, 169 deletions
diff --git a/emulators/compat16/DESCR b/emulators/compat16/DESCR
index 8103a3feea2..07ce1562445 100644
--- a/emulators/compat16/DESCR
+++ b/emulators/compat16/DESCR
@@ -1,2 +1,2 @@
-This package supplies the user files necessary for full compatibility
-with dynamically linked executables compiled under NetBSD 1.6.
+This package supplies the user files needed to run dynamically linked
+executables compiled under NetBSD 1.6.
diff --git a/emulators/compat16/MESSAGE b/emulators/compat16/MESSAGE
index 5721a8b720a..da35136bd33 100644
--- a/emulators/compat16/MESSAGE
+++ b/emulators/compat16/MESSAGE
@@ -1,7 +1,7 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/12/14 04:17:18 grant Exp $
-
-You will need the option COMPAT_16 in your kernel configuration to make
-use of NetBSD 1.6 binaries.
+$NetBSD: MESSAGE,v 1.2 2007/08/21 22:49:14 jlam Exp $
+The COMPAT_16 option must be included in the kernel configuration (and
+possibly others; see options(4) for more information) to make use of
+NetBSD 1.6 binaries.
===========================================================================
diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile
index 6a317abffd1..cbe99ab77ab 100644
--- a/emulators/compat16/Makefile
+++ b/emulators/compat16/Makefile
@@ -1,32 +1,53 @@
-# $NetBSD: Makefile,v 1.9 2006/10/19 19:37:38 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.10 2007/08/21 22:49:14 jlam Exp $
-DISTNAME= compat16-${MACHINE_ARCH}-${VERSION}
-PKGNAME= compat16-${VERSION}
-CATEGORIES= emulators
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= compat16 # overridden below
+NETBSD_VERSION= 1.6
-MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.6/index.html
-COMMENT= Shared libraries for NetBSD 1.6 (and earlier) compatibility
+COMMENT= Shared libraries for NetBSD 1.6 compatibility
-VERSION= 1.6.0
+.if defined(NETBSD_COMPAT32)
+EMUL_PLATFORMS= netbsd-i386 netbsd-sparc
-ONLY_FOR_PLATFORM= NetBSD-1.6[A-Z]*-i386 NetBSD-[2-9]*-i386
-NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
+ACCEPTABLE_NETBSD= NetBSD-1.5[A-Z]* NetBSD-1.6 NetBSD-1.6.* \
+ NetBSD-1.6[A-Z]* NetBSD-[2-9]* \
+ NetBSD-[1-9][0-9]*
+.else
+EMUL_PLATFORMS= netbsd-alpha netbsd-arm netbsd-i386 netbsd-m68k \
+ netbsd-mipseb netbsd-mipsel netbsd-powerpc \
+ netbsd-sparc netbsd-sparc64 netbsd-vax
-NO_MTREE= yes
-NO_BUILD= yes
-NO_CONFIGURE= yes
-CHECK_SHLIBS_SUPPORTED= no
+ONLY_FOR_PLATFORM= NetBSD-1.6[A-Z]*-* NetBSD-[2-9]*-* \
+ NetBSD-[1-9][0-9]*-*
+.endif
-EMULSUBDIR= emul/netbsd16
+.include "../../emulators/compat_netbsd/Makefile.common"
-PLIST_SUBST+= EMULSUBDIR=${EMULSUBDIR:Q}
+DISTNAME= compat16-${EMUL_ARCH}-${COMPAT_VERSION}
+COMPAT_VERSION= 1.6.2
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/${EMULSUBDIR}
- (cd ${WRKDIR}; ${PAX} -rw usr ${PREFIX}/${EMULSUBDIR})
+# For COMPAT_NETBSD32, we need to depend on the compat16-extras package
+# on NetBSD-1.6 to supply the missing shared libraries; otherwise, we
+# just depend on the compat20 package for the missing shared libraries.
+#
+.if defined(NETBSD_COMPAT32)
+COMPAT_EXTRAS= # empty
+. for _netbsd_ in ${ACCEPTABLE_NETBSD}
+COMPAT_EXTRAS= netbsd32_compat16-extras-${COMPAT_VERSION}{,nb*}:../../emulators/netbsd32_compat16-extras
+. endfor
+. if !empty(COMPAT_EXTRAS)
+DEPENDS+= ${COMPAT_EXTRAS}
+. else
+DEPENDS+= netbsd32_compat20>=2.0:../../emulators/netbsd32_compat20
+. endif
+#
+# We need to depend on the compat20 package to supply shared libraries
+# missing from compat16 on NetBSD>2.x.
+#
+.elif empty(OS_VERSION:M[0-1].*) && empty(OS_VERSION:M2.[0-9]) && \
+ empty(OS_VERSION:M2.[0-9].*) && empty(OS_VERSION:M2.[1-8][0-9].*) && \
+ empty(OS_VERSION:M2.9[0-8]*)
+DEPENDS+= compat20>=2.0:../../emulators/compat20
+.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat16/PLIST b/emulators/compat16/PLIST
new file mode 100644
index 00000000000..a3766cb8f48
--- /dev/null
+++ b/emulators/compat16/PLIST
@@ -0,0 +1,33 @@
+@comment $NetBSD: PLIST,v 1.1 2007/08/21 22:49:14 jlam Exp $
+${EMULSUBDIRSLASH}usr/lib/libcrypto.so.1
+${EMULSUBDIRSLASH}usr/lib/libcrypto.so.1.1
+${EMULSUBDIRSLASH}usr/lib/libcurses.so.5
+${EMULSUBDIRSLASH}usr/lib/libcurses.so.5.0
+${EMULSUBDIRSLASH}usr/lib/libdes.so.6
+${EMULSUBDIRSLASH}usr/lib/libdes.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libform.so.3
+${EMULSUBDIRSLASH}usr/lib/libform.so.3.0
+${EMULSUBDIRSLASH}usr/lib/libgssapi.so.4
+${EMULSUBDIRSLASH}usr/lib/libgssapi.so.4.0
+${EMULSUBDIRSLASH}usr/lib/libhdb.so.8
+${EMULSUBDIRSLASH}usr/lib/libhdb.so.8.0
+${EMULSUBDIRSLASH}usr/lib/libkadm5clnt.so.7
+${EMULSUBDIRSLASH}usr/lib/libkadm5clnt.so.7.0
+${EMULSUBDIRSLASH}usr/lib/libkadm5srv.so.8
+${EMULSUBDIRSLASH}usr/lib/libkadm5srv.so.8.0
+${EMULSUBDIRSLASH}usr/lib/libkafs.so.5
+${EMULSUBDIRSLASH}usr/lib/libkafs.so.5.1
+${EMULSUBDIRSLASH}usr/lib/libkrb.so.5
+${EMULSUBDIRSLASH}usr/lib/libkrb.so.5.1
+${EMULSUBDIRSLASH}usr/lib/libkrb5.so.18
+${EMULSUBDIRSLASH}usr/lib/libkrb5.so.18.0
+${EMULSUBDIRSLASH}usr/lib/libmenu.so.4
+${EMULSUBDIRSLASH}usr/lib/libmenu.so.4.0
+${EMULSUBDIRSLASH}usr/lib/libssl.so.2
+${EMULSUBDIRSLASH}usr/lib/libssl.so.2.1
+${EMULSUBDIRSLASH}usr/lib/libtelnet.so.4
+${EMULSUBDIRSLASH}usr/lib/libtelnet.so.4.0
+${EMULSUBDIRSLASH}usr/lib/libutil.so.6
+${EMULSUBDIRSLASH}usr/lib/libutil.so.6.0.1
+@dirrm ${EMULSUBDIRSLASH}usr/lib
+@dirrm ${EMULSUBDIRSLASH}usr
diff --git a/emulators/compat16/PLIST.alpha b/emulators/compat16/PLIST.alpha
new file mode 100644
index 00000000000..11757a877e0
--- /dev/null
+++ b/emulators/compat16/PLIST.alpha
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.alpha,v 1.1 2007/08/21 22:49:15 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.arm b/emulators/compat16/PLIST.arm
new file mode 100644
index 00000000000..2e9b26cceeb
--- /dev/null
+++ b/emulators/compat16/PLIST.arm
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.arm,v 1.1 2007/08/21 22:49:15 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.i386 b/emulators/compat16/PLIST.i386
index 18ee63171ee..8e8b7d44e8c 100644
--- a/emulators/compat16/PLIST.i386
+++ b/emulators/compat16/PLIST.i386
@@ -1,138 +1,11 @@
-@comment $NetBSD: PLIST.i386,v 1.1.1.1 2003/12/14 04:17:18 grant Exp $
-${EMULSUBDIR}/usr/lib/libamu.so.2
-${EMULSUBDIR}/usr/lib/libamu.so.2.1
-${EMULSUBDIR}/usr/lib/libasn1.so.6
-${EMULSUBDIR}/usr/lib/libasn1.so.6.0
-${EMULSUBDIR}/usr/lib/libbz2.so.1
-${EMULSUBDIR}/usr/lib/libbz2.so.1.0
-${EMULSUBDIR}/usr/lib/libc.so.12
-${EMULSUBDIR}/usr/lib/libc.so.12.83
-${EMULSUBDIR}/usr/lib/libcdk.so.1
-${EMULSUBDIR}/usr/lib/libcdk.so.1.0
-${EMULSUBDIR}/usr/lib/libcom_err.so.4
-${EMULSUBDIR}/usr/lib/libcom_err.so.4.1
-${EMULSUBDIR}/usr/lib/libcrypt.so.0
-${EMULSUBDIR}/usr/lib/libcrypt.so.0.0
-${EMULSUBDIR}/usr/lib/libcrypto.so.1
-${EMULSUBDIR}/usr/lib/libcrypto.so.1.1
-${EMULSUBDIR}/usr/lib/libcurses.so.5
-${EMULSUBDIR}/usr/lib/libcurses.so.5.0
-${EMULSUBDIR}/usr/lib/libdes.so.6
-${EMULSUBDIR}/usr/lib/libdes.so.6.0
-${EMULSUBDIR}/usr/lib/i18n/libBIG5.so.4
-${EMULSUBDIR}/usr/lib/i18n/libBIG5.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libEUC.so.4
-${EMULSUBDIR}/usr/lib/i18n/libEUC.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libEUCTW.so.4
-${EMULSUBDIR}/usr/lib/i18n/libEUCTW.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libISO2022.so.4
-${EMULSUBDIR}/usr/lib/i18n/libISO2022.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libMSKanji.so.4
-${EMULSUBDIR}/usr/lib/i18n/libMSKanji.so.4.0
-${EMULSUBDIR}/usr/lib/i18n/libUTF8.so.4
-${EMULSUBDIR}/usr/lib/i18n/libUTF8.so.4.0
-${EMULSUBDIR}/usr/lib/libedit.so.2
-${EMULSUBDIR}/usr/lib/libedit.so.2.6
-${EMULSUBDIR}/usr/lib/libform.so.3
-${EMULSUBDIR}/usr/lib/libform.so.3.0
-${EMULSUBDIR}/usr/lib/libgnumalloc.so.0
-${EMULSUBDIR}/usr/lib/libgnumalloc.so.0.0
-${EMULSUBDIR}/usr/lib/libgssapi.so.4
-${EMULSUBDIR}/usr/lib/libgssapi.so.4.0
-${EMULSUBDIR}/usr/lib/libhdb.so.8
-${EMULSUBDIR}/usr/lib/libhdb.so.8.0
-${EMULSUBDIR}/usr/lib/libintl.so.0
-${EMULSUBDIR}/usr/lib/libintl.so.0.0
-${EMULSUBDIR}/usr/lib/libipsec.so.2
-${EMULSUBDIR}/usr/lib/libipsec.so.2.0
-${EMULSUBDIR}/usr/lib/libkadm.so.5
-${EMULSUBDIR}/usr/lib/libkadm.so.5.0
-${EMULSUBDIR}/usr/lib/libkadm5clnt.so.7
-${EMULSUBDIR}/usr/lib/libkadm5clnt.so.7.0
-${EMULSUBDIR}/usr/lib/libkadm5srv.so.8
-${EMULSUBDIR}/usr/lib/libkadm5srv.so.8.0
-${EMULSUBDIR}/usr/lib/libkafs.so.5
-${EMULSUBDIR}/usr/lib/libkafs.so.5.1
-${EMULSUBDIR}/usr/lib/libkdb.so.5
-${EMULSUBDIR}/usr/lib/libkdb.so.5.0
-${EMULSUBDIR}/usr/lib/libkrb.so.5
-${EMULSUBDIR}/usr/lib/libkrb.so.5.1
-${EMULSUBDIR}/usr/lib/libkrb5.so.18
-${EMULSUBDIR}/usr/lib/libkrb5.so.18.0
-${EMULSUBDIR}/usr/lib/libkstream.so.2
-${EMULSUBDIR}/usr/lib/libkstream.so.2.0
-${EMULSUBDIR}/usr/lib/libkvm.so.5
-${EMULSUBDIR}/usr/lib/libkvm.so.5.1
-${EMULSUBDIR}/usr/lib/libm.so.0
-${EMULSUBDIR}/usr/lib/libm.so.0.1
-${EMULSUBDIR}/usr/lib/libmenu.so.4
-${EMULSUBDIR}/usr/lib/libmenu.so.4.0
-${EMULSUBDIR}/usr/lib/libobjc.so.1
-${EMULSUBDIR}/usr/lib/libobjc.so.1.0
-${EMULSUBDIR}/usr/lib/libossaudio.so.0
-${EMULSUBDIR}/usr/lib/libossaudio.so.0.0
-${EMULSUBDIR}/usr/lib/libpcap.so.1
-${EMULSUBDIR}/usr/lib/libpcap.so.1.2
-${EMULSUBDIR}/usr/lib/libpci.so.0
-${EMULSUBDIR}/usr/lib/libpci.so.0.0
-${EMULSUBDIR}/usr/lib/libposix.so.0
-${EMULSUBDIR}/usr/lib/libposix.so.0.1
-${EMULSUBDIR}/usr/lib/libresolv.so.1
-${EMULSUBDIR}/usr/lib/libresolv.so.1.0
-${EMULSUBDIR}/usr/lib/libroken.so.12
-${EMULSUBDIR}/usr/lib/libroken.so.12.2
-${EMULSUBDIR}/usr/lib/libskey.so.1
-${EMULSUBDIR}/usr/lib/libskey.so.1.0
-${EMULSUBDIR}/usr/lib/libsl.so.2
-${EMULSUBDIR}/usr/lib/libsl.so.2.0
-${EMULSUBDIR}/usr/lib/libss.so.4
-${EMULSUBDIR}/usr/lib/libss.so.4.0
-${EMULSUBDIR}/usr/lib/libssl.so.2
-${EMULSUBDIR}/usr/lib/libssl.so.2.1
-${EMULSUBDIR}/usr/lib/libstdc++.so.4
-${EMULSUBDIR}/usr/lib/libstdc++.so.4.0
-${EMULSUBDIR}/usr/lib/libtelnet.so.4
-${EMULSUBDIR}/usr/lib/libtelnet.so.4.0
-${EMULSUBDIR}/usr/lib/libtermcap.so.0
-${EMULSUBDIR}/usr/lib/libtermcap.so.0.5
-${EMULSUBDIR}/usr/lib/libtermlib.so.0
-${EMULSUBDIR}/usr/lib/libtermlib.so.0.5
-${EMULSUBDIR}/usr/lib/libusbhid.so.1
-${EMULSUBDIR}/usr/lib/libusbhid.so.1.0
-${EMULSUBDIR}/usr/lib/libutil.so.6
-${EMULSUBDIR}/usr/lib/libutil.so.6.0
-${EMULSUBDIR}/usr/lib/libwrap.so.0
-${EMULSUBDIR}/usr/lib/libwrap.so.0.2
-${EMULSUBDIR}/usr/lib/libz.so.0
-${EMULSUBDIR}/usr/lib/libz.so.0.2
-${EMULSUBDIR}/usr/libexec/ld.elf_so
-${EMULSUBDIR}/usr/libexec/ld.so
-${EMULSUBDIR}/usr/X11R6/lib/libICE.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libICE.so.6.3
-${EMULSUBDIR}/usr/X11R6/lib/libSM.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libSM.so.6.0
-${EMULSUBDIR}/usr/X11R6/lib/libX11.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libX11.so.6.2
-${EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXaw.so.6.1
-${EMULSUBDIR}/usr/X11R6/lib/libXext.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXext.so.6.4
-${EMULSUBDIR}/usr/X11R6/lib/libXi.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXi.so.6.0
-${EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXmu.so.6.2
-${EMULSUBDIR}/usr/X11R6/lib/libXp.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXp.so.6.2
-${EMULSUBDIR}/usr/X11R6/lib/libXt.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXt.so.6.0
-${EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6
-${EMULSUBDIR}/usr/X11R6/lib/libXtst.so.6.1
-${EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6
-${EMULSUBDIR}/usr/X11R6/lib/liboldX.so.6.0
-@dirrm ${EMULSUBDIR}/usr/X11R6/lib
-@dirrm ${EMULSUBDIR}/usr/X11R6
-@dirrm ${EMULSUBDIR}/usr/libexec
-@dirrm ${EMULSUBDIR}/usr/lib/i18n
-@dirrm ${EMULSUBDIR}/usr/lib
-@dirrm ${EMULSUBDIR}/usr
-@dirrm ${EMULSUBDIR}
+@comment $NetBSD: PLIST.i386,v 1.2 2007/08/21 22:49:15 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libexpat.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libexpat.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libi386.so.0
+${EMULSUBDIRSLASH}usr/lib/libi386.so.0.4
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.m68k b/emulators/compat16/PLIST.m68k
new file mode 100644
index 00000000000..92a69b32df4
--- /dev/null
+++ b/emulators/compat16/PLIST.m68k
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.m68k,v 1.1 2007/08/21 22:49:15 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.mipseb b/emulators/compat16/PLIST.mipseb
new file mode 100644
index 00000000000..6f855c1ba29
--- /dev/null
+++ b/emulators/compat16/PLIST.mipseb
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.mipseb,v 1.1 2007/08/21 22:49:15 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.mipsel b/emulators/compat16/PLIST.mipsel
new file mode 100644
index 00000000000..ce4c0f7d7b8
--- /dev/null
+++ b/emulators/compat16/PLIST.mipsel
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.mipsel,v 1.1 2007/08/21 22:49:16 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.powerpc b/emulators/compat16/PLIST.powerpc
new file mode 100644
index 00000000000..828f2f94e14
--- /dev/null
+++ b/emulators/compat16/PLIST.powerpc
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST.powerpc,v 1.1 2007/08/21 22:49:16 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libexpat.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libexpat.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.sparc b/emulators/compat16/PLIST.sparc
new file mode 100644
index 00000000000..2997c64c3dc
--- /dev/null
+++ b/emulators/compat16/PLIST.sparc
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.sparc,v 1.1 2007/08/21 22:49:16 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.sparc64 b/emulators/compat16/PLIST.sparc64
new file mode 100644
index 00000000000..055e437e78d
--- /dev/null
+++ b/emulators/compat16/PLIST.sparc64
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.sparc64,v 1.1 2007/08/21 22:49:16 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6.0
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.4.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/PLIST.vax b/emulators/compat16/PLIST.vax
new file mode 100644
index 00000000000..466bb906e74
--- /dev/null
+++ b/emulators/compat16/PLIST.vax
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST.vax,v 1.1 2007/08/21 22:49:16 jlam Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libPEX5.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXIE.so.6.0
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6/lib
+@dirrm ${EMULSUBDIRSLASH}usr/X11R6
diff --git a/emulators/compat16/distinfo b/emulators/compat16/distinfo
index d9836c02ec8..9a42fd8a3c9 100644
--- a/emulators/compat16/distinfo
+++ b/emulators/compat16/distinfo
@@ -1,5 +1,32 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 18:49:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2007/08/21 22:49:16 jlam Exp $
-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
+SHA1 (compat16-alpha-1.6.2.tar.bz2) = 789d3e537baa34e65a21498d339f5b585b29dc18
+RMD160 (compat16-alpha-1.6.2.tar.bz2) = af52e20b46d0d5d73c35c2e427afe8dd4c9d048b
+Size (compat16-alpha-1.6.2.tar.bz2) = 1116516 bytes
+SHA1 (compat16-arm-1.6.2.tar.bz2) = 2d00b8cd382331f8d5b2f6bbdc2db10b89ef995e
+RMD160 (compat16-arm-1.6.2.tar.bz2) = d0cd2bbaf8b6dcabe2330bb4617198f61d81047e
+Size (compat16-arm-1.6.2.tar.bz2) = 946440 bytes
+SHA1 (compat16-i386-1.6.2.tar.bz2) = b86107e16b9634828714f7a157ca3d705e830e31
+RMD160 (compat16-i386-1.6.2.tar.bz2) = cecf04414196a3b529e19378b58bd23a97ce35aa
+Size (compat16-i386-1.6.2.tar.bz2) = 849911 bytes
+SHA1 (compat16-m68k-1.6.2.tar.bz2) = 93c993fffc6151cf19e2e60b5859d24e0c581b1f
+RMD160 (compat16-m68k-1.6.2.tar.bz2) = 0d10f5d64f6ec900f03e5d2bcd15344eeb4e76ff
+Size (compat16-m68k-1.6.2.tar.bz2) = 908817 bytes
+SHA1 (compat16-mipseb-1.6.2.tar.bz2) = 7a2570fbe9215929440f705f685dfb6a42d717da
+RMD160 (compat16-mipseb-1.6.2.tar.bz2) = 7969ebe25ec93ef99c42d34a6f6f450f35baf183
+Size (compat16-mipseb-1.6.2.tar.bz2) = 1267678 bytes
+SHA1 (compat16-mipsel-1.6.2.tar.bz2) = 58423bc439d5b89df6395ada06838632b1e78a8f
+RMD160 (compat16-mipsel-1.6.2.tar.bz2) = 09a3cef7e7c8df811e7ccd541644a83ad4c72174
+Size (compat16-mipsel-1.6.2.tar.bz2) = 1266504 bytes
+SHA1 (compat16-powerpc-1.6.2.tar.bz2) = 58f0c04b25d9772274f5fcdc837e9369bef820c6
+RMD160 (compat16-powerpc-1.6.2.tar.bz2) = cb71b8671f3e945741340732225b65ec94be6b62
+Size (compat16-powerpc-1.6.2.tar.bz2) = 980269 bytes
+SHA1 (compat16-sparc-1.6.2.tar.bz2) = 6b7eaa891d2ecb0b9c88f40669574d26060a2b9c
+RMD160 (compat16-sparc-1.6.2.tar.bz2) = af3002f85c787cbacc81406710b0b24c1d0426e6
+Size (compat16-sparc-1.6.2.tar.bz2) = 944819 bytes
+SHA1 (compat16-sparc64-1.6.2.tar.bz2) = 2d83596eee9354291c86fd2a380062356826da7f
+RMD160 (compat16-sparc64-1.6.2.tar.bz2) = 488d55db1fc3ca524289c3abffaf1d1080eb5c63
+Size (compat16-sparc64-1.6.2.tar.bz2) = 930975 bytes
+SHA1 (compat16-vax-1.6.2.tar.bz2) = 4c22f7caa6417ae05029110241a131c55141296b
+RMD160 (compat16-vax-1.6.2.tar.bz2) = b6f5daef6be3f74e977e20aba9033b83a26e1de8
+Size (compat16-vax-1.6.2.tar.bz2) = 715323 bytes
diff --git a/emulators/compat16/emulator.mk b/emulators/compat16/emulator.mk
new file mode 100644
index 00000000000..7bd8b3153eb
--- /dev/null
+++ b/emulators/compat16/emulator.mk
@@ -0,0 +1,43 @@
+# $NetBSD: emulator.mk,v 1.1 2007/08/21 22:49:16 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.6
+
+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-1.6.
+#
+.if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \
+ ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64"))
+EMULSUBDIR= emul/netbsd32
+OPSYS_EMULDIR= ${_OPSYS_EMULDIR.netbsd32}
+
+DEPENDS_netbsd-1.6.base?= netbsd32_compat16>=1.6:../../emulators/netbsd32_compat16
+#
+# We need to depend on the compat16 package to supply missing shared
+# libraries only on NetBSD>1.6.
+#
+.elif empty(OS_VERSION:M0.[0-9]*) && empty(OS_VERSION:M1.[0-5]*) && \
+ empty(OS_VERSION:M1.6) && empty(OS_VERSION:M1.6.*)
+DEPENDS_netbsd-1.6.base?= compat16>=1.6:../../emulators/compat16
+.endif