pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Add support for NetBSD 4.0 compatibility through insta...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7dbbc6e6e081
branches:  trunk
changeset: 537006:7dbbc6e6e081
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Dec 31 20:06:37 2007 +0000

description:
Add support for NetBSD 4.0 compatibility through installing compat40
and netbsd32_compat40 packages.  The compat40 packages are currently
built by comparing the 4.0 release against the 20071230 version of
HEAD.

Commit approved by <agc>.

diffstat:

 doc/CHANGES-2007                            |    6 +-
 emulators/Makefile                          |    6 +-
 emulators/compat30/Makefile                 |    8 +-
 emulators/compat40-extras/DESCR             |    4 +
 emulators/compat40-extras/Makefile          |   31 +
 emulators/compat40-extras/PLIST             |  460 ++++++++++++++++++++++++++++
 emulators/compat40-extras/PLIST.i386        |   13 +
 emulators/compat40-extras/PLIST.sparc       |    5 +
 emulators/compat40-extras/distinfo          |    8 +
 emulators/compat40/DESCR                    |    2 +
 emulators/compat40/MESSAGE                  |    7 +
 emulators/compat40/Makefile                 |   64 +++
 emulators/compat40/PLIST                    |    7 +
 emulators/compat40/distinfo                 |   38 ++
 emulators/compat40/emulator.mk              |   44 ++
 emulators/netbsd32_compat40-extras/Makefile |    5 +
 emulators/netbsd32_compat40/Makefile        |    5 +
 mk/emulator/netbsd-compat.mk                |    6 +-
 18 files changed, 711 insertions(+), 8 deletions(-)

diffs (truncated from 849 to 300 lines):

diff -r bd82e0ecb8e4 -r 7dbbc6e6e081 doc/CHANGES-2007
--- a/doc/CHANGES-2007  Mon Dec 31 19:52:19 2007 +0000
+++ b/doc/CHANGES-2007  Mon Dec 31 20:06:37 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.2724 2007/12/31 09:22:57 taca Exp $
+$NetBSD: CHANGES-2007,v 1.2725 2007/12/31 20:06:37 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2007:
 
@@ -4927,3 +4927,7 @@
        Updated www/sarg to 2.1nb3 [obache 2007-12-31]
        Updated www/screws to 0.56nb4 [obache 2007-12-31]
        Updated net/netatalk to 2.0.3nb6 [taca 2007-12-31]
+       Added emulators/compat40 version 4.0 [jlam 2007-12-31]
+       Added emulators/compat40-extras version 4.0 [jlam 2007-12-31]
+       Added emulators/netbsd32_compat40 version 4.0 [jlam 2007-12-31]
+       Added emulators/netbsd32_compat40-extras version 4.0 [jlam 2007-12-31]
diff -r bd82e0ecb8e4 -r 7dbbc6e6e081 emulators/Makefile
--- a/emulators/Makefile        Mon Dec 31 19:52:19 2007 +0000
+++ b/emulators/Makefile        Mon Dec 31 20:06:37 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.165 2007/09/07 22:56:23 wiz Exp $
+# $NetBSD: Makefile,v 1.166 2007/12/31 20:06:38 jlam Exp $
 #
 
 COMMENT=       Emulators for other operating systems
@@ -32,6 +32,8 @@
 SUBDIR+=       compat20-extras
 SUBDIR+=       compat30
 SUBDIR+=       compat30-extras
+SUBDIR+=       compat40
+SUBDIR+=       compat40-extras
 #SUBDIR+=      compat_netbsd           # only contains Makefile fragments
 SUBDIR+=       cygwin_esound
 SUBDIR+=       cygwin_lib
@@ -79,6 +81,8 @@
 SUBDIR+=       netbsd32_compat20-extras
 SUBDIR+=       netbsd32_compat30
 SUBDIR+=       netbsd32_compat30-extras
+SUBDIR+=       netbsd32_compat40
+SUBDIR+=       netbsd32_compat40-extras
 SUBDIR+=       openmsx
 SUBDIR+=       or1ksim
 SUBDIR+=       osf1_lib
