[pkgsrc/trunk]: pkgsrc/emulators/bochs Fix Mac OS X and debug-enabled builds.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/emulators/bochs Fix Mac OS X and debug-enabled builds.
From: jmmv <jmmv%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:43:27 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/db73b26f4de1
branches:  trunk
changeset: 537859:db73b26f4de1
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Fri Jan 18 10:21:01 2008 +0000

description:
Fix Mac OS X and debug-enabled builds.

diffstat:

 emulators/bochs/MESSAGE.Darwin   |  14 +++---
 emulators/bochs/Makefile         |  11 ++--
 emulators/bochs/PLIST.Darwin     |  89 ++++++++++++++++++++-------------------
 emulators/bochs/distinfo         |   6 +-
 emulators/bochs/patches/patch-ad |  15 +++---
 emulators/bochs/patches/patch-ae |  13 +++++
 emulators/bochs/patches/patch-af |  13 +++++
 7 files changed, 97 insertions(+), 64 deletions(-)

diffs (248 lines):

diff -r d03f61c0e9e6 -r db73b26f4de1 emulators/bochs/MESSAGE.Darwin
--- a/emulators/bochs/MESSAGE.Darwin    Fri Jan 18 07:50:38 2008 +0000
+++ b/emulators/bochs/MESSAGE.Darwin    Fri Jan 18 10:21:01 2008 +0000
@@ -1,14 +1,14 @@
 ===========================================================================
-$NetBSD: MESSAGE.Darwin,v 1.1 2006/12/03 22:18:16 jmmv Exp $
+$NetBSD: MESSAGE.Darwin,v 1.2 2008/01/18 10:21:01 jmmv Exp $
 
-Bochs has been installed into ${PREFIX}/share/libexec/bochs.
-You can find there an application bundle (bochs.app) that you can copy to
+Bochs has been installed as ${PREFIX}/libexec/bochs.app.
+That directory (bochs.app) is an application bundle that you can copy to
 /Applications if you want to.
 
-There is also a sample configuration file in that location.  Note that you
-can use the $BXSHARE variable in your own configuration files to specify
-the location of the system BIOSes.  This variable will be automatically set
-to the appropriate location by Bochs when executed.
+There is a sample configuration file in ${PREFIX}/share/bochs.
+Note that you can use the $BXSHARE variable in your own configuration files
+to specify the location of the system BIOSes.  This variable will be
+automatically set to the appropriate location by Bochs when executed.
 
 For your convenience, a 'bochs' helper script has also been installed and
 should be available through your PATH as a regular command-line utility.
diff -r d03f61c0e9e6 -r db73b26f4de1 emulators/bochs/Makefile
--- a/emulators/bochs/Makefile  Fri Jan 18 07:50:38 2008 +0000
+++ b/emulators/bochs/Makefile  Fri Jan 18 10:21:01 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2008/01/03 21:03:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.52 2008/01/18 10:21:01 jmmv Exp $
 
 DISTNAME=              bochs-2.3.6
 CATEGORIES=            emulators
@@ -97,19 +97,20 @@
 .endif
 
 .if ${OPSYS} == "Darwin"
-INSTALL_MAKE_FLAGS+=   prefix=${PREFIX}/libexec/bochs
 MESSAGE_SRC=           ${.CURDIR}/MESSAGE.Darwin
 PLIST_SRC=             ${.CURDIR}/PLIST.Darwin
 
 post-build:
        { ${ECHO} '#! ${SH}'; \
-         ${ECHO} 'exec ${PREFIX}/libexec/bochs/bochs.app/Contents/MacOS/bochs'\
+         ${ECHO} 'exec ${PREFIX}/libexec/bochs.app/Contents/MacOS/bochs'\
                  '"$$@"'; } >${WRKDIR}/bochs.sh
 
 post-install:
