fix compat60 (and strip down a lot to a backward compatibility package

	to NetBSD 6.1)
introduce compat61 (and compat61-x11 with it) as a backward compatibility
	package to NetBSD 7
add compat61* to mk/emulator/netbsd-compat.mk and emulators/Makefile

some sort of version for the binary compat packages might have been
useful, maybe abusing the DIST_SUBDIR? compat61 is likely to change
if/when NetBSD 6.2 is released

7 files changed, 42 insertions, 121 deletions

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