pkg/42443: Please update emulators/bochs to 2.4.2

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/42443: Please update emulators/bochs to 2.4.2
From: ryo_on%yk.rim.or.jp@localhost
Date: Fri, 11 Dec 2009 15:00:01 +0000 (UTC)
>Number:         42443
>Category:       pkg
>Synopsis:       Please update emulators/bochs to 2.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 11 15:00:00 +0000 2009
>Originator:     Ryo ONODERA
>Release:        NetBSD 5.99.22
>Organization:
        
>Environment:
        
        
System: NetBSD hydrogen.elements.tetera.org 5.99.22 NetBSD 5.99.22 
(BRIGHTGIRL5) #2: Sun Dec 6 15:28:34 JST 2009 
root%hydrogen.elements.tetera.org@localhost:/usr/obj/sys/arch/i386/compile/BRIGHTGIRL5
 i386
Architecture: i386
Machine: i386
>Description:
Uptdate from 2.3.7 to 2.4.2.
It have a GUI debugger, but the GUI debugger cannot coexist with plugins.

I have no Mac OS X or Darwin machine.
I do not care Darwin related things.

>How-To-Repeat:
        
>Fix:
diff -buNr /usr/pkgsrc/emulators/bochs/Makefile bochs/Makefile
--- /usr/pkgsrc/emulators/bochs/Makefile        2009-11-29 00:51:11.000000000 
+0900
+++ bochs/Makefile      2009-12-11 23:38:53.000000000 +0900
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.57 2009/03/20 17:17:48 mishka Exp $
 
-DISTNAME=              bochs-2.3.7
-PKGREVISION=           3
+DISTNAME=              bochs-2.4.2
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=bochs/}
 
@@ -27,7 +26,7 @@
 MAKE_ENV+=             GUNZIP_CMD=${GUNZIP_CMD:Q}
 MAKE_ENV+=             WGET=${FETCH_CMD:Q}
 
-PLIST_VARS+=           notiny nox11 x11
+PLIST_VARS+=           debug notiny nox11 plugins x11
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bochs
 PKG_SUPPORTED_OPTIONS+=        debug tiny x11
@@ -39,50 +38,53 @@
 # Debugging features for the client operating systems.  These options are
 # not enabled by default because they can adversely impact performance.
 .if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=       --disable-plugins
 CONFIGURE_ARGS+=       --enable-debugger
 CONFIGURE_ARGS+=       --enable-disasm
 CONFIGURE_ARGS+=       --enable-iodebug
 CONFIGURE_ARGS+=       --enable-x86-debugger
 .endif
 
+.if empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=       --enable-plugins
+.endif
+
 .if empty(PKG_OPTIONS:Mtiny)
 PLIST.notiny=          yes
 
 #CONFIGURE_ARGS+=      --enable-3dnow
-CONFIGURE_ARGS+=       --enable-4meg-pages
 CONFIGURE_ARGS+=       --enable-all-optimizations
 CONFIGURE_ARGS+=       --enable-apic
 CONFIGURE_ARGS+=       --enable-cpu-level=6
-CONFIGURE_ARGS+=       --enable-daz
 CONFIGURE_ARGS+=       --enable-fpu
-CONFIGURE_ARGS+=       --enable-global-pages
-CONFIGURE_ARGS+=       --enable-guest2host-tlb
 CONFIGURE_ARGS+=       --enable-host-specific-asms
-CONFIGURE_ARGS+=       --enable-icache
 CONFIGURE_ARGS+=       --enable-mmx
-CONFIGURE_ARGS+=       --enable-pae
 CONFIGURE_ARGS+=       --enable-pci
 CONFIGURE_ARGS+=       --enable-repeat-speedups
 CONFIGURE_ARGS+=       --enable-sep
-CONFIGURE_ARGS+=       --enable-sse=3
+CONFIGURE_ARGS+=       --enable-sse=4
 CONFIGURE_ARGS+=       --enable-usb