+       /Developer/Tools/CpMac -r -p ${WRKSRC}/bochs.app ${PREFIX}/libexec
+       ${INSTALL_PROGRAM} ${WRKSRC}/bxcommit ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin
+       ${RM} -rf ${PREFIX}/libexec/bochs.app/.build
        ${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
-       ${LN} -fs ${PREFIX}/libexec/bochs/bxcommit ${PREFIX}/bin/bxcommit
-       ${LN} -fs ${PREFIX}/libexec/bochs/bximage ${PREFIX}/bin/bximage
 .else
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r d03f61c0e9e6 -r db73b26f4de1 emulators/bochs/PLIST.Darwin
--- a/emulators/bochs/PLIST.Darwin      Fri Jan 18 07:50:38 2008 +0000
+++ b/emulators/bochs/PLIST.Darwin      Fri Jan 18 10:21:01 2008 +0000
@@ -1,46 +1,49 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2006/12/04 17:37:24 jmmv Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.3 2008/01/18 10:21:01 jmmv Exp $
 bin/bochs
 bin/bxcommit
 bin/bximage
-libexec/bochs/BIOS-bochs-latest
-libexec/bochs/CHANGES.txt
-libexec/bochs/COPYING.txt
-libexec/bochs/README.txt
-libexec/bochs/TODO.txt
-libexec/bochs/VGABIOS-elpin-2.40
-libexec/bochs/VGABIOS-elpin-LICENSE.txt
-libexec/bochs/VGABIOS-lgpl-README.txt
-libexec/bochs/VGABIOS-lgpl-latest
-libexec/bochs/VGABIOS-lgpl-latest-cirrus
-libexec/bochs/VGABIOS-lgpl-latest-cirrus-debug
-libexec/bochs/VGABIOS-lgpl-latest-debug
-libexec/bochs/bochs.app/.build
-libexec/bochs/bochs.app/Contents/Info.plist
-libexec/bochs/bochs.app/Contents/MacOS/bochs
-libexec/bochs/bochs.app/Contents/PkgInfo
-libexec/bochs/bochs.app/Contents/Resources/bochs-icn.icns
-libexec/bochs/bochs.app/Contents/Resources/bochs.rsrc
-libexec/bochs/bochs.app/Contents/pbdevelopment.plist
-libexec/bochs/bochs.scpt
-libexec/bochs/bochsrc-sample.txt
-libexec/bochs/bxcommit
-libexec/bochs/bximage
-libexec/bochs/keymaps/sdl-pc-de.map
-libexec/bochs/keymaps/sdl-pc-us.map
-libexec/bochs/keymaps/x11-pc-be.map
-libexec/bochs/keymaps/x11-pc-da.map
-libexec/bochs/keymaps/x11-pc-de.map
-libexec/bochs/keymaps/x11-pc-es.map
-libexec/bochs/keymaps/x11-pc-fr.map
-libexec/bochs/keymaps/x11-pc-it.map
-libexec/bochs/keymaps/x11-pc-ru.map
-libexec/bochs/keymaps/x11-pc-se.map
-libexec/bochs/keymaps/x11-pc-si.map
-libexec/bochs/keymaps/x11-pc-uk.map
-libexec/bochs/keymaps/x11-pc-us.map
-@dirrm libexec/bochs/keymaps
-@dirrm libexec/bochs/bochs.app/Contents/Resources
-@dirrm libexec/bochs/bochs.app/Contents/MacOS
-@dirrm libexec/bochs/bochs.app/Contents
-@dirrm libexec/bochs/bochs.app
-@dirrm libexec/bochs
+libexec/bochs.app/Contents/Info.plist
+libexec/bochs.app/Contents/MacOS/bochs
+libexec/bochs.app/Contents/PkgInfo
+libexec/bochs.app/Contents/Resources/bochs-icn.icns
+libexec/bochs.app/Contents/Resources/bochs.rsrc
+libexec/bochs.app/Contents/pbdevelopment.plist
+man/man1/bochs-dlx.1
+man/man1/bochs.1
+man/man1/bxcommit.1
+man/man1/bximage.1
+man/man5/bochsrc.5
+share/bochs/BIOS-bochs-latest
+share/bochs/BIOS-bochs-legacy
+share/bochs/CHANGES
+share/bochs/COPYING
+share/bochs/README
+share/bochs/TODO
+share/bochs/VGABIOS-elpin-2.40
+share/bochs/VGABIOS-elpin-LICENSE
+share/bochs/VGABIOS-lgpl-README
+share/bochs/VGABIOS-lgpl-latest
+share/bochs/VGABIOS-lgpl-latest-cirrus
+share/bochs/VGABIOS-lgpl-latest-cirrus-debug
+share/bochs/VGABIOS-lgpl-latest-debug
+share/bochs/bochs.scpt
+share/bochs/bochsrc-sample.txt
+share/bochs/keymaps/sdl-pc-de.map
+share/bochs/keymaps/sdl-pc-us.map
+share/bochs/keymaps/x11-pc-be.map
+share/bochs/keymaps/x11-pc-da.map
+share/bochs/keymaps/x11-pc-de.map
+share/bochs/keymaps/x11-pc-es.map
+share/bochs/keymaps/x11-pc-fr.map
+share/bochs/keymaps/x11-pc-it.map
+share/bochs/keymaps/x11-pc-ru.map
+share/bochs/keymaps/x11-pc-se.map
+share/bochs/keymaps/x11-pc-si.map
+share/bochs/keymaps/x11-pc-uk.map
+share/bochs/keymaps/x11-pc-us.map
+@dirrm share/bochs/keymaps
+@dirrm share/bochs
+@dirrm libexec/bochs.app/Contents/Resources
+@dirrm libexec/bochs.app/Contents/MacOS
+@dirrm libexec/bochs.app/Contents
+@dirrm libexec/bochs.app
diff -r d03f61c0e9e6 -r db73b26f4de1 emulators/bochs/distinfo
--- a/emulators/bochs/distinfo  Fri Jan 18 07:50:38 2008 +0000
+++ b/emulators/bochs/distinfo  Fri Jan 18 10:21:01 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2008/01/03 21:03:45 xtraeme Exp $
+$NetBSD: distinfo,v 1.22 2008/01/18 10:21:01 jmmv Exp $
 
 SHA1 (bochs-2.3.6.tar.gz) = 3675b1c5a324854b998bb7518c7279db2fecd8c3
 RMD160 (bochs-2.3.6.tar.gz) = b81c8093c147d0d75cb18a954407ed3f7451aa3f
@@ -6,4 +6,6 @@
 SHA1 (patch-aa) = e0d72eb694bbd132e598d0c5ad88875c0c0ccd7f
 SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228
 SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e
-SHA1 (patch-ad) = 1d6be38c7c084b19cf89f0185e965323b65ea181
+SHA1 (patch-ad) = 44181a229d81a6462e3e44c2425d62a415c5f6f9
+SHA1 (patch-ae) = 4c466afb1d780ce7cdfbaef8e8fa00447d0ebcb7
+SHA1 (patch-af) = ffe66e8fdf18872c5060b85f85d7323d451f17a3
diff -r d03f61c0e9e6 -r db73b26f4de1 emulators/bochs/patches/patch-ad
--- a/emulators/bochs/patches/patch-ad  Fri Jan 18 07:50:38 2008 +0000
+++ b/emulators/bochs/patches/patch-ad  Fri Jan 18 10:21:01 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2008/01/03 21:03:45 xtraeme Exp $
+$NetBSD: patch-ad,v 1.10 2008/01/18 10:21:01 jmmv Exp $
 
---- Makefile.in.orig   2007-12-27 00:43:38.000000000 +0100
-+++ Makefile.in        2007-12-27 00:44:54.000000000 +0100
-@@ -72,8 +72,8 @@
+--- Makefile.in.orig   2007-10-22 00:07:20.000000000 +0200
++++ Makefile.in
+@@ -72,8 +72,8 @@ RMDIR=rmdir
  TAR=tar
  CHMOD=chmod
  # the GZIP variable is reserved by gzip program
@@ -13,7 +13,7 @@
  ZIP=zip
  UNIX2DOS=unix2dos
  LIBTOOL=@LIBTOOL@
-@@ -576,7 +576,7 @@
+@@ -576,7 +576,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,13 +22,14 @@
  
  # 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 @@
+@@ -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)$(prefix)
++      -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
        $(CPMAC) $(srcdir)/.bochsrc $(DESTDIR)$(sharedir)/bochsrc-sample.txt
        -mkdir $(DESTDIR)$(sharedir)/keymaps