diff -r bd82e0ecb8e4 -r 7dbbc6e6e081 emulators/compat30/Makefile
--- a/emulators/compat30/Makefile       Mon Dec 31 19:52:19 2007 +0000
+++ b/emulators/compat30/Makefile       Mon Dec 31 20:06:37 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/10/09 19:19:09 martti Exp $
+# $NetBSD: Makefile,v 1.5 2007/12/31 20:06:38 jlam Exp $
 
 COMPAT_PKG=            compat30        # for compat_netbsd/Makefile.common
 NETBSD_VERSION=                3.0
@@ -38,8 +38,7 @@
 .  if !empty(COMPAT_EXTRAS)
 DEPENDS+=      ${COMPAT_EXTRAS}
 .  else
-# XXX This package doesn't exist yet.
-#DEPENDS+=     netbsd32_compat40>=4.0:../../emulators/netbsd32_compat40
+DEPENDS+=      netbsd32_compat40>=4.0:../../emulators/netbsd32_compat40
 .  endif
 #
 # vax running NetBSD-4.x lacks any shared libraries, so depend on the
@@ -56,8 +55,7 @@
 .elif empty(OS_VERSION:M[0-3].*) && empty(OS_VERSION:M4.[0-9]) && \
       empty(OS_VERSION:M4.[0-9].*) && empty(OS_VERSION:M4.[1-8][0-9].*) && \
       empty(OS_VERSION:M4.9[0-8]*)