+CONFIGURE_ARGS+=       --enable-usb-ohci
 CONFIGURE_ARGS+=       --enable-vbe
 CONFIGURE_ARGS+=       --enable-x86-64
+CONFIGURE_ARGS+=       --enable-1g-pages
 CONFIGURE_ARGS+=       --enable-popcnt
 CONFIGURE_ARGS+=       --enable-smp
 CONFIGURE_ARGS+=       --enable-ne2000
 CONFIGURE_ARGS+=       --enable-acpi
 CONFIGURE_ARGS+=       --enable-pnic
-CONFIGURE_ARGS+=       --enable-large-pages
-CONFIGURE_ARGS+=       --enable-mtrr
 CONFIGURE_ARGS+=       --enable-clgd54xx
 CONFIGURE_ARGS+=       --enable-sse-extension
 CONFIGURE_ARGS+=       --enable-gameport
 CONFIGURE_ARGS+=       --enable-misaligned-sse
 CONFIGURE_ARGS+=       --enable-aes
 CONFIGURE_ARGS+=       --enable-xsave
-CONFIGURE_ARGS+=       --enable-vme
+CONFIGURE_ARGS+=       --enable-long-phy-address
+
+.  if empty(PKG_OPTIONS:Mdebug)
+PLIST.plugins=         yes
 CONFIGURE_ARGS+=       --enable-plugins
+.  endif
 
 .  if !empty(MACHINE_PLATFORM:M*-*-i386)
 CONFIGURE_ARGS+=       --enable-fast-function-calls