diff -r d03f61c0e9e6 -r db73b26f4de1 emulators/bochs/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/bochs/patches/patch-ae  Fri Jan 18 10:21:01 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.7 2008/01/18 10:21:01 jmmv Exp $
+
+--- main.cc.orig       2007-12-21 22:16:34.000000000 +0100
++++ main.cc
+@@ -600,7 +600,7 @@ int bx_init_main(int argc, char *argv[])
+     }
+     arg++;
+   }
+-#if BX_WITH_CARBON
++#if BROKEN_BX_WITH_CARBON
+   if(!getenv("BXSHARE"))
+   {
+     CFBundleRef mainBundle;
diff -r d03f61c0e9e6 -r db73b26f4de1 emulators/bochs/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/bochs/patches/patch-af  Fri Jan 18 10:21:01 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.6 2008/01/18 10:21:01 jmmv Exp $
+
+--- bx_debug/dbg_main.cc.orig  2007-12-13 23:56:35.000000000 +0100
++++ bx_debug/dbg_main.cc
+@@ -1070,7 +1070,7 @@ void bx_dbg_xlate_address(bx_lin_address
+   bx_phy_address paddr;
+   laddr &= BX_CONST64(0xfffffffffffff000);
+ 
+-  bx_bool paddr_valid = BX_CPU(which_cpu)->dbg_xlate_linear2phy(laddr, &paddr);
++  bx_bool paddr_valid = BX_CPU(dbg_cpu)->dbg_xlate_linear2phy(laddr, &paddr);
+   if (paddr_valid) {
+     dbg_printf("linear page 0x" FMT_ADDRX " maps to physical page 0x%08x\n", laddr, paddr);
+   }
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc + Updated textproc/xmltoman to 0.3nb1 [bjs 2008-01...
Next by Date: [pkgsrc/trunk]: pkgsrc/mk Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc + Updated textproc/xmltoman to 0.3nb1 [bjs 2008-01...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk Replaced _PKG_SILENT and _PKG_DEBUG with RUN.
Indexes:
Home | Main Index | Thread Index | Old Index