-# XXX This package doesn't exist yet.
-#DEPENDS+=     compat40>=4.0:../../emulators/compat40
+DEPENDS+=      compat40>=4.0:../../emulators/compat40
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff -r bd82e0ecb8e4 -r 7dbbc6e6e081 emulators/compat40-extras/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/compat40-extras/DESCR   Mon Dec 31 20:06:37 2007 +0000
@@ -0,0 +1,4 @@
+This package supplies the extra user files needed to run dynamically
+linked executables compiled under NetBSD 4.0, including user files
+that might be found in NetBSD versions beyond 4.0 that are missing
+from the pkgsrc/emulators/compat40 package.
diff -r bd82e0ecb8e4 -r 7dbbc6e6e081 emulators/compat40-extras/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/compat40-extras/Makefile        Mon Dec 31 20:06:37 2007 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2007/12/31 20:06:40 jlam Exp $
+
+COMPAT_PKG=            compat40        # for compat_netbsd/Makefile.common
+NETBSD_VERSION=                4.0
+
+HOMEPAGE=              http://www.NetBSD.org/releases/formal-4/index.html
+COMMENT=               Additional shared libraries for NetBSD 4.0 compatibility
+
+EMUL_PLATFORMS=                netbsd-i386 netbsd-sparc
+
+.include "../../emulators/compat_netbsd/Makefile.common"
+
+DISTNAME=              compat40-extras-${EMUL_ARCH}-4.0
+
+# XXX Until NetBSD 5.0 is released, we fetch the distfiles into a date-specific
+# XXX subdirectory where the date corresponds to the build of HEAD against
+# XXX which these compat40 packages were generated.
+#
+DIST_SUBDIR=           20071230
+
+# This package should only be installed for COMPAT_NETBSD32 emulation
+# on machines running NetBSD-4.x.
+#
+.if defined(NETBSD_COMPAT32)
+ACCEPTABLE_NETBSD=     NetBSD-3.99.* NetBSD-4.[0-9]                    \
+                       NetBSD-4.[1-8][0-9].* NetBSD-4.9[0-8].*
+.else
+NOT_FOR_PLATFORM=      NetBSD-*-${MACHINE_ARCH}
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff -r bd82e0ecb8e4 -r 7dbbc6e6e081 emulators/compat40-extras/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/compat40-extras/PLIST   Mon Dec 31 20:06:37 2007 +0000
@@ -0,0 +1,460 @@
+@comment $NetBSD: PLIST,v 1.1 2007/12/31 20:06:40 jlam Exp $
+${EMULSUBDIRSLASH}lib/libc.so
+${EMULSUBDIRSLASH}lib/libc.so.12
+${EMULSUBDIRSLASH}lib/libc.so.12.149
+${EMULSUBDIRSLASH}lib/libcrypt.so
+${EMULSUBDIRSLASH}lib/libcrypt.so.0
+${EMULSUBDIRSLASH}lib/libcrypt.so.0.2
+${EMULSUBDIRSLASH}lib/libcrypto.so
+${EMULSUBDIRSLASH}lib/libcrypto.so.3
+${EMULSUBDIRSLASH}lib/libcrypto.so.3.2
+${EMULSUBDIRSLASH}lib/libedit.so
+${EMULSUBDIRSLASH}lib/libedit.so.2
+${EMULSUBDIRSLASH}lib/libedit.so.2.10
+${EMULSUBDIRSLASH}lib/libevent.so
+${EMULSUBDIRSLASH}lib/libevent.so.1
+${EMULSUBDIRSLASH}lib/libevent.so.1.0
+${EMULSUBDIRSLASH}lib/libipsec.so
+${EMULSUBDIRSLASH}lib/libipsec.so.2
+${EMULSUBDIRSLASH}lib/libipsec.so.2.2
+${EMULSUBDIRSLASH}lib/libkvm.so
+${EMULSUBDIRSLASH}lib/libkvm.so.5
+${EMULSUBDIRSLASH}lib/libkvm.so.5.2
+${EMULSUBDIRSLASH}lib/libm.so
+${EMULSUBDIRSLASH}lib/libm.so.0
+${EMULSUBDIRSLASH}lib/libm.so.0.5
+${EMULSUBDIRSLASH}lib/libprop.so
+${EMULSUBDIRSLASH}lib/libprop.so.0
+${EMULSUBDIRSLASH}lib/libprop.so.0.5
+${EMULSUBDIRSLASH}lib/libradius.so
+${EMULSUBDIRSLASH}lib/libradius.so.1
+${EMULSUBDIRSLASH}lib/libradius.so.1.0
+${EMULSUBDIRSLASH}lib/libtermcap.so
+${EMULSUBDIRSLASH}lib/libtermcap.so.0
+${EMULSUBDIRSLASH}lib/libtermcap.so.0.6
+${EMULSUBDIRSLASH}lib/libtermlib.so
+${EMULSUBDIRSLASH}lib/libtermlib.so.0
+${EMULSUBDIRSLASH}lib/libtermlib.so.0.6
+${EMULSUBDIRSLASH}lib/libutil.so
+${EMULSUBDIRSLASH}lib/libutil.so.7
+${EMULSUBDIRSLASH}lib/libutil.so.7.11
+${EMULSUBDIRSLASH}lib/libz.so
+${EMULSUBDIRSLASH}lib/libz.so.1
+${EMULSUBDIRSLASH}lib/libz.so.1.0
+${EMULSUBDIRSLASH}libexec/ld.elf_so
+${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/xlcUTF8Load.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/libFS.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGL.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLU.so.1.3
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLw.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLw.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libGLw.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libICE.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libICE.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libICE.so.6.3
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libOSMesa.so.4.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libSM.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libSM.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libSM.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libX11.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXRes.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXTrap.so.6.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXau.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXau.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXau.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.6.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.7
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXaw.so.7.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXcursor.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXdmcp.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXdmcp.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXdmcp.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXext.so.6.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfont.so.1.5
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXfontcache.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.1.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXft.so.2.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXi.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXi.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXi.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXinerama.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmu.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXmuu.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXp.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXp.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXp.so.6.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXpm.so.4.11
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrandr.so.2.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXrender.so.1.2
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXss.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXt.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXt.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXt.so.6.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXtst.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXtst.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXtst.so.6.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXv.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXvMC.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86dga.so.1.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86misc.so.1.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libXxf86vm.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdmx.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdmx.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdmx.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdps.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libdpstk.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libexpat.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libexpat.so.4
+${EMULSUBDIRSLASH}usr/X11R6/lib/libexpat.so.4.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontconfig.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so.1
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfontenc.so.1.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so.9
+${EMULSUBDIRSLASH}usr/X11R6/lib/libfreetype.so.9.0
+${EMULSUBDIRSLASH}usr/X11R6/lib/liboldX.so
+${EMULSUBDIRSLASH}usr/X11R6/lib/liboldX.so.6
+${EMULSUBDIRSLASH}usr/X11R6/lib/liboldX.so.6.0



Home | Main Index | Thread Index | Old Index