@@ -135,6 +137,10 @@
        ${RM} -rf ${PREFIX}/libexec/bochs.app/.build
        ${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
 .else
+
+.if !empty(PKG_OPTIONS:Mdebug) && !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
 .  if empty(PKG_OPTIONS:Mx11)
 .  include "../../mk/curses.buildlink3.mk"
 .  else
diff -buNr /usr/pkgsrc/emulators/bochs/PLIST bochs/PLIST
--- /usr/pkgsrc/emulators/bochs/PLIST   2009-11-29 00:51:11.000000000 +0900
+++ bochs/PLIST 2009-12-11 23:39:25.000000000 +0900
@@ -2,32 +2,36 @@
 bin/bochs
 bin/bxcommit
 bin/bximage
-${PLIST.notiny}${PLIST.nox11}lib/bochs/plugins/libbx_term.la
-${PLIST.notiny}${PLIST.x11}lib/bochs/plugins/libbx_x.la
-${PLIST.notiny}lib/bochs/plugins/libbx_acpi.la
-${PLIST.notiny}lib/bochs/plugins/libbx_biosdev.la
-${PLIST.notiny}lib/bochs/plugins/libbx_busmouse.la
-${PLIST.notiny}lib/bochs/plugins/libbx_cmos.la
-${PLIST.notiny}lib/bochs/plugins/libbx_dma.la
-${PLIST.notiny}lib/bochs/plugins/libbx_extfpuirq.la
-${PLIST.notiny}lib/bochs/plugins/libbx_floppy.la
-${PLIST.notiny}lib/bochs/plugins/libbx_gameport.la
-${PLIST.notiny}lib/bochs/plugins/libbx_harddrv.la
-${PLIST.notiny}lib/bochs/plugins/libbx_keyboard.la
-${PLIST.notiny}lib/bochs/plugins/libbx_ne2k.la
-${PLIST.notiny}lib/bochs/plugins/libbx_parallel.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pci.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pci2isa.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pci_ide.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pcipnic.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pciusb.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pcivga.la
-${PLIST.notiny}lib/bochs/plugins/libbx_pic.la
-${PLIST.notiny}lib/bochs/plugins/libbx_sb16.la
-${PLIST.notiny}lib/bochs/plugins/libbx_serial.la
-${PLIST.notiny}lib/bochs/plugins/libbx_speaker.la
-${PLIST.notiny}lib/bochs/plugins/libbx_unmapped.la
-${PLIST.notiny}lib/bochs/plugins/libbx_vga.la
+${PLIST.notiny}${PLIST.plugins}${PLIST.nox11}lib/bochs/plugins/libbx_term.la
+${PLIST.notiny}${PLIST.plugins}${PLIST.x11}lib/bochs/plugins/libbx_x.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_acpi.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_biosdev.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_busmouse.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_cmos.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_dma.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_extfpuirq.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_floppy.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_gameport.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_harddrv.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_ioapic.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_keyboard.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_ne2k.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_parallel.la
+${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_sb16.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_serial.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_speaker.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_unmapped.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_ohci.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_usb_uhci.la
+${PLIST.notiny}${PLIST.plugins}lib/bochs/plugins/libbx_vga.la
+${PLIST.debug}${PLIST.plugins}lib/bochs/plugins/libbx_iodebug.la
 man/man1/bochs-dlx.1
 man/man1/bochs.1
 man/man1/bxcommit.1
diff -buNr /usr/pkgsrc/emulators/bochs/distinfo bochs/distinfo
--- /usr/pkgsrc/emulators/bochs/distinfo        2009-11-29 00:51:11.000000000 
+0900
+++ bochs/distinfo      2009-12-11 23:41:36.000000000 +0900
@@ -1,11 +1,10 @@
 $NetBSD: distinfo,v 1.23 2008/12/06 12:00:56 wiz Exp $
 
-SHA1 (bochs-2.3.7.tar.gz) = e687c697a8be8396ae75106d0cd6149bd52ca67d
-RMD160 (bochs-2.3.7.tar.gz) = b4c9cb8e777c4e484f653085783bce9645804fe0
-Size (bochs-2.3.7.tar.gz) = 3989982 bytes
-SHA1 (patch-aa) = e0d72eb694bbd132e598d0c5ad88875c0c0ccd7f
-SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228
-SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e
-SHA1 (patch-ad) = 44181a229d81a6462e3e44c2425d62a415c5f6f9
-SHA1 (patch-ae) = 4c466afb1d780ce7cdfbaef8e8fa00447d0ebcb7
-SHA1 (patch-af) = 1619912c0aa6b5504c191a78bc193b38915b4e64
+SHA1 (bochs-2.4.2.tar.gz) = 3e7c8038729cce2b2a9b6a0aa57df933c3120ddc
+RMD160 (bochs-2.4.2.tar.gz) = 43ca140eb2548fb22850fe04ec5066feacce549d
+Size (bochs-2.4.2.tar.gz) = 4035010 bytes
+SHA1 (patch-aa) = 9d1203564fa89747545e7e9daded748307a222d1
+SHA1 (patch-ab) = 82571c82494a8591ddb14ea46f8fce30cbf436d7
+SHA1 (patch-ac) = 5437840de5a56a3789944749abe2d944e9ef7791
+SHA1 (patch-ad) = 1de6b265776a87cdcd704dab466999ebcb6f4d65
+SHA1 (patch-ae) = 7480e853817c48444c43544e816b3c78529816b8
diff -buNr /usr/pkgsrc/emulators/bochs/patches/patch-aa bochs/patches/patch-aa
--- /usr/pkgsrc/emulators/bochs/patches/patch-aa        2009-11-29 
00:51:11.000000000 +0900
+++ bochs/patches/patch-aa      2009-12-03 20:59:18.000000000 +0900
@@ -1,10 +1,10 @@
 $NetBSD$
 
---- .bochsrc.orig      2007-12-27 00:41:46.000000000 +0100
-+++ .bochsrc   2007-12-27 00:42:35.000000000 +0100
-@@ -197,13 +197,13 @@
- # such as a: or b: as the path.  The parameter 'image' works with image files
- # only. In that case the size must match one of the supported types.
+--- .bochsrc.orig      2009-10-18 02:38:58.000000000 +0900
++++ .bochsrc
+@@ -226,13 +226,13 @@ vga: extension=vbe
+ # The parameter 'type' can be used to enable the floppy drive without media
+ # and status specified. Usually the drive type is set up based on the media 
type.
  #=======================================================================
 -floppya: 1_44=/dev/fd0, status=inserted
 +@FLOPPY_LINUX@floppya: 1_44=/dev/fd0, status=inserted
@@ -18,7 +18,7 @@
  
  #=======================================================================
  # FLOPPYB:
-@@ -283,7 +283,7 @@
+@@ -313,7 +313,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=
  #   ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, 
heads=15, spt=63
  #   ata3-slave:  type=cdrom, path=iso.sample, status=inserted
  #=======================================================================
diff -buNr /usr/pkgsrc/emulators/bochs/patches/patch-ab bochs/patches/patch-ab
--- /usr/pkgsrc/emulators/bochs/patches/patch-ab        2009-11-29 
00:51:11.000000000 +0900
+++ bochs/patches/patch-ab      2009-12-03 21:04:44.000000000 +0900
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 2006/12/03 22:18:16 jmmv Exp $
+$NetBSD$
 
---- iodev/soundosx.cc.orig     2006-03-03 21:29:50.000000000 +0100
+--- iodev/soundosx.cc.orig     2009-02-08 18:05:52.000000000 +0900
 +++ iodev/soundosx.cc
-@@ -5,7 +5,7 @@
+@@ -21,7 +21,7 @@
  // This file (SOUNDOSX.CC) written and donated by Brian Huffman
  
  #ifdef PARANOID
diff -buNr /usr/pkgsrc/emulators/bochs/patches/patch-ac bochs/patches/patch-ac
--- /usr/pkgsrc/emulators/bochs/patches/patch-ac        2009-11-29 
00:51:11.000000000 +0900
+++ bochs/patches/patch-ac      2009-12-03 20:35:29.000000000 +0900
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- configure.orig     2006-12-03 20:30:34.000000000 +0100
+--- configure.orig     2009-11-12 21:53:36.000000000 +0900
 +++ configure
-@@ -34338,7 +34338,7 @@ fi
+@@ -22173,7 +22173,7 @@ fi
      *-pc-windows* | *-pc-winnt* | *-pc-cygwin* | *-pc-mingw32*)
      NETLOW_OBJS="$NETLOW_OBJS eth_win32.o"
      ;;
 -    *-macosx* | *-darwin*)
 +    *-doesntwork-macosx* | *-doesntwork-darwin*)
      NETLOW_OBJS="$NETLOW_OBJS eth_tuntap.o"
