summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emulators/Makefile4
-rw-r--r--emulators/compat60/DESCR5
-rw-r--r--emulators/compat60/Makefile11
-rw-r--r--emulators/compat60/PLIST33
-rw-r--r--emulators/compat60/PLIST.sparc6424
-rw-r--r--emulators/compat60/PLIST.x86_6424
-rw-r--r--emulators/compat60/distinfo62
-rw-r--r--emulators/compat60/options.mk4
-rw-r--r--emulators/compat61-x11/DESCR3
-rw-r--r--emulators/compat61-x11/MESSAGE7
-rw-r--r--emulators/compat61-x11/Makefile32
-rw-r--r--emulators/compat61-x11/PLIST35
-rw-r--r--emulators/compat61-x11/PLIST.alpha2
-rw-r--r--emulators/compat61-x11/PLIST.m68k143
-rw-r--r--emulators/compat61-x11/distinfo38
-rw-r--r--emulators/compat61/DESCR7
-rw-r--r--emulators/compat61/MESSAGE7
-rw-r--r--emulators/compat61/Makefile37
-rw-r--r--emulators/compat61/PLIST104
-rw-r--r--emulators/compat61/PLIST.mips64eb178
-rw-r--r--emulators/compat61/PLIST.mips64el178
-rw-r--r--emulators/compat61/PLIST.sparc6490
-rw-r--r--emulators/compat61/PLIST.x86_6490
-rw-r--r--emulators/compat61/distinfo38
-rw-r--r--emulators/compat61/emulator.mk29
-rw-r--r--emulators/compat61/options.mk11
-rw-r--r--mk/emulator/netbsd-compat.mk8
27 files changed, 1080 insertions, 124 deletions
diff --git a/emulators/Makefile b/emulators/Makefile
index 8552814153b..088e66e6070 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.230 2015/04/10 03:16:51 snj Exp $
+# $NetBSD: Makefile,v 1.231 2015/05/03 15:01:11 spz Exp $
#
COMMENT= Emulators for other operating systems
@@ -41,6 +41,8 @@ SUBDIR+= compat50-x11
SUBDIR+= compat51
SUBDIR+= compat51-x11
SUBDIR+= compat60
+SUBDIR+= compat61
+SUBDIR+= compat61-x11
#SUBDIR+= compat_netbsd # only contains Makefile fragments
SUBDIR+= cygwin_esound
SUBDIR+= cygwin_lib
diff --git a/emulators/compat60/DESCR b/emulators/compat60/DESCR
index 4a20315c2c2..2aef269f63f 100644
--- a/emulators/compat60/DESCR
+++ b/emulators/compat60/DESCR
@@ -1,7 +1,4 @@
This package supplies the shared library files needed to run dynamically
linked executables compiled under NetBSD 6.0 on a later NetBSD.
-The shared libraries for 'native' X11 are in a separate package.
-Since "later NetBSD" means -current, this package is going to usually be
-out of date, and thus incomplete.
-Don't run postinstall fix obsolete too often :)
+This package bridges the gap to NetBSD 6.1.
diff --git a/emulators/compat60/Makefile b/emulators/compat60/Makefile
index 4d1d830cdba..a7b988e2b71 100644
--- a/emulators/compat60/Makefile
+++ b/emulators/compat60/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/17 17:24:09 spz Exp $
+# $NetBSD: Makefile,v 1.2 2015/05/03 15:01:11 spz Exp $
COMPAT_PKG= compat60 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 6.0
@@ -10,7 +10,7 @@ LICENSE= 2-clause-bsd AND modified-bsd AND isc AND mit AND zlib \
AND gnu-lgpl-v2 AND gnu-lgpl-v2.1 AND gnu-gpl-v2 \
AND gnu-lgpl-v3 AND gnu-gpl-v3
-DIST_SUBDIR= 20130213
+DIST_SUBDIR= 20150428
EMUL_PLATFORMS= netbsd-alpha netbsd-arm netbsd-i386 netbsd-m68k \
netbsd-mipseb netbsd-mipsel netbsd-powerpc \
@@ -23,10 +23,9 @@ ONLY_FOR_PLATFORM= NetBSD-6.[1-9]*-* NetBSD-[7-9]*-* NetBSD-[1-9][0-9]*-*
DISTNAME= compat60-${EMUL_ARCH}-${COMPAT_VERSION}
COMPAT_VERSION= 6.0
-# when 6.1 is out
-#.if empty(OS_VERSION:M[0-5].*) && empty(OS_VERSION:M6.0*)
-#DEPENDS+= compat61>=6.1:../../emulators/compat61
-#.endif
+.if empty(OS_VERSION:M[0-5].*) && empty(OS_VERSION:M6.[0-1]*)
+DEPENDS+= compat61>=6.1:../../emulators/compat61
+.endif
.include "options.mk"
diff --git a/emulators/compat60/PLIST b/emulators/compat60/PLIST
index acc34e30d80..66069a273e4 100644
--- a/emulators/compat60/PLIST
+++ b/emulators/compat60/PLIST
@@ -1,33 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2013/02/17 17:24:09 spz Exp $
-${EMULSUBDIRSLASH}lib/libc.so.12.181
-${EMULSUBDIRSLASH}lib/libcrypto.so.8.0
-${EMULSUBDIRSLASH}lib/libedit.so.3.0
-${EMULSUBDIRSLASH}lib/liblzf.so.0
-${EMULSUBDIRSLASH}lib/liblzf.so.0.0
-${EMULSUBDIRSLASH}lib/libutil.so.7.19
-${EMULSUBDIRSLASH}usr/lib/libbind9.so.5.7
-${EMULSUBDIRSLASH}usr/lib/libc.so.12.181
-${EMULSUBDIRSLASH}usr/lib/libcrypto.so.8.0
-${EMULSUBDIRSLASH}usr/lib/libdns.so.5.7
-${EMULSUBDIRSLASH}usr/lib/libdwarf.so.0.0
-${EMULSUBDIRSLASH}usr/lib/libedit.so.3.0
-${EMULSUBDIRSLASH}usr/lib/libexpat.so.2.0
-${EMULSUBDIRSLASH}usr/lib/libisc.so.5.7
-${EMULSUBDIRSLASH}usr/lib/libisccc.so.5.7
-${EMULSUBDIRSLASH}usr/lib/libisccfg.so.5.7
-${EMULSUBDIRSLASH}usr/lib/liblwres.so.5.7
-${EMULSUBDIRSLASH}usr/lib/liblzf.so.0
-${EMULSUBDIRSLASH}usr/lib/liblzf.so.0.0
-${EMULSUBDIRSLASH}usr/lib/libmagic.so.3
-${EMULSUBDIRSLASH}usr/lib/libmagic.so.3.1
+@comment $NetBSD: PLIST,v 1.2 2015/05/03 15:01:11 spz Exp $
${EMULSUBDIRSLASH}usr/lib/libpthread.so.1.0
-${EMULSUBDIRSLASH}usr/lib/libresolv.so.2
-${EMULSUBDIRSLASH}usr/lib/libresolv.so.2.0
-${EMULSUBDIRSLASH}usr/lib/librt.so.1.0
-${EMULSUBDIRSLASH}usr/lib/librumpkern_ksem.so
-${EMULSUBDIRSLASH}usr/lib/librumpkern_ksem.so.0
-${EMULSUBDIRSLASH}usr/lib/librumpkern_ksem.so.0.0
-${EMULSUBDIRSLASH}usr/lib/libssh.so.18
-${EMULSUBDIRSLASH}usr/lib/libssh.so.18.0
-${EMULSUBDIRSLASH}usr/lib/libssl.so.10.0
-${EMULSUBDIRSLASH}usr/lib/libutil.so.7.19
diff --git a/emulators/compat60/PLIST.sparc64 b/emulators/compat60/PLIST.sparc64
index 745f49e7fa8..b4378ebdf33 100644
--- a/emulators/compat60/PLIST.sparc64
+++ b/emulators/compat60/PLIST.sparc64
@@ -1,24 +1,2 @@
-@comment $NetBSD: PLIST.sparc64,v 1.1 2013/02/17 17:24:09 spz Exp $
-${EMULSUBDIRSLASH}usr/lib/sparc/libbind9.so.5.7
-${EMULSUBDIRSLASH}usr/lib/sparc/libc.so.12.181
-${EMULSUBDIRSLASH}usr/lib/sparc/libcrypto.so.8.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libdns.so.5.7
-${EMULSUBDIRSLASH}usr/lib/sparc/libdwarf.so.0.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libedit.so.3.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libexpat.so.2.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libisc.so.5.7
-${EMULSUBDIRSLASH}usr/lib/sparc/libisccc.so.5.7
-${EMULSUBDIRSLASH}usr/lib/sparc/libisccfg.so.5.7
-${EMULSUBDIRSLASH}usr/lib/sparc/liblwres.so.5.7
-${EMULSUBDIRSLASH}usr/lib/sparc/liblzf.so.0
-${EMULSUBDIRSLASH}usr/lib/sparc/liblzf.so.0.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libmagic.so.3
-${EMULSUBDIRSLASH}usr/lib/sparc/libmagic.so.3.1
+@comment $NetBSD: PLIST.sparc64,v 1.2 2015/05/03 15:01:11 spz Exp $
${EMULSUBDIRSLASH}usr/lib/sparc/libpthread.so.1.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libresolv.so.2
-${EMULSUBDIRSLASH}usr/lib/sparc/libresolv.so.2.0
-${EMULSUBDIRSLASH}usr/lib/sparc/librt.so.1.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libssh.so.18
-${EMULSUBDIRSLASH}usr/lib/sparc/libssh.so.18.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libssl.so.10.0
-${EMULSUBDIRSLASH}usr/lib/sparc/libutil.so.7.19
diff --git a/emulators/compat60/PLIST.x86_64 b/emulators/compat60/PLIST.x86_64
index a13b2ce058e..00be9281fb1 100644
--- a/emulators/compat60/PLIST.x86_64
+++ b/emulators/compat60/PLIST.x86_64
@@ -1,24 +1,2 @@
-@comment $NetBSD: PLIST.x86_64,v 1.1 2013/02/17 17:24:09 spz Exp $
-${EMULSUBDIRSLASH}usr/lib/i386/libbind9.so.5.7
-${EMULSUBDIRSLASH}usr/lib/i386/libc.so.12.181
-${EMULSUBDIRSLASH}usr/lib/i386/libcrypto.so.8.0
-${EMULSUBDIRSLASH}usr/lib/i386/libdns.so.5.7
-${EMULSUBDIRSLASH}usr/lib/i386/libdwarf.so.0.0
-${EMULSUBDIRSLASH}usr/lib/i386/libedit.so.3.0
-${EMULSUBDIRSLASH}usr/lib/i386/libexpat.so.2.0
-${EMULSUBDIRSLASH}usr/lib/i386/libisc.so.5.7
-${EMULSUBDIRSLASH}usr/lib/i386/libisccc.so.5.7
-${EMULSUBDIRSLASH}usr/lib/i386/libisccfg.so.5.7
-${EMULSUBDIRSLASH}usr/lib/i386/liblwres.so.5.7
-${EMULSUBDIRSLASH}usr/lib/i386/liblzf.so.0
-${EMULSUBDIRSLASH}usr/lib/i386/liblzf.so.0.0
-${EMULSUBDIRSLASH}usr/lib/i386/libmagic.so.3
-${EMULSUBDIRSLASH}usr/lib/i386/libmagic.so.3.1
+@comment $NetBSD: PLIST.x86_64,v 1.2 2015/05/03 15:01:11 spz Exp $
${EMULSUBDIRSLASH}usr/lib/i386/libpthread.so.1.0
-${EMULSUBDIRSLASH}usr/lib/i386/libresolv.so.2
-${EMULSUBDIRSLASH}usr/lib/i386/libresolv.so.2.0
-${EMULSUBDIRSLASH}usr/lib/i386/librt.so.1.0
-${EMULSUBDIRSLASH}usr/lib/i386/libssh.so.18
-${EMULSUBDIRSLASH}usr/lib/i386/libssh.so.18.0
-${EMULSUBDIRSLASH}usr/lib/i386/libssl.so.10.0
-${EMULSUBDIRSLASH}usr/lib/i386/libutil.so.7.19
diff --git a/emulators/compat60/distinfo b/emulators/compat60/distinfo
index fdb48aef4ab..79329e8ad78 100644
--- a/emulators/compat60/distinfo
+++ b/emulators/compat60/distinfo
@@ -1,32 +1,32 @@
-$NetBSD: distinfo,v 1.1 2013/02/17 17:24:09 spz Exp $
+$NetBSD: distinfo,v 1.2 2015/05/03 15:01:11 spz Exp $
-SHA1 (20130213/compat60-alpha-6.0.tar.bz2) = 10b795a652dc932bccdc635a01786deb9b86b303
-RMD160 (20130213/compat60-alpha-6.0.tar.bz2) = 77d844ae2b2df0947958fd13480b7436e13f22f3
-Size (20130213/compat60-alpha-6.0.tar.bz2) = 3167056 bytes
-SHA1 (20130213/compat60-arm-6.0.tar.bz2) = e0398c99ecc91e03e03941d58be105474c69a851
-RMD160 (20130213/compat60-arm-6.0.tar.bz2) = 8e57180d703b610dfad81ca4078c7b83c9b92307
-Size (20130213/compat60-arm-6.0.tar.bz2) = 2822963 bytes
-SHA1 (20130213/compat60-i386-6.0.tar.bz2) = 53e38fb8ceebdac4d03b9d8d9a881559cb362e24
-RMD160 (20130213/compat60-i386-6.0.tar.bz2) = ec70aefdb67ca870ee2007b7f2692bdd093961fc
-Size (20130213/compat60-i386-6.0.tar.bz2) = 2633419 bytes
-SHA1 (20130213/compat60-m68k-6.0.tar.bz2) = 9fdcd34fe273e1843c97c9ace29a8069c7792ac5
-RMD160 (20130213/compat60-m68k-6.0.tar.bz2) = f0b64024e997ec5b660a816306838da95bbe7d72
-Size (20130213/compat60-m68k-6.0.tar.bz2) = 2444610 bytes
-SHA1 (20130213/compat60-mipseb-6.0.tar.bz2) = 43e758bb2c799b19cdabd6927c7a8243a70b441d
-RMD160 (20130213/compat60-mipseb-6.0.tar.bz2) = ec5e696f14441eec2e7d5ea6d3298bacc73f150f
-Size (20130213/compat60-mipseb-6.0.tar.bz2) = 2725265 bytes
-SHA1 (20130213/compat60-mipsel-6.0.tar.bz2) = e056c52f50d9ab1fd3696a654c30f7d4f1d9f202
-RMD160 (20130213/compat60-mipsel-6.0.tar.bz2) = 648b793f4cf21570701c21796147eb6c1f7232b6
-Size (20130213/compat60-mipsel-6.0.tar.bz2) = 2758080 bytes
-SHA1 (20130213/compat60-powerpc-6.0.tar.bz2) = 12145b3d91364cb656e96abb726fa248177ae6dd
-RMD160 (20130213/compat60-powerpc-6.0.tar.bz2) = 2f60f6109e23c0517f9924c104ddcc66f445df5c
-Size (20130213/compat60-powerpc-6.0.tar.bz2) = 3049271 bytes
-SHA1 (20130213/compat60-sparc-6.0.tar.bz2) = cb6f9c2db2819a4c7e05b46f6903d59b62dd4dd5
-RMD160 (20130213/compat60-sparc-6.0.tar.bz2) = 08fc687959088462a42e83d7370854b746b00fc4
-Size (20130213/compat60-sparc-6.0.tar.bz2) = 2771978 bytes
-SHA1 (20130213/compat60-sparc64-6.0.tar.bz2) = d0bf66a809248b7fd2e3800fd968c2fae87b29f4
-RMD160 (20130213/compat60-sparc64-6.0.tar.bz2) = fc8f5f1f90599c368e1f45a64de538bbb4965d3b
-Size (20130213/compat60-sparc64-6.0.tar.bz2) = 5707702 bytes
-SHA1 (20130213/compat60-x86_64-6.0.tar.bz2) = fad79f96dfda3f31f625795ac4c3f1be9f9695ce
-RMD160 (20130213/compat60-x86_64-6.0.tar.bz2) = b4744668e6ddbd5222005a5dbfb385425c463ba0
-Size (20130213/compat60-x86_64-6.0.tar.bz2) = 5583459 bytes
+SHA1 (20150428/compat60-alpha-6.0.tar.bz2) = 868b6ea35501de11d327f2202fa7a641105a3f98
+RMD160 (20150428/compat60-alpha-6.0.tar.bz2) = 312711b8fe47e8bf82b6a761b083f057b35a4581
+Size (20150428/compat60-alpha-6.0.tar.bz2) = 27074 bytes
+SHA1 (20150428/compat60-arm-6.0.tar.bz2) = b84a512b6f31fb59c83ef05f96cd91bfb0f6a980
+RMD160 (20150428/compat60-arm-6.0.tar.bz2) = 511855eb1157cb0531fd145921c3f8dea8900a21
+Size (20150428/compat60-arm-6.0.tar.bz2) = 23700 bytes
+SHA1 (20150428/compat60-i386-6.0.tar.bz2) = f0dd09af0da3ba899ccc60d5b2314f8f367b84f8
+RMD160 (20150428/compat60-i386-6.0.tar.bz2) = ad8cb12951faae9583bbcfc6151d890bca352cbf
+Size (20150428/compat60-i386-6.0.tar.bz2) = 23071 bytes
+SHA1 (20150428/compat60-m68k-6.0.tar.bz2) = b2789f2a68bfb145594e5ef8481dd4532a5fb5d5
+RMD160 (20150428/compat60-m68k-6.0.tar.bz2) = 843dd32f9eb24490e4fb2ea775883ca9c0c5f47c
+Size (20150428/compat60-m68k-6.0.tar.bz2) = 21579 bytes
+SHA1 (20150428/compat60-mipseb-6.0.tar.bz2) = 5bc69da226bdc679dcc2dbeb95b584d5aac3a19e
+RMD160 (20150428/compat60-mipseb-6.0.tar.bz2) = fce48f0306c29e118bfa01f2f240572aa28018dc
+Size (20150428/compat60-mipseb-6.0.tar.bz2) = 24830 bytes
+SHA1 (20150428/compat60-mipsel-6.0.tar.bz2) = 1b9ff56e4fd1ee14fd4e912cbd6422daacfc679d
+RMD160 (20150428/compat60-mipsel-6.0.tar.bz2) = f0252f6a3cf6f415bc730efffb8c2bbec42581e3
+Size (20150428/compat60-mipsel-6.0.tar.bz2) = 25021 bytes
+SHA1 (20150428/compat60-powerpc-6.0.tar.bz2) = 6dbc735d4258ceda1ff608970d6457e61e0a619c
+RMD160 (20150428/compat60-powerpc-6.0.tar.bz2) = 95273818096814c88b5640413b7ca7e93b6055c3
+Size (20150428/compat60-powerpc-6.0.tar.bz2) = 26529 bytes
+SHA1 (20150428/compat60-sparc-6.0.tar.bz2) = af5076556dabcf1a4f56d5dfee8b13cc40bca0f0
+RMD160 (20150428/compat60-sparc-6.0.tar.bz2) = 0f749f51dc0d2b450f135ac08d94c7a37988c6ad
+Size (20150428/compat60-sparc-6.0.tar.bz2) = 22734 bytes
+SHA1 (20150428/compat60-sparc64-6.0.tar.bz2) = d39d85756bdce7fad32927557ff74bd349bfd205
+RMD160 (20150428/compat60-sparc64-6.0.tar.bz2) = 9765b58de44f62c55b50ea96bc7ccee1bd2be090
+Size (20150428/compat60-sparc64-6.0.tar.bz2) = 42058 bytes
+SHA1 (20150428/compat60-x86_64-6.0.tar.bz2) = 6ef1c7d756cbe5f309b4923e7b8cb0c71d186a6d
+RMD160 (20150428/compat60-x86_64-6.0.tar.bz2) = 5d49386cada002de451f70fbfc6baba6309ce83e
+Size (20150428/compat60-x86_64-6.0.tar.bz2) = 46370 bytes
diff --git a/emulators/compat60/options.mk b/emulators/compat60/options.mk
index 05228cf2225..95b99a083f6 100644
--- a/emulators/compat60/options.mk
+++ b/emulators/compat60/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2013/02/17 17:24:09 spz Exp $
+# $NetBSD: options.mk,v 1.2 2015/05/03 15:01:11 spz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.compat60
PKG_SUPPORTED_OPTIONS= x11
@@ -7,6 +7,6 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mx11)
-# there are no X11 incompatibilities for netbsd-6-0 to head yet
+# there are no X11 incompatibilities for netbsd-6-0 to netbsd-6-1
# DEPENDS+= compat60-x11>=6.0:../../emulators/compat60-x11
.endif
diff --git a/emulators/compat61-x11/DESCR b/emulators/compat61-x11/DESCR
new file mode 100644
index 00000000000..8d85c7992d4
--- /dev/null
+++ b/emulators/compat61-x11/DESCR
@@ -0,0 +1,3 @@
+This package supplies the shared library files needed to run dynamically
+linked executables using 'native' X11, compiled under NetBSD 6.1 on a
+later NetBSD.
diff --git a/emulators/compat61-x11/MESSAGE b/emulators/compat61-x11/MESSAGE
new file mode 100644
index 00000000000..c7e0b6eedfa
--- /dev/null
+++ b/emulators/compat61-x11/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2015/05/03 15:01:12 spz Exp $
+
+The COMPAT_60 option must be included in the kernel configuration (and
+possibly others; see options(4) for more information) to make use of
+NetBSD 6.1 binaries.
+===========================================================================
diff --git a/emulators/compat61-x11/Makefile b/emulators/compat61-x11/Makefile
new file mode 100644
index 00000000000..6bafb352f7c
--- /dev/null
+++ b/emulators/compat61-x11/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2015/05/03 15:01:12 spz Exp $
+
+COMPAT_PKG= compat61 # for compat_netbsd/Makefile.common
+NETBSD_VERSION= 6.1
+
+HOMEPAGE= http://www.NetBSD.org/releases/formal-6/index.html
+COMMENT= Shared X11 libraries for NetBSD 6.1 compatibility
+LICENSE= mit
+
+EMUL_PLATFORMS= netbsd-alpha netbsd-arm netbsd-i386 netbsd-m68k \
+ netbsd-mipseb netbsd-mipsel \
+ netbsd-mips64eb netbsd-mips64el \
+ netbsd-powerpc \
+ netbsd-sparc netbsd-sparc64 netbsd-x86_64
+
+ONLY_FOR_PLATFORM= NetBSD-[7-9]*-* NetBSD-[1-9][0-9]*-*
+
+.include "../../emulators/compat_netbsd/Makefile.common"
+
+DISTNAME= compat61-x11-${EMUL_ARCH}-${COMPAT_VERSION}
+COMPAT_VERSION= 6.1
+DIST_SUBDIR= 20150430
+
+# in this package we want the PLIST.alpha and PLIST.m68k to replace, not
+# amend, the common PLIST
+.if exists(${PKGDIR}/PLIST.${EMUL_ARCH})
+PLIST_SRC= ${PKGDIR}/PLIST.${EMUL_ARCH}
+.endif
+
+# pulling in later release compats through the main compat package
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat61-x11/PLIST b/emulators/compat61-x11/PLIST
new file mode 100644
index 00000000000..671ec2d649f
--- /dev/null
+++ b/emulators/compat61-x11/PLIST
@@ -0,0 +1,35 @@
+@comment $NetBSD: PLIST,v 1.1 2015/05/03 15:01:12 spz Exp $
+${EMULSUBDIRSLASH}usr/X11R7/lib/libOSMesa.so
+${EMULSUBDIRSLASH}usr/X11R7/lib/libOSMesa.so.7
+${EMULSUBDIRSLASH}usr/X11R7/lib/libfontconfig.so.2.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libOSMesa.so.7.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libXi.so.7.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libXrandr.so.3.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libfreetype.so.7
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-composite.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libfreetype.so.7.3
+${EMULSUBDIRSLASH}usr/X11R7/lib/libpciaccess.so.0.2
+${EMULSUBDIRSLASH}usr/X11R7/lib/libpixman-1.so.2.1
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-randr.so.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-damage.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-dpms.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-dri2.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-glx.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-screensaver.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-randr.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-record.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-render.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-res.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-sync.so.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-shape.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-shm.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-xf86dri.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-sync.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-xevie.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-xinerama.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-xfixes.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb.so.1
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-xtest.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-xv.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb-xvmc.so.0.0
+${EMULSUBDIRSLASH}usr/X11R7/lib/libxcb.so.1.1
diff --git a/emulators/compat61-x11/PLIST.alpha b/emulators/compat61-x11/PLIST.alpha
new file mode 100644
index 00000000000..eadbd1579f3
--- /dev/null
+++ b/emulators/compat61-x11/PLIST.alpha
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.alpha,v 1.1 2015/05/03 15:01:12 spz Exp $
+@comment no compat files for alpha
diff --git a/emulators/compat61-x11/PLIST.m68k b/emulators/compat61-x11/PLIST.m68k
new file mode 100644
index 00000000000..a25a3cf9be1
--- /dev/null
+++ b/emulators/compat61-x11/PLIST.m68k
@@ -0,0 +1,143 @@
+@comment $NetBSD: PLIST.m68k,v 1.1 2015/05/03 15:01:12 spz Exp $
+${EMULSUBDIRSLASH}usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/X11/locale/lib/common/xlibi18n.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/X11/locale/lib/common/xlocale.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/X11/locale/lib/common/xomGeneric.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libFS.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libFS.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libFS.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLw.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libSM.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so.1.3
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLw.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libICE.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLw.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libICE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libICE.so.6.3
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libSM.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXt.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so.4.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libSM.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXau.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXdmcp.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so.6.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXau.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXau.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.7
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.6.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.7.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXdmcp.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXdmcp.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXi.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so.6.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so.1.5
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.1.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXi.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.2.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXi.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXp.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXp.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXt.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXp.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so.4.11
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so.2.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXtst.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXt.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXtst.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXtst.so.6.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so.1.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so.1.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdmx.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdmx.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdmx.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so.9
+${EMULSUBDIRSLASH}usr/X11R6/lib/liboldX.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so.9.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/liboldX.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libpsres.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/liboldX.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libpsres.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbui.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbfile.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libpsres.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbfile.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbui.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbfile.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libxkbui.so.1.0
diff --git a/emulators/compat61-x11/distinfo b/emulators/compat61-x11/distinfo
new file mode 100644
index 00000000000..98eb036cb72
--- /dev/null
+++ b/emulators/compat61-x11/distinfo
@@ -0,0 +1,38 @@
+$NetBSD: distinfo,v 1.1 2015/05/03 15:01:12 spz Exp $
+
+SHA1 (20150430/compat61-x11-alpha-6.1.tar.bz2) = 0be9ae5f295d8f6044a922b426e1e25ccadcafa6
+RMD160 (20150430/compat61-x11-alpha-6.1.tar.bz2) = e2dd23a53a739bc92622e89616bba4d3be50dc43
+Size (20150430/compat61-x11-alpha-6.1.tar.bz2) = 130 bytes
+SHA1 (20150430/compat61-x11-arm-6.1.tar.bz2) = 0ddcb73c08b378ae65c0de6c3e191deebd9931a2
+RMD160 (20150430/compat61-x11-arm-6.1.tar.bz2) = a01f4e2b1d9748977cb3368c315437b823f8c669
+Size (20150430/compat61-x11-arm-6.1.tar.bz2) = 1638063 bytes
+SHA1 (20150430/compat61-x11-i386-6.1.tar.bz2) = 10b5d8bdb09c87f184934c16cd28bfaf3a2437a2
+RMD160 (20150430/compat61-x11-i386-6.1.tar.bz2) = a3546c08b6a01e22f520f5cf12393d9a4f595610
+Size (20150430/compat61-x11-i386-6.1.tar.bz2) = 1459246 bytes
+SHA1 (20150430/compat61-x11-m68k-6.1.tar.bz2) = 32f87a3776cf9138218d68deea76b4f38d4992dd
+RMD160 (20150430/compat61-x11-m68k-6.1.tar.bz2) = bcef0a35f71e6f0e4fd21bf8194d47e8d42d09c3
+Size (20150430/compat61-x11-m68k-6.1.tar.bz2) = 2637442 bytes
+SHA1 (20150430/compat61-x11-mips64eb-6.1.tar.bz2) = 4d4bfe134aa483795261b555e4072d2100b28c18
+RMD160 (20150430/compat61-x11-mips64eb-6.1.tar.bz2) = c22480345197f230188e27acaa304afda01894c9
+Size (20150430/compat61-x11-mips64eb-6.1.tar.bz2) = 1578700 bytes
+SHA1 (20150430/compat61-x11-mips64el-6.1.tar.bz2) = 55410a45562cb920cd17edf39a43dbca5186d1e4
+RMD160 (20150430/compat61-x11-mips64el-6.1.tar.bz2) = dd3331d71edcc780c78a5870d6dddeb87e57f454
+Size (20150430/compat61-x11-mips64el-6.1.tar.bz2) = 1591469 bytes
+SHA1 (20150430/compat61-x11-mipseb-6.1.tar.bz2) = 02dc0e659ec9c55d964d1f8af5baa3924c9ecdf5
+RMD160 (20150430/compat61-x11-mipseb-6.1.tar.bz2) = ff5984a6a1e2cbc8176bd2c826fc5a41b7716891
+Size (20150430/compat61-x11-mipseb-6.1.tar.bz2) = 1640299 bytes
+SHA1 (20150430/compat61-x11-mipsel-6.1.tar.bz2) = 5e46518feee3d25b2f382a96caf3db33d44fd4f5
+RMD160 (20150430/compat61-x11-mipsel-6.1.tar.bz2) = 1ce2c47d8cad537e990cfa518cc91f8711c35bfb
+Size (20150430/compat61-x11-mipsel-6.1.tar.bz2) = 1655782 bytes
+SHA1 (20150430/compat61-x11-powerpc-6.1.tar.bz2) = 50c2e04878aa50ee5e7900e6befd5cbe93a27569
+RMD160 (20150430/compat61-x11-powerpc-6.1.tar.bz2) = cfbfefbadbd03985c4ba3600835be5b4ce840542
+Size (20150430/compat61-x11-powerpc-6.1.tar.bz2) = 1662362 bytes
+SHA1 (20150430/compat61-x11-sparc-6.1.tar.bz2) = 1ba54f7809e1ca3cc6f9979c18869c5e10b533ea
+RMD160 (20150430/compat61-x11-sparc-6.1.tar.bz2) = 51faac5b46a28903dd3ade1983f02858a4d6a265
+Size (20150430/compat61-x11-sparc-6.1.tar.bz2) = 1607017 bytes
+SHA1 (20150430/compat61-x11-sparc64-6.1.tar.bz2) = a0e8275809f068cfff852df61c555e2729d28876
+RMD160 (20150430/compat61-x11-sparc64-6.1.tar.bz2) = 0f8d62d0686bf19fd90100bd0948902e7d669ee9
+Size (20150430/compat61-x11-sparc64-6.1.tar.bz2) = 1643500 bytes
+SHA1 (20150430/compat61-x11-x86_64-6.1.tar.bz2) = b5f3b5744a8d42b150b23184ba62ecaa439562c8
+RMD160 (20150430/compat61-x11-x86_64-6.1.tar.bz2) = 4bc4a11b301f34719389febb367373e5eb8ae5fe
+Size (20150430/compat61-x11-x86_64-6.1.tar.bz2) = 1636188 bytes
diff --git a/emulators/compat61/DESCR b/emulators/compat61/DESCR
new file mode 100644
index 00000000000..58a250c39a4
--- /dev/null
+++ b/emulators/compat61/DESCR
@@ -0,0 +1,7 @@
+This package supplies the shared library files needed to run dynamically
+linked executables compiled under NetBSD 6.1 on a later NetBSD.
+The shared libraries for 'native' X11 are in a separate package.
+
+This package is bridging the gap to NetBSD 7; since the latter is
+still in beta at the time of creating this package, the package may
+be incomplete.
diff --git a/emulators/compat61/MESSAGE b/emulators/compat61/MESSAGE
new file mode 100644
index 00000000000..c7e0b6eedfa
--- /dev/null
+++ b/emulators/compat61/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2015/05/03 15:01:12 spz Exp $
+
+The COMPAT_60 option must be included in the kernel configuration (and
+possibly others; see options(4) for more information) to make use of
+NetBSD 6.1 binaries.
+===========================================================================
diff --git a/emulators/compat61/Makefile b/emulators/compat61/Makefile
new file mode 100644
index 00000000000..07d0ae91cb0
--- /dev/null
+++ b/emulators/compat61/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.1 2015/05/03 15:01:12 spz Exp $
+
+COMPAT_PKG= compat61 # for compat_netbsd/Makefile.common
+NETBSD_VERSION= 6.1
+
+HOMEPAGE= http://www.NetBSD.org/releases/formal-6/index.html
+COMMENT= Shared libraries for NetBSD 6.1 compatibility
+# This license list is a pre-emptive strike, the actual situation may be better
+LICENSE= 2-clause-bsd AND modified-bsd AND isc AND mit AND zlib \
+ AND gnu-lgpl-v2 AND gnu-lgpl-v2.1 AND gnu-gpl-v2 \
+ AND gnu-lgpl-v3 AND gnu-gpl-v3
+
+DIST_SUBDIR= 20150430
+
+EMUL_PLATFORMS= netbsd-alpha netbsd-arm netbsd-i386 netbsd-m68k \
+ netbsd-mipseb netbsd-mipsel \
+ netbsd-mips64eb netbsd-mips64el \
+ netbsd-powerpc \
+ netbsd-sparc netbsd-sparc64 netbsd-x86_64
+
+# select ONLY_FOR_PLATFORM start by the osversion we diffed against
+# add NetBSD-6.[2-9]*-* once 6.2 is out and we have compat62
+ONLY_FOR_PLATFORM= NetBSD-[7-9]*-* NetBSD-[1-9][0-9]*-*
+
+.include "../../emulators/compat_netbsd/Makefile.common"
+
+DISTNAME= compat61-${EMUL_ARCH}-${COMPAT_VERSION}
+COMPAT_VERSION= 6.1
+
+# when 6.2 is out
+#.if empty(OS_VERSION:M[0-5].*) && empty(OS_VERSION:M6.[0-2]*)
+#DEPENDS+= compat62>=6.2:../../emulators/compat62
+#.endif
+
+.include "options.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/compat61/PLIST b/emulators/compat61/PLIST
new file mode 100644
index 00000000000..d5dd28e9e9d
--- /dev/null
+++ b/emulators/compat61/PLIST
@@ -0,0 +1,104 @@
+@comment $NetBSD: PLIST,v 1.1 2015/05/03 15:01:12 spz Exp $
+${EMULSUBDIRSLASH}lib/libc.so.12.181
+${EMULSUBDIRSLASH}lib/libedit.so.3.0
+${EMULSUBDIRSLASH}lib/libevent.so.3
+${EMULSUBDIRSLASH}lib/libevent.so.3.2
+${EMULSUBDIRSLASH}lib/liblzf.so.0
+${EMULSUBDIRSLASH}lib/liblzf.so.0.0
+${EMULSUBDIRSLASH}lib/libm.so.0.10
+${EMULSUBDIRSLASH}lib/libutil.so.7.19
+${EMULSUBDIRSLASH}usr/lib/libbfd.so.12
+${EMULSUBDIRSLASH}usr/lib/libbfd.so.12.0
+${EMULSUBDIRSLASH}usr/lib/libbind9.so.5
+${EMULSUBDIRSLASH}usr/lib/libbind9.so.5.9
+${EMULSUBDIRSLASH}usr/lib/libc.so.12.181
+${EMULSUBDIRSLASH}usr/lib/libdns.so.5
+${EMULSUBDIRSLASH}usr/lib/libdns.so.5.9
+${EMULSUBDIRSLASH}usr/lib/libdwarf.so.0
+${EMULSUBDIRSLASH}usr/lib/libdwarf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libedit.so.3.0
+${EMULSUBDIRSLASH}usr/lib/libelf.so.0
+${EMULSUBDIRSLASH}usr/lib/libelf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libevent.so.3
+${EMULSUBDIRSLASH}usr/lib/libevent.so.3.2
+${EMULSUBDIRSLASH}usr/lib/libexpat.so.2.0
+${EMULSUBDIRSLASH}usr/lib/libgomp.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libirs.so.5
+${EMULSUBDIRSLASH}usr/lib/libirs.so.5.9
+${EMULSUBDIRSLASH}usr/lib/libisc.so.5
+${EMULSUBDIRSLASH}usr/lib/libisc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/libisccc.so.5
+${EMULSUBDIRSLASH}usr/lib/libisccc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/libisccfg.so.5
+${EMULSUBDIRSLASH}usr/lib/libisccfg.so.5.9
+${EMULSUBDIRSLASH}usr/lib/liblber.so.3.2
+${EMULSUBDIRSLASH}usr/lib/libldap.so.4.2
+${EMULSUBDIRSLASH}usr/lib/libldap_r.so.4.2
+${EMULSUBDIRSLASH}usr/lib/liblua.so.1
+${EMULSUBDIRSLASH}usr/lib/liblua.so.1.0
+${EMULSUBDIRSLASH}usr/lib/liblwres.so.5
+${EMULSUBDIRSLASH}usr/lib/liblwres.so.5.9
+${EMULSUBDIRSLASH}usr/lib/liblzf.so.0
+${EMULSUBDIRSLASH}usr/lib/liblzf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libm.so.0.10
+${EMULSUBDIRSLASH}usr/lib/libmagic.so.3
+${EMULSUBDIRSLASH}usr/lib/libmagic.so.3.1
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.3
+${EMULSUBDIRSLASH}usr/lib/libobjc.so.3.0
+${EMULSUBDIRSLASH}usr/lib/libopcodes.so.5
+${EMULSUBDIRSLASH}usr/lib/libopcodes.so.5.0
+${EMULSUBDIRSLASH}usr/lib/libossaudio.so.1.0
+${EMULSUBDIRSLASH}usr/lib/libpam.so.3
+${EMULSUBDIRSLASH}usr/lib/libpam.so.3.0
+${EMULSUBDIRSLASH}usr/lib/libpcap.so.4
+${EMULSUBDIRSLASH}usr/lib/libpcap.so.4.0
+${EMULSUBDIRSLASH}usr/lib/libpci.so.2.0
+${EMULSUBDIRSLASH}usr/lib/libpthread.so.1.1
+${EMULSUBDIRSLASH}usr/lib/libresolv.so.2
+${EMULSUBDIRSLASH}usr/lib/libresolv.so.2.0
+${EMULSUBDIRSLASH}usr/lib/librt.so.1.0
+${EMULSUBDIRSLASH}usr/lib/librumpdev_scsitest.so
+${EMULSUBDIRSLASH}usr/lib/librumpdev_scsitest.so.0
+${EMULSUBDIRSLASH}usr/lib/librumpdev_scsitest.so.0.0
+${EMULSUBDIRSLASH}usr/lib/librumpkern_ksem.so
+${EMULSUBDIRSLASH}usr/lib/librumpkern_ksem.so.0
+${EMULSUBDIRSLASH}usr/lib/librumpkern_ksem.so.0.0
+${EMULSUBDIRSLASH}usr/lib/librumpuser.so.0.0
+${EMULSUBDIRSLASH}usr/lib/libsqlite3.so.1.1
+${EMULSUBDIRSLASH}usr/lib/libssh.so.18
+${EMULSUBDIRSLASH}usr/lib/libssh.so.18.0
+${EMULSUBDIRSLASH}usr/lib/libstdc++.so.7.1
+${EMULSUBDIRSLASH}usr/lib/libutil.so.7.19
+${EMULSUBDIRSLASH}usr/lib/lua/5.1/gpio.so
+${EMULSUBDIRSLASH}usr/lib/lua/5.1/sqlite.so
+${EMULSUBDIRSLASH}usr/lib/npf/ext_log.so
+${EMULSUBDIRSLASH}usr/lib/npf/ext_log.so.0
+${EMULSUBDIRSLASH}usr/lib/npf/ext_log.so.0.0
+${EMULSUBDIRSLASH}usr/lib/npf/ext_normalise.so
+${EMULSUBDIRSLASH}usr/lib/npf/ext_normalise.so.0
+${EMULSUBDIRSLASH}usr/lib/npf/ext_normalise.so.0.0
+${EMULSUBDIRSLASH}usr/lib/npf/ext_rndblock.so
+${EMULSUBDIRSLASH}usr/lib/npf/ext_rndblock.so.0
+${EMULSUBDIRSLASH}usr/lib/npf/ext_rndblock.so.0.0
+${EMULSUBDIRSLASH}usr/lib/security/pam_afslog.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_chroot.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_deny.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_echo.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_exec.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_ftpusers.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_group.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_guest.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_krb5.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_ksu.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_lastlog.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_login_access.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_nologin.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_permit.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_radius.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_rhosts.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_rootok.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_securetty.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_self.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_skey.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_ssh.so.3
+${EMULSUBDIRSLASH}usr/lib/security/pam_unix.so.3
diff --git a/emulators/compat61/PLIST.mips64eb b/emulators/compat61/PLIST.mips64eb
new file mode 100644
index 00000000000..164ce908812
--- /dev/null
+++ b/emulators/compat61/PLIST.mips64eb
@@ -0,0 +1,178 @@
+@comment $NetBSD: PLIST.mips64eb,v 1.1 2015/05/03 15:01:12 spz Exp $
+${EMULSUBDIRSLASH}usr/lib/64/libbfd.so.12
+${EMULSUBDIRSLASH}usr/lib/64/libbfd.so.12.0
+${EMULSUBDIRSLASH}usr/lib/64/libbind9.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libbind9.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libc.so.12.181
+${EMULSUBDIRSLASH}usr/lib/64/libdns.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libdns.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libdwarf.so.0
+${EMULSUBDIRSLASH}usr/lib/64/libdwarf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/libedit.so.3.0
+${EMULSUBDIRSLASH}usr/lib/64/libelf.so.0
+${EMULSUBDIRSLASH}usr/lib/64/libelf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/libevent.so.3
+${EMULSUBDIRSLASH}usr/lib/64/libevent.so.3.2
+${EMULSUBDIRSLASH}usr/lib/64/libexpat.so.2.0
+${EMULSUBDIRSLASH}usr/lib/64/libirs.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libirs.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libisc.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libisc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libisccc.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libisccc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libisccfg.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libisccfg.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/liblber.so.3.2
+${EMULSUBDIRSLASH}usr/lib/64/libldap.so.4.2
+${EMULSUBDIRSLASH}usr/lib/64/libldap_r.so.4.2
+${EMULSUBDIRSLASH}usr/lib/64/liblua.so.1
+${EMULSUBDIRSLASH}usr/lib/64/liblua.so.1.0
+${EMULSUBDIRSLASH}usr/lib/64/liblwres.so.5
+${EMULSUBDIRSLASH}usr/lib/64/liblwres.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/liblzf.so.0
+${EMULSUBDIRSLASH}usr/lib/64/liblzf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/libm.so.0.10
+${EMULSUBDIRSLASH}usr/lib/64/libmagic.so.3
+${EMULSUBDIRSLASH}usr/lib/64/libmagic.so.3.1
+${EMULSUBDIRSLASH}usr/lib/64/libobjc.so.3
+${EMULSUBDIRSLASH}usr/lib/64/libobjc.so.3.0
+${EMULSUBDIRSLASH}usr/lib/64/libopcodes.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libopcodes.so.5.0
+${EMULSUBDIRSLASH}usr/lib/64/libossaudio.so.1.0
+${EMULSUBDIRSLASH}usr/lib/64/libpam.so.3
+${EMULSUBDIRSLASH}usr/lib/64/libpam.so.3.0
+${EMULSUBDIRSLASH}usr/lib/64/libpcap.so.4
+${EMULSUBDIRSLASH}usr/lib/64/libpcap.so.4.0
+${EMULSUBDIRSLASH}usr/lib/64/libpci.so.2.0
+${EMULSUBDIRSLASH}usr/lib/64/libpthread.so.1.1
+${EMULSUBDIRSLASH}usr/lib/64/libresolv.so.2
+${EMULSUBDIRSLASH}usr/lib/64/libresolv.so.2.0
+${EMULSUBDIRSLASH}usr/lib/64/librt.so.1.0
+${EMULSUBDIRSLASH}usr/lib/64/librumpuser.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/libsqlite3.so.1.1
+${EMULSUBDIRSLASH}usr/lib/64/libssh.so.18
+${EMULSUBDIRSLASH}usr/lib/64/libssh.so.18.0
+${EMULSUBDIRSLASH}usr/lib/64/libstdc++.so.7.1
+${EMULSUBDIRSLASH}usr/lib/64/libutil.so.7.19
+${EMULSUBDIRSLASH}usr/lib/64/lua/5.1/gpio.so
+${EMULSUBDIRSLASH}usr/lib/64/lua/5.1/sqlite.so
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_log.so
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_log.so.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_log.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_normalise.so
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_normalise.so.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_normalise.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_rndblock.so
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_rndblock.so.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_rndblock.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_afslog.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_chroot.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_deny.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_echo.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_exec.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_ftpusers.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_group.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_guest.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_krb5.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_ksu.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_lastlog.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_login_access.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_nologin.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_permit.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_radius.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_rhosts.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_rootok.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_securetty.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_self.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_skey.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_ssh.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_unix.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libbfd.so.12
+${EMULSUBDIRSLASH}usr/lib/o32/libbfd.so.12.0
+${EMULSUBDIRSLASH}usr/lib/o32/libbind9.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libbind9.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libc.so.12.181
+${EMULSUBDIRSLASH}usr/lib/o32/libdns.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libdns.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libdwarf.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/libdwarf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/libedit.so.3.0
+${EMULSUBDIRSLASH}usr/lib/o32/libelf.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/libelf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/libevent.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libevent.so.3.2
+${EMULSUBDIRSLASH}usr/lib/o32/libexpat.so.2.0
+${EMULSUBDIRSLASH}usr/lib/o32/libgomp.so.1.0
+${EMULSUBDIRSLASH}usr/lib/o32/libirs.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libirs.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libisc.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libisc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libisccc.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libisccc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libisccfg.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libisccfg.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/liblber.so.3.2
+${EMULSUBDIRSLASH}usr/lib/o32/libldap.so.4.2
+${EMULSUBDIRSLASH}usr/lib/o32/libldap_r.so.4.2
+${EMULSUBDIRSLASH}usr/lib/o32/liblua.so.1
+${EMULSUBDIRSLASH}usr/lib/o32/liblua.so.1.0
+${EMULSUBDIRSLASH}usr/lib/o32/liblwres.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/liblwres.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/liblzf.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/liblzf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/libm.so.0.10
+${EMULSUBDIRSLASH}usr/lib/o32/libmagic.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libmagic.so.3.1
+${EMULSUBDIRSLASH}usr/lib/o32/libobjc.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libobjc.so.3.0
+${EMULSUBDIRSLASH}usr/lib/o32/libopcodes.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libopcodes.so.5.0
+${EMULSUBDIRSLASH}usr/lib/o32/libossaudio.so.1.0
+${EMULSUBDIRSLASH}usr/lib/o32/libpam.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libpam.so.3.0
+${EMULSUBDIRSLASH}usr/lib/o32/libpcap.so.4
+${EMULSUBDIRSLASH}usr/lib/o32/libpcap.so.4.0
+${EMULSUBDIRSLASH}usr/lib/o32/libpci.so.2.0
+${EMULSUBDIRSLASH}usr/lib/o32/libpthread.so.1.1
+${EMULSUBDIRSLASH}usr/lib/o32/libresolv.so.2
+${EMULSUBDIRSLASH}usr/lib/o32/libresolv.so.2.0
+${EMULSUBDIRSLASH}usr/lib/o32/librt.so.1.0
+${EMULSUBDIRSLASH}usr/lib/o32/librumpuser.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/libsqlite3.so.1.1
+${EMULSUBDIRSLASH}usr/lib/o32/libssh.so.18
+${EMULSUBDIRSLASH}usr/lib/o32/libssh.so.18.0
+${EMULSUBDIRSLASH}usr/lib/o32/libstdc++.so.7.1
+${EMULSUBDIRSLASH}usr/lib/o32/libutil.so.7.19
+${EMULSUBDIRSLASH}usr/lib/o32/lua/5.1/gpio.so
+${EMULSUBDIRSLASH}usr/lib/o32/lua/5.1/sqlite.so
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_log.so
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_log.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_log.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_normalise.so
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_normalise.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_normalise.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_rndblock.so
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_rndblock.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_rndblock.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_afslog.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_chroot.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_deny.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_echo.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_exec.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_ftpusers.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_group.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_guest.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_krb5.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_ksu.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_lastlog.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_login_access.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_nologin.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_permit.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_radius.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_rhosts.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_rootok.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_securetty.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_self.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_skey.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_ssh.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_unix.so.3
diff --git a/emulators/compat61/PLIST.mips64el b/emulators/compat61/PLIST.mips64el
new file mode 100644
index 00000000000..d5ab8665b4b
--- /dev/null
+++ b/emulators/compat61/PLIST.mips64el
@@ -0,0 +1,178 @@
+@comment $NetBSD: PLIST.mips64el,v 1.1 2015/05/03 15:01:12 spz Exp $
+${EMULSUBDIRSLASH}usr/lib/64/libbfd.so.12
+${EMULSUBDIRSLASH}usr/lib/64/libbfd.so.12.0
+${EMULSUBDIRSLASH}usr/lib/64/libbind9.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libbind9.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libc.so.12.181
+${EMULSUBDIRSLASH}usr/lib/64/libdns.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libdns.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libdwarf.so.0
+${EMULSUBDIRSLASH}usr/lib/64/libdwarf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/libedit.so.3.0
+${EMULSUBDIRSLASH}usr/lib/64/libelf.so.0
+${EMULSUBDIRSLASH}usr/lib/64/libelf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/libevent.so.3
+${EMULSUBDIRSLASH}usr/lib/64/libevent.so.3.2
+${EMULSUBDIRSLASH}usr/lib/64/libexpat.so.2.0
+${EMULSUBDIRSLASH}usr/lib/64/libirs.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libirs.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libisc.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libisc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libisccc.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libisccc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/libisccfg.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libisccfg.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/liblber.so.3.2
+${EMULSUBDIRSLASH}usr/lib/64/libldap.so.4.2
+${EMULSUBDIRSLASH}usr/lib/64/libldap_r.so.4.2
+${EMULSUBDIRSLASH}usr/lib/64/liblua.so.1
+${EMULSUBDIRSLASH}usr/lib/64/liblua.so.1.0
+${EMULSUBDIRSLASH}usr/lib/64/liblwres.so.5
+${EMULSUBDIRSLASH}usr/lib/64/liblwres.so.5.9
+${EMULSUBDIRSLASH}usr/lib/64/liblzf.so.0
+${EMULSUBDIRSLASH}usr/lib/64/liblzf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/libm.so.0.10
+${EMULSUBDIRSLASH}usr/lib/64/libmagic.so.3
+${EMULSUBDIRSLASH}usr/lib/64/libmagic.so.3.1
+${EMULSUBDIRSLASH}usr/lib/64/libobjc.so.3
+${EMULSUBDIRSLASH}usr/lib/64/libobjc.so.3.0
+${EMULSUBDIRSLASH}usr/lib/64/libopcodes.so.5
+${EMULSUBDIRSLASH}usr/lib/64/libopcodes.so.5.0
+${EMULSUBDIRSLASH}usr/lib/64/libossaudio.so.1.0
+${EMULSUBDIRSLASH}usr/lib/64/libpam.so.3
+${EMULSUBDIRSLASH}usr/lib/64/libpam.so.3.0
+${EMULSUBDIRSLASH}usr/lib/64/libpcap.so.4
+${EMULSUBDIRSLASH}usr/lib/64/libpcap.so.4.0
+${EMULSUBDIRSLASH}usr/lib/64/libpci.so.2.0
+${EMULSUBDIRSLASH}usr/lib/64/libpthread.so.1.1
+${EMULSUBDIRSLASH}usr/lib/64/libresolv.so.2
+${EMULSUBDIRSLASH}usr/lib/64/libresolv.so.2.0
+${EMULSUBDIRSLASH}usr/lib/64/librt.so.1.0
+${EMULSUBDIRSLASH}usr/lib/64/librumpuser.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/libsqlite3.so.1.1
+${EMULSUBDIRSLASH}usr/lib/64/libssh.so.18
+${EMULSUBDIRSLASH}usr/lib/64/libssh.so.18.0
+${EMULSUBDIRSLASH}usr/lib/64/libstdc++.so.7.1
+${EMULSUBDIRSLASH}usr/lib/64/libutil.so.7.19
+${EMULSUBDIRSLASH}usr/lib/64/lua/5.1/gpio.so
+${EMULSUBDIRSLASH}usr/lib/64/lua/5.1/sqlite.so
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_log.so
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_log.so.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_log.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_normalise.so
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_normalise.so.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_normalise.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_rndblock.so
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_rndblock.so.0
+${EMULSUBDIRSLASH}usr/lib/64/npf/ext_rndblock.so.0.0
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_afslog.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_chroot.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_deny.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_echo.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_exec.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_ftpusers.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_group.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_guest.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_krb5.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_ksu.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_lastlog.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_login_access.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_nologin.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_permit.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_radius.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_rhosts.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_rootok.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_securetty.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_self.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_skey.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_ssh.so.3
+${EMULSUBDIRSLASH}usr/lib/64/security/pam_unix.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libbfd.so.12
+${EMULSUBDIRSLASH}usr/lib/o32/libbfd.so.12.0
+${EMULSUBDIRSLASH}usr/lib/o32/libbind9.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libbind9.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libc.so.12.181
+${EMULSUBDIRSLASH}usr/lib/o32/libdns.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libdns.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libdwarf.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/libdwarf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/libedit.so.3.0
+${EMULSUBDIRSLASH}usr/lib/o32/libelf.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/libelf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/libevent.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libevent.so.3.2
+${EMULSUBDIRSLASH}usr/lib/o32/libexpat.so.2.0
+${EMULSUBDIRSLASH}usr/lib/o32/libgomp.so.1.0
+${EMULSUBDIRSLASH}usr/lib/o32/libirs.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libirs.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libisc.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libisc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libisccc.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libisccc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/libisccfg.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libisccfg.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/liblber.so.3.2
+${EMULSUBDIRSLASH}usr/lib/o32/libldap.so.4.2
+${EMULSUBDIRSLASH}usr/lib/o32/libldap_r.so.4.2
+${EMULSUBDIRSLASH}usr/lib/o32/liblua.so.1
+${EMULSUBDIRSLASH}usr/lib/o32/liblua.so.1.0
+${EMULSUBDIRSLASH}usr/lib/o32/liblwres.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/liblwres.so.5.9
+${EMULSUBDIRSLASH}usr/lib/o32/liblzf.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/liblzf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/libm.so.0.10
+${EMULSUBDIRSLASH}usr/lib/o32/libmagic.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libmagic.so.3.1
+${EMULSUBDIRSLASH}usr/lib/o32/libobjc.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libobjc.so.3.0
+${EMULSUBDIRSLASH}usr/lib/o32/libopcodes.so.5
+${EMULSUBDIRSLASH}usr/lib/o32/libopcodes.so.5.0
+${EMULSUBDIRSLASH}usr/lib/o32/libossaudio.so.1.0
+${EMULSUBDIRSLASH}usr/lib/o32/libpam.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/libpam.so.3.0
+${EMULSUBDIRSLASH}usr/lib/o32/libpcap.so.4
+${EMULSUBDIRSLASH}usr/lib/o32/libpcap.so.4.0
+${EMULSUBDIRSLASH}usr/lib/o32/libpci.so.2.0
+${EMULSUBDIRSLASH}usr/lib/o32/libpthread.so.1.1
+${EMULSUBDIRSLASH}usr/lib/o32/libresolv.so.2
+${EMULSUBDIRSLASH}usr/lib/o32/libresolv.so.2.0
+${EMULSUBDIRSLASH}usr/lib/o32/librt.so.1.0
+${EMULSUBDIRSLASH}usr/lib/o32/librumpuser.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/libsqlite3.so.1.1
+${EMULSUBDIRSLASH}usr/lib/o32/libssh.so.18
+${EMULSUBDIRSLASH}usr/lib/o32/libssh.so.18.0
+${EMULSUBDIRSLASH}usr/lib/o32/libstdc++.so.7.1
+${EMULSUBDIRSLASH}usr/lib/o32/libutil.so.7.19
+${EMULSUBDIRSLASH}usr/lib/o32/lua/5.1/gpio.so
+${EMULSUBDIRSLASH}usr/lib/o32/lua/5.1/sqlite.so
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_log.so
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_log.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_log.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_normalise.so
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_normalise.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_normalise.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_rndblock.so
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_rndblock.so.0
+${EMULSUBDIRSLASH}usr/lib/o32/npf/ext_rndblock.so.0.0
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_afslog.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_chroot.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_deny.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_echo.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_exec.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_ftpusers.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_group.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_guest.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_krb5.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_ksu.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_lastlog.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_login_access.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_nologin.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_permit.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_radius.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_rhosts.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_rootok.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_securetty.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_self.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_skey.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_ssh.so.3
+${EMULSUBDIRSLASH}usr/lib/o32/security/pam_unix.so.3
diff --git a/emulators/compat61/PLIST.sparc64 b/emulators/compat61/PLIST.sparc64
new file mode 100644
index 00000000000..a7b0deabc34
--- /dev/null
+++ b/emulators/compat61/PLIST.sparc64
@@ -0,0 +1,90 @@
+@comment $NetBSD: PLIST.sparc64,v 1.1 2015/05/03 15:01:12 spz Exp $
+${EMULSUBDIRSLASH}usr/lib/sparc/libbfd.so.12
+${EMULSUBDIRSLASH}usr/lib/sparc/libbfd.so.12.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libbind9.so.5
+${EMULSUBDIRSLASH}usr/lib/sparc/libbind9.so.5.9
+${EMULSUBDIRSLASH}usr/lib/sparc/libc.so.12.181
+${EMULSUBDIRSLASH}usr/lib/sparc/libdns.so.5
+${EMULSUBDIRSLASH}usr/lib/sparc/libdns.so.5.9
+${EMULSUBDIRSLASH}usr/lib/sparc/libdwarf.so.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libdwarf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libedit.so.3.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libelf.so.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libelf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libevent.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/libevent.so.3.2
+${EMULSUBDIRSLASH}usr/lib/sparc/libexpat.so.2.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libgomp.so.1.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libirs.so.5
+${EMULSUBDIRSLASH}usr/lib/sparc/libirs.so.5.9
+${EMULSUBDIRSLASH}usr/lib/sparc/libisc.so.5
+${EMULSUBDIRSLASH}usr/lib/sparc/libisc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/sparc/libisccc.so.5
+${EMULSUBDIRSLASH}usr/lib/sparc/libisccc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/sparc/libisccfg.so.5
+${EMULSUBDIRSLASH}usr/lib/sparc/libisccfg.so.5.9
+${EMULSUBDIRSLASH}usr/lib/sparc/liblber.so.3.2
+${EMULSUBDIRSLASH}usr/lib/sparc/libldap.so.4.2
+${EMULSUBDIRSLASH}usr/lib/sparc/libldap_r.so.4.2
+${EMULSUBDIRSLASH}usr/lib/sparc/liblua.so.1
+${EMULSUBDIRSLASH}usr/lib/sparc/liblua.so.1.0
+${EMULSUBDIRSLASH}usr/lib/sparc/liblwres.so.5
+${EMULSUBDIRSLASH}usr/lib/sparc/liblwres.so.5.9
+${EMULSUBDIRSLASH}usr/lib/sparc/liblzf.so.0
+${EMULSUBDIRSLASH}usr/lib/sparc/liblzf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libm.so.0.10
+${EMULSUBDIRSLASH}usr/lib/sparc/libmagic.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/libmagic.so.3.1
+${EMULSUBDIRSLASH}usr/lib/sparc/libobjc.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/libobjc.so.3.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libopcodes.so.5
+${EMULSUBDIRSLASH}usr/lib/sparc/libopcodes.so.5.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libossaudio.so.1.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libpam.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/libpam.so.3.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libpcap.so.4
+${EMULSUBDIRSLASH}usr/lib/sparc/libpcap.so.4.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libpci.so.2.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libpthread.so.1.1
+${EMULSUBDIRSLASH}usr/lib/sparc/libresolv.so.2
+${EMULSUBDIRSLASH}usr/lib/sparc/libresolv.so.2.0
+${EMULSUBDIRSLASH}usr/lib/sparc/librt.so.1.0
+${EMULSUBDIRSLASH}usr/lib/sparc/librumpuser.so.0.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libsqlite3.so.1.1
+${EMULSUBDIRSLASH}usr/lib/sparc/libssh.so.18
+${EMULSUBDIRSLASH}usr/lib/sparc/libssh.so.18.0
+${EMULSUBDIRSLASH}usr/lib/sparc/libstdc++.so.7.1
+${EMULSUBDIRSLASH}usr/lib/sparc/libutil.so.7.19
+${EMULSUBDIRSLASH}usr/lib/sparc/lua/5.1/gpio.so
+${EMULSUBDIRSLASH}usr/lib/sparc/lua/5.1/sqlite.so
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_log.so
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_log.so.0
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_log.so.0.0
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_normalise.so
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_normalise.so.0
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_normalise.so.0.0
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_rndblock.so
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_rndblock.so.0
+${EMULSUBDIRSLASH}usr/lib/sparc/npf/ext_rndblock.so.0.0
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_afslog.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_chroot.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_deny.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_echo.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_exec.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_ftpusers.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_group.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_guest.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_krb5.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_ksu.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_lastlog.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_login_access.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_nologin.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_permit.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_radius.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_rhosts.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_rootok.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_securetty.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_self.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_skey.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_ssh.so.3
+${EMULSUBDIRSLASH}usr/lib/sparc/security/pam_unix.so.3
diff --git a/emulators/compat61/PLIST.x86_64 b/emulators/compat61/PLIST.x86_64
new file mode 100644
index 00000000000..2f39da5d58d
--- /dev/null
+++ b/emulators/compat61/PLIST.x86_64
@@ -0,0 +1,90 @@
+@comment $NetBSD: PLIST.x86_64,v 1.1 2015/05/03 15:01:12 spz Exp $
+${EMULSUBDIRSLASH}usr/lib/i386/libbfd.so.12
+${EMULSUBDIRSLASH}usr/lib/i386/libbfd.so.12.0
+${EMULSUBDIRSLASH}usr/lib/i386/libbind9.so.5
+${EMULSUBDIRSLASH}usr/lib/i386/libbind9.so.5.9
+${EMULSUBDIRSLASH}usr/lib/i386/libc.so.12.181
+${EMULSUBDIRSLASH}usr/lib/i386/libdns.so.5
+${EMULSUBDIRSLASH}usr/lib/i386/libdns.so.5.9
+${EMULSUBDIRSLASH}usr/lib/i386/libdwarf.so.0
+${EMULSUBDIRSLASH}usr/lib/i386/libdwarf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/i386/libedit.so.3.0
+${EMULSUBDIRSLASH}usr/lib/i386/libelf.so.0
+${EMULSUBDIRSLASH}usr/lib/i386/libelf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/i386/libevent.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/libevent.so.3.2
+${EMULSUBDIRSLASH}usr/lib/i386/libexpat.so.2.0
+${EMULSUBDIRSLASH}usr/lib/i386/libgomp.so.1.0
+${EMULSUBDIRSLASH}usr/lib/i386/libirs.so.5
+${EMULSUBDIRSLASH}usr/lib/i386/libirs.so.5.9
+${EMULSUBDIRSLASH}usr/lib/i386/libisc.so.5
+${EMULSUBDIRSLASH}usr/lib/i386/libisc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/i386/libisccc.so.5
+${EMULSUBDIRSLASH}usr/lib/i386/libisccc.so.5.9
+${EMULSUBDIRSLASH}usr/lib/i386/libisccfg.so.5
+${EMULSUBDIRSLASH}usr/lib/i386/libisccfg.so.5.9
+${EMULSUBDIRSLASH}usr/lib/i386/liblber.so.3.2
+${EMULSUBDIRSLASH}usr/lib/i386/libldap.so.4.2
+${EMULSUBDIRSLASH}usr/lib/i386/libldap_r.so.4.2
+${EMULSUBDIRSLASH}usr/lib/i386/liblua.so.1
+${EMULSUBDIRSLASH}usr/lib/i386/liblua.so.1.0
+${EMULSUBDIRSLASH}usr/lib/i386/liblwres.so.5
+${EMULSUBDIRSLASH}usr/lib/i386/liblwres.so.5.9
+${EMULSUBDIRSLASH}usr/lib/i386/liblzf.so.0
+${EMULSUBDIRSLASH}usr/lib/i386/liblzf.so.0.0
+${EMULSUBDIRSLASH}usr/lib/i386/libm.so.0.10
+${EMULSUBDIRSLASH}usr/lib/i386/libmagic.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/libmagic.so.3.1
+${EMULSUBDIRSLASH}usr/lib/i386/libobjc.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/libobjc.so.3.0
+${EMULSUBDIRSLASH}usr/lib/i386/libopcodes.so.5
+${EMULSUBDIRSLASH}usr/lib/i386/libopcodes.so.5.0
+${EMULSUBDIRSLASH}usr/lib/i386/libossaudio.so.1.0
+${EMULSUBDIRSLASH}usr/lib/i386/libpam.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/libpam.so.3.0
+${EMULSUBDIRSLASH}usr/lib/i386/libpcap.so.4
+${EMULSUBDIRSLASH}usr/lib/i386/libpcap.so.4.0
+${EMULSUBDIRSLASH}usr/lib/i386/libpci.so.2.0
+${EMULSUBDIRSLASH}usr/lib/i386/libpthread.so.1.1
+${EMULSUBDIRSLASH}usr/lib/i386/libresolv.so.2
+${EMULSUBDIRSLASH}usr/lib/i386/libresolv.so.2.0
+${EMULSUBDIRSLASH}usr/lib/i386/librt.so.1.0
+${EMULSUBDIRSLASH}usr/lib/i386/librumpuser.so.0.0
+${EMULSUBDIRSLASH}usr/lib/i386/libsqlite3.so.1.1
+${EMULSUBDIRSLASH}usr/lib/i386/libssh.so.18
+${EMULSUBDIRSLASH}usr/lib/i386/libssh.so.18.0
+${EMULSUBDIRSLASH}usr/lib/i386/libstdc++.so.7.1
+${EMULSUBDIRSLASH}usr/lib/i386/libutil.so.7.19
+${EMULSUBDIRSLASH}usr/lib/i386/lua/5.1/gpio.so
+${EMULSUBDIRSLASH}usr/lib/i386/lua/5.1/sqlite.so
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_log.so
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_log.so.0
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_log.so.0.0
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_normalise.so
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_normalise.so.0
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_normalise.so.0.0
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_rndblock.so
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_rndblock.so.0
+${EMULSUBDIRSLASH}usr/lib/i386/npf/ext_rndblock.so.0.0
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_afslog.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_chroot.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_deny.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_echo.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_exec.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_ftpusers.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_group.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_guest.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_krb5.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_ksu.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_lastlog.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_login_access.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_nologin.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_permit.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_radius.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_rhosts.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_rootok.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_securetty.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_self.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_skey.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_ssh.so.3
+${EMULSUBDIRSLASH}usr/lib/i386/security/pam_unix.so.3
diff --git a/emulators/compat61/distinfo b/emulators/compat61/distinfo
new file mode 100644
index 00000000000..e01b45d2763
--- /dev/null
+++ b/emulators/compat61/distinfo
@@ -0,0 +1,38 @@
+$NetBSD: distinfo,v 1.1 2015/05/03 15:01:12 spz Exp $
+
+SHA1 (20150430/compat61-alpha-6.1.tar.bz2) = 343683e130f8c2dbae0d869b5469827dd476dbbe
+RMD160 (20150430/compat61-alpha-6.1.tar.bz2) = e042b9f6198eeed9eb24e873718fa5233787e45a
+Size (20150430/compat61-alpha-6.1.tar.bz2) = 4066845 bytes
+SHA1 (20150430/compat61-arm-6.1.tar.bz2) = d2add013355c28431f2e6bfad8e6f5639edc740b
+RMD160 (20150430/compat61-arm-6.1.tar.bz2) = d2d8d73e3899072869872eef14a63de7664bd7d6
+Size (20150430/compat61-arm-6.1.tar.bz2) = 3737164 bytes
+SHA1 (20150430/compat61-i386-6.1.tar.bz2) = 4388a16146a25d68c2d1001f6b381a7d987caad1
+RMD160 (20150430/compat61-i386-6.1.tar.bz2) = 38e92368e015c06c3697d1eeb3d9761b0b58dd37
+Size (20150430/compat61-i386-6.1.tar.bz2) = 3507143 bytes
+SHA1 (20150430/compat61-m68k-6.1.tar.bz2) = f779ad46c915e0779c1d1c17cb7dc0651692a980
+RMD160 (20150430/compat61-m68k-6.1.tar.bz2) = 8d1ce452c66dc194c1e0bf2c4e089a154f9e1efd
+Size (20150430/compat61-m68k-6.1.tar.bz2) = 3196778 bytes
+SHA1 (20150430/compat61-mips64eb-6.1.tar.bz2) = 6707d51cfa7726c237e94f7279901f36819e8f59
+RMD160 (20150430/compat61-mips64eb-6.1.tar.bz2) = aaadeaf8983c6eacfe4b4073e5c975f6b3774aaf
+Size (20150430/compat61-mips64eb-6.1.tar.bz2) = 11095613 bytes
+SHA1 (20150430/compat61-mips64el-6.1.tar.bz2) = dd3170a51a3ae9e029f9fcc88ab74489fd4703b5
+RMD160 (20150430/compat61-mips64el-6.1.tar.bz2) = dcb71045dd7993f45af71465b39b9d8ba4c91e94
+Size (20150430/compat61-mips64el-6.1.tar.bz2) = 11196915 bytes
+SHA1 (20150430/compat61-mipseb-6.1.tar.bz2) = 3fc1cf34dcfaa8460cc066037f17c150e6ffee93
+RMD160 (20150430/compat61-mipseb-6.1.tar.bz2) = 650f9ec2046ef4d3b1fc04f77755ccec6388cd65
+Size (20150430/compat61-mipseb-6.1.tar.bz2) = 3760621 bytes
+SHA1 (20150430/compat61-mipsel-6.1.tar.bz2) = dc848e68bc33a1ecd883c8b34e5a0bfdae492c54
+RMD160 (20150430/compat61-mipsel-6.1.tar.bz2) = c7e6b257e77708e234052dc40422d2bed552756b
+Size (20150430/compat61-mipsel-6.1.tar.bz2) = 3803994 bytes
+SHA1 (20150430/compat61-powerpc-6.1.tar.bz2) = 6b68eb9676ab16deeecde1093b390bb474fc6d24
+RMD160 (20150430/compat61-powerpc-6.1.tar.bz2) = fe9d3f159cccaf3fe275bc7ac0bcaa138c05aa69
+Size (20150430/compat61-powerpc-6.1.tar.bz2) = 4047854 bytes
+SHA1 (20150430/compat61-sparc-6.1.tar.bz2) = f3a001624a69fc4a9dd291346f9dd93df1181e30
+RMD160 (20150430/compat61-sparc-6.1.tar.bz2) = 1a2a031e968812e25302d4b4531ebf8fb496a2ae
+Size (20150430/compat61-sparc-6.1.tar.bz2) = 3659451 bytes
+SHA1 (20150430/compat61-sparc64-6.1.tar.bz2) = 687196095edda465f9027af2d0a72be6f9467a42
+RMD160 (20150430/compat61-sparc64-6.1.tar.bz2) = c81286919553d2affa2f5810e4d694e6cbc913d6
+Size (20150430/compat61-sparc64-6.1.tar.bz2) = 7557318 bytes
+SHA1 (20150430/compat61-x86_64-6.1.tar.bz2) = 6f8da73029d3dc16310cf17124cf8ca0e8c9805f
+RMD160 (20150430/compat61-x86_64-6.1.tar.bz2) = 7aa19f7cd6e1cf94da7288767c0dc4e0c4c90996
+Size (20150430/compat61-x86_64-6.1.tar.bz2) = 7441950 bytes
diff --git a/emulators/compat61/emulator.mk b/emulators/compat61/emulator.mk
new file mode 100644
index 00000000000..07edd77dc60
--- /dev/null
+++ b/emulators/compat61/emulator.mk
@@ -0,0 +1,29 @@
+# $NetBSD: emulator.mk,v 1.1 2015/05/03 15:01:12 spz 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-6.1
+
+EMUL_EXEC_FMT= ELF
+EMULSUBDIR= emul/netbsd
+OPSYS_EMULDIR= ${_OPSYS_EMULDIR.netbsd}
+
+.if empty(OS_VERSION:M[0-5].*) && empty(OS_VERSION:M6.1*)
+DEPENDS_netbsd-6.1.base?= compat61>=6.1:../../emulators/compat61
+.endif
diff --git a/emulators/compat61/options.mk b/emulators/compat61/options.mk
new file mode 100644
index 00000000000..ff136848319
--- /dev/null
+++ b/emulators/compat61/options.mk
@@ -0,0 +1,11 @@
+# $NetBSD: options.mk,v 1.1 2015/05/03 15:01:12 spz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.compat61
+PKG_SUPPORTED_OPTIONS= x11
+PKG_SUGGESTED_OPTIONS= x11
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mx11)
+DEPENDS+= compat61-x11>=6.1:../../emulators/compat61-x11
+.endif
diff --git a/mk/emulator/netbsd-compat.mk b/mk/emulator/netbsd-compat.mk
index bcc5cec6139..da458d1d7b2 100644
--- a/mk/emulator/netbsd-compat.mk
+++ b/mk/emulator/netbsd-compat.mk
@@ -1,4 +1,4 @@
-# $NetBSD: netbsd-compat.mk,v 1.4 2013/02/17 17:28:42 spz Exp $
+# $NetBSD: netbsd-compat.mk,v 1.5 2015/05/03 15:01:11 spz Exp $
#
# COMPAT_* for NetBSD -- see options(4).
#
@@ -42,6 +42,7 @@ _EMUL_PKG.compat-4.0= compat40
_EMUL_PKG.compat-5.0= compat50
_EMUL_PKG.compat-5.1= compat51
_EMUL_PKG.compat-6.0= compat60
+_EMUL_PKG.compat-6.1= compat61
_EMUL_PKG.compat= # defined, but empty
# EMUL_TYPE.netbsd can be "compat" or "compat-[0-9]*". If a particular
@@ -82,9 +83,12 @@ _EMUL_PKG.compat= # defined, but empty
. elif !empty(NETBSD_VERSION_REQD:M5.[1-9]*)
. include "${PKGSRCDIR}/emulators/${_EMUL_PKG.compat-5.1}/emulator.mk"
-. elif !empty(NETBSD_VERSION_REQD:M6.*)
+. elif !empty(NETBSD_VERSION_REQD:M6.0.*)
. include "${PKGSRCDIR}/emulators/${_EMUL_PKG.compat-6.0}/emulator.mk"
+. elif !empty(NETBSD_VERSION_REQD:M6.1.*)
+. include "${PKGSRCDIR}/emulators/${_EMUL_PKG.compat-6.1}/emulator.mk"
+
. endif
.else