diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/bochs/Makefile | 5 | ||||
| -rw-r--r-- | emulators/bochs/PLIST | 5 | ||||
| -rw-r--r-- | emulators/bochs/distinfo | 12 | ||||
| -rw-r--r-- | emulators/bochs/patches/patch-configure | 10 | ||||
| -rw-r--r-- | emulators/bochs/patches/patch-iodev_sound_soundosx.cc (renamed from emulators/bochs/patches/patch-iodev_soundosx.cc) | 6 |
5 files changed, 18 insertions, 20 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index eedde7ae90c..10319676397 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2012/09/15 10:04:31 obache Exp $ +# $NetBSD: Makefile,v 1.68 2012/10/01 13:40:48 ryoon Exp $ -DISTNAME= bochs-2.5.1 -PKGREVISION= 4 +DISTNAME= bochs-2.6 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST index 285c6c1a794..4836e95e3ca 100644 --- a/emulators/bochs/PLIST +++ b/emulators/bochs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2012/01/09 06:38:44 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.17 2012/10/01 13:40:48 ryoon Exp $ bin/bochs bin/bxcommit bin/bximage @@ -21,12 +21,12 @@ ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci2isa.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pci_ide.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pcipnic.la -${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pcivga.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pic.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_pit.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_serial.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_soundmod.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_speaker.la +${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_svga_cirrus.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_unmapped.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_common.la ${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_ohci.la @@ -63,6 +63,7 @@ share/bochs/keymaps/x11-pc-uk.map share/bochs/keymaps/x11-pc-us.map share/doc/bochs/CHANGES share/doc/bochs/COPYING +share/doc/bochs/LICENSE share/doc/bochs/README share/doc/bochs/TODO share/doc/bochs/bochsrc-sample.txt diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index 793ff843079..6508eb9ad78 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.27 2012/05/23 05:08:00 dholland Exp $ +$NetBSD: distinfo,v 1.28 2012/10/01 13:40:48 ryoon Exp $ -SHA1 (bochs-2.5.1.tar.gz) = e1052e943ebb8e3b84f407e0e3f17607268253b6 -RMD160 (bochs-2.5.1.tar.gz) = 25b515d46032626921a8cf995183116e28eba9e2 -Size (bochs-2.5.1.tar.gz) = 4126651 bytes +SHA1 (bochs-2.6.tar.gz) = 327e7a6b5163a2795adae4a617554de4925b5cfe +RMD160 (bochs-2.6.tar.gz) = 5a0f771b15023b40b291277235ac0ca8ada3c75c +Size (bochs-2.6.tar.gz) = 4212828 bytes SHA1 (patch-.bochsrc) = df5b8879ec005fe44bca8bee42c549095012013d SHA1 (patch-Makefile.in) = ca8d485a9f4901df15eb3e521105de2ae833cfcb -SHA1 (patch-configure) = b8ee4eb622e434472b4a6fa66088e15333ef291f -SHA1 (patch-iodev_soundosx.cc) = e53434c1796133b1275a167bcec606bb185e283d +SHA1 (patch-configure) = 66438d48e5e99bfcf778a37570b76b9fc2732ce5 +SHA1 (patch-iodev_sound_soundosx.cc) = 60ba51ac619b8149710d5ae7940ed6e4a68b36c2 SHA1 (patch-main.cc) = 77296af5e8101c7c9ded37ec77571dbc61f98e4b diff --git a/emulators/bochs/patches/patch-configure b/emulators/bochs/patches/patch-configure index c532f810c54..0d9315074c1 100644 --- a/emulators/bochs/patches/patch-configure +++ b/emulators/bochs/patches/patch-configure @@ -1,10 +1,8 @@ -$NetBSD: patch-configure,v 1.3 2012/05/23 05:08:00 dholland Exp $ +$NetBSD: patch-configure,v 1.4 2012/10/01 13:40:48 ryoon Exp $ -Treat Linux 3.x like 2.6. - ---- configure~ 2012-01-06 18:51:12.000000000 +0000 +--- configure.orig 2012-09-02 11:30:15.000000000 +0000 +++ configure -@@ -22005,6 +22005,10 @@ $as_echo "$as_me: Linux detected as host +@@ -22084,6 +22084,10 @@ $as_echo "$as_me: Linux detected as host PCIDEV_MODULE_MAKE_ALL="all-kernel26" KERNEL_MODULE_SUFFIX="ko" ;; @@ -13,5 +11,5 @@ Treat Linux 3.x like 2.6. + KERNEL_MODULE_SUFFIX="ko" + ;; *) - as_fn_error "Linux kernel 2.4 or 2.6 is required for PCI host device mapping" "$LINENO" 5 + as_fn_error $? "Linux kernel 2.4, 2.6 or 3.x is required for PCI host device mapping" "$LINENO" 5 ;; diff --git a/emulators/bochs/patches/patch-iodev_soundosx.cc b/emulators/bochs/patches/patch-iodev_sound_soundosx.cc index 139219e0265..64167609628 100644 --- a/emulators/bochs/patches/patch-iodev_soundosx.cc +++ b/emulators/bochs/patches/patch-iodev_sound_soundosx.cc @@ -1,7 +1,7 @@ -$NetBSD: patch-iodev_soundosx.cc,v 1.1 2011/03/02 15:43:12 ryoon Exp $ +$NetBSD: patch-iodev_sound_soundosx.cc,v 1.1 2012/10/01 13:40:48 ryoon Exp $ ---- iodev/soundosx.cc.orig 2011-02-14 21:14:20.000000000 +0000 -+++ iodev/soundosx.cc +--- iodev/sound/soundosx.cc.orig 2012-09-02 11:30:10.000000000 +0000 ++++ iodev/sound/soundosx.cc @@ -21,7 +21,7 @@ // This file (SOUNDOSX.CC) written and donated by Brian Huffman |