-     cat >>confdefs.h <<\_ACEOF
- #define HAVE_TUNTAP 1
+     $as_echo "#define HAVE_TUNTAP 1" >>confdefs.h
+ 
diff -buNr /usr/pkgsrc/emulators/bochs/patches/patch-ad bochs/patches/patch-ad
--- /usr/pkgsrc/emulators/bochs/patches/patch-ad        2009-11-29 
00:51:11.000000000 +0900
+++ bochs/patches/patch-ad      2009-12-03 20:41:30.000000000 +0900
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.9 2008/01/03 21:03:45 xtraeme Exp $
+$NetBSD$
 
---- Makefile.in.orig   2007-10-22 00:07:20.000000000 +0200
+--- Makefile.in.orig   2009-04-30 02:52:25.000000000 +0900
 +++ Makefile.in
 @@ -72,8 +72,8 @@ RMDIR=rmdir
  TAR=tar
@@ -13,7 +13,7 @@
  ZIP=zip
  UNIX2DOS=unix2dos
  LIBTOOL=@LIBTOOL@
-@@ -576,7 +576,7 @@ RINCLUDES=/System/Library/Frameworks/Car
+@@ -567,7 +567,7 @@ RINCLUDES=/System/Library/Frameworks/Car
  REZ_ARGS=-append -i $RINCLUDES -d SystemSevenOrLater=1 -useDF
  STANDALONE_LIBDIR=`pwd`/$(APP)/Contents/$(APP_PLATFORM)/lib
  OSACOMPILE=/usr/bin/osacompile
@@ -22,15 +22,7 @@
  
  # On a MacOS X machine, you run rez, osacompile, and setfile to
  # produce the script executable, which has both a data fork and a
-@@ -653,18 +653,15 @@ $(APP)/.build_plugins: $(APP)/.build boc
-       $(LIBTOOL) --finish $(STANDALONE_LIBDIR);
-       touch $(APP)/.build_plugins
- 
--install_macosx: all download_dlx install_man @INSTALL_DOCBOOK_VAR@
--      -mkdir -p $(DESTDIR)$(prefix)
-+install_macosx: all install_man @INSTALL_DOCBOOK_VAR@
-+      -mkdir -p $(DESTDIR)$(sharedir)
-       for i in $(INSTALL_LIST_MACOSX); do if test -e $$i; then $(CPMAC) -r 
$$i $(DESTDIR)$(sharedir); else $(CPMAC) -r $(srcdir)/$$i 
$(DESTDIR)$(sharedir); fi; done
+@@ -650,12 +650,9 @@ install_macosx: all download_dlx install
        $(CPMAC) $(srcdir)/.bochsrc $(DESTDIR)$(sharedir)/bochsrc-sample.txt
        -mkdir $(DESTDIR)$(sharedir)/keymaps
        $(CPMAC) $(srcdir)/gui/keymaps/*.map $(DESTDIR)$(sharedir)/keymaps
diff -buNr /usr/pkgsrc/emulators/bochs/patches/patch-ae bochs/patches/patch-ae
--- /usr/pkgsrc/emulators/bochs/patches/patch-ae        2009-11-29 
00:51:11.000000000 +0900
+++ bochs/patches/patch-ae      2009-12-03 20:42:28.000000000 +0900
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- main.cc.orig       2007-12-21 22:16:34.000000000 +0100
+--- main.cc.orig       2009-10-18 03:17:28.000000000 +0900
 +++ main.cc
-@@ -600,7 +600,7 @@ int bx_init_main(int argc, char *argv[])
+@@ -617,7 +617,7 @@ int bx_init_main(int argc, char *argv[])
      }
      arg++;
    }
diff -buNr /usr/pkgsrc/emulators/bochs/patches/patch-af bochs/patches/patch-af
--- /usr/pkgsrc/emulators/bochs/patches/patch-af        2009-11-29 
00:51:11.000000000 +0900
+++ bochs/patches/patch-af      1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- iodev/iodebug.h.orig       2008-05-01 20:46:58.000000000 +0000
-+++ iodev/iodebug.h    2009-03-20 11:58:42.000000000 +0000
-@@ -18,7 +18,7 @@
-   virtual void init(void);
-   virtual void reset (unsigned type) {}
-   static void mem_write(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, 
void *data);
--  static void mem_read(BX_CPU_C *cpu, bx_phy_addressu addr, unsigned len, 
void *data);
-+  static void mem_read(BX_CPU_C *cpu, bx_phy_address addr, unsigned len, void 
*data);
- 
- private:
-   static Bit32u read_handler(void *this_ptr, Bit32u address, unsigned io_len);



>Unformatted:
Prev by Date: Re: pkg/42442 (when entering an imap folder, using db4 for header caches, mutt segfaults and dumps core)
Next by Date: PR/42439 CVS commit: pkgsrc/sysutils/amanda-common
Previous by Thread: Re: pkg/42442 (when entering an imap folder, using db4 for header caches, mutt segfaults and dumps core)
Next by Thread: PR/42439 CVS commit: pkgsrc/sysutils/amanda-common
Indexes:
Home | Main Index | Thread Index | Old Index