Updated "bochs" package to 2000.03.25a. it is now distributed under the LGPL.

8 files changed, 106 insertions, 59 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 2c2b9586b73..6f2b070deee 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,34 +1,46 @@
-# $NetBSD: Makefile,v 1.8 2000/09/10 22:14:46 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2000/12/14 14:39:44 kei Exp $
 
-DISTNAME=		bochs-2000_0104c
-PKGNAME=		bochs-2000.01.04c
+DISTNAME=		bochs-2000_0325a
+PKGNAME=		bochs-2000.03.25a
 CATEGORIES=		emulators
-MASTER_SITES=		ftp://bochs.com/pub/
+MASTER_SITES=		ftp://bochs.com/bochs/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.bochs.com/
 
 NOT_FOR_PLATFORM=	*-*-alpha	#runs, SEGV.
 
-LICENSE=		shareware
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 #CONFIGURE_ARGS=		--enable-debugger --enable-disasm
 USE_X11=		yes
 
+MESSAGE_FILE=		${WRKDIR}/MESSAGE
+BOCHS_MAINDIR=		${PREFIX}/share/bochs
+BOCHS_BIOSDIR=		${BOCHS_MAINDIR}/bios
+BOCHS_FONTDIR=		${BOCHS_MAINDIR}/xfonts
+BOCHS_DOCDIR=		${PREFIX}/share/doc/html/bochs
+
 post-configure:
-	${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' < ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
+	${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' \
+		< ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
+	${SED} -e 's,@BOCHS_MAINDIR@,${BOCHS_MAINDIR},g' \
+		-e 's,@BOCHS_FONTDIR@,${BOCHS_FONTDIR},g' \
+		-e 's,@BOCHS_DOCDIR@,${BOCHS_DOCDIR},g' \
+		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/bochs/bios
-	${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-990925a ${PREFIX}/share/bochs/bios
-	${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.20 ${PREFIX}/share/bochs/bios
-	${MKDIR} ${PREFIX}/share/bochs/doc
-	${INSTALL_DATA} ${WRKSRC}/docs-html/* ${PREFIX}/share/bochs/doc
-	${MKDIR} ${PREFIX}/share/bochs/xfonts
-	${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${PREFIX}/share/bochs/xfonts
-	${INSTALL_DATA} ${WRKSRC}/font/vga.bdf ${PREFIX}/share/bochs/xfonts
-	${INSTALL_DATA} ${WRKSRC}/font/vga.pcf ${PREFIX}/share/bochs/xfonts
+	${INSTALL_DATA_DIR} ${BOCHS_BIOSDIR}
+	${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-990925a ${BOCHS_BIOSDIR}
+	${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.20 ${BOCHS_BIOSDIR}
+	${INSTALL_DATA_DIR} ${BOCHS_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs-html/00README ${BOCHS_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${BOCHS_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${BOCHS_DOCDIR}
+	${INSTALL_DATA_DIR} ${BOCHS_FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${BOCHS_FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/font/vga.bdf ${BOCHS_FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/font/vga.pcf ${BOCHS_FONTDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/bochsrc ${PREFIX}/share/bochs
 	${X11BASE}/bin/mkfontdir ${PREFIX}/share/bochs/xfonts
diff --git a/emulators/bochs/files/md5 b/emulators/bochs/files/md5
index 0b2eceff0c3..ffcf3345a5a 100644
--- a/emulators/bochs/files/md5
+++ b/emulators/bochs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/01/31 21:18:44 drochner Exp $
+$NetBSD: md5,v 1.4 2000/12/14 14:39:45 kei Exp $
 
-MD5 (bochs-2000_0104c.tar.gz) = f0d9ba161382b971451bace7101a7ce7
+MD5 (bochs-2000_0325a.tar.gz) = 6a6fc6794b81c88d71037f17c918a880
diff --git a/emulators/bochs/files/patch-sum b/emulators/bochs/files/patch-sum
index 71179b1b5c4..3747f678f92 100644
--- a/emulators/bochs/files/patch-sum
+++ b/emulators/bochs/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/09/01 14:51:21 fvdl Exp $
+$NetBSD: patch-sum,v 1.5 2000/12/14 14:39:45 kei Exp $
 
 MD5 (patch-aa) = b82b3ed0921f2df488905a56caec57db
 MD5 (patch-ab) = 73d5e0a72d694ca148a23e154105dab4
@@ -6,3 +6,5 @@ MD5 (patch-ac) = aa14eccc54c9bb8b5c26eb8583a13ae9
 MD5 (patch-ad) = 702e68d23534f772c21aacb7680fc136
 MD5 (patch-ae) = 1ac76cbf8a8e539e2ca56cd4ccfac5e1
 MD5 (patch-af) = 4beaaa95c1b164b3c7c0272a882a1dbc
+MD5 (patch-ag) = 5a1ee7d679f4c0959c9bfacc43ed0f54
+MD5 (patch-ah) = 8c8127ac26e053028e7b349b00af3857
diff --git a/emulators/bochs/patches/patch-ag b/emulators/bochs/patches/patch-ag
new file mode 100644
index 00000000000..e9df704e2a5
--- /dev/null
+++ b/emulators/bochs/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2000/12/14 14:39:45 kei Exp $
+
+--- docs-html/index.html.orig	Wed Dec  6 01:30:21 2000
++++ docs-html/index.html	Wed Dec  6 01:30:43 2000
+@@ -26,7 +26,7 @@
+ <br><A HREF="whatisbochs.html">What is Bochs</A>
+ <br><A HREF="faq.html#license">Licensing</A>
+ <br><A HREF="developers.html">Developers email-list</A>
+-<br><A HREF="ftp://bochs.com/pub/">FTP site</A>
++<br><A HREF="ftp://bochs.com/bochs/">FTP site</A>
+ <br><A HREF="install.html">Compile/Install</A>
+ <br><A HREF="configure.html">Using ./configure and it's options</A>
+ <br><A HREF="whatisbochs.html#Platforms">Platforms</A>
diff --git a/emulators/bochs/patches/patch-ah b/emulators/bochs/patches/patch-ah
new file mode 100644
index 00000000000..cf57279c1c4
--- /dev/null
+++ b/emulators/bochs/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2000/12/14 14:39:45 kei Exp $
+
+--- docs-html/install.html.orig	Wed Dec  6 01:30:26 2000
++++ docs-html/install.html	Wed Dec  6 01:30:49 2000
+@@ -35,7 +35,7 @@
+ <A NAME="Getting current source code"></A>Getting current source code
+ </H2>
+ Source code for Bochs, is available via anonymous FTP at
+-<A HREF="ftp://bochs.com/pub/">ftp://bochs.com/pub/</A>.
++<A HREF="ftp://bochs.com/bochs/">ftp://bochs.com/bochs/</A>.
+ Release names are of the format bochs-YYMMDD.tar.gz.  Log in as <I>anonymous</I>
+ and use your email as the password.
+ 
diff --git a/emulators/bochs/pkg/DESCR b/emulators/bochs/pkg/DESCR
index e97655afea3..4671d303037 100644
--- a/emulators/bochs/pkg/DESCR
+++ b/emulators/bochs/pkg/DESCR
@@ -1,6 +1,10 @@
-Bochs is a portable x86 PC emulation software package that emulates enough
-of the x86 CPU, related AT hardware, and BIOS to run DOS, Windows '95,
-Minix 2.0, and other OS's, all on your workstation. 
+(Quoted from http://www.bochs.com/)
 
-Though Bochs is commercial software, source code for Bochs is available on
-the Internet, provided you abide by the license with the source code.
+The program bochs is a highly portable open source x86 PC emulator
+written in C++, and runs on most popular platforms.  It includes
+emulation of the Intel x86 CPU, common IO devices, and a custom BIOS.
+Currently, bochs can be compiled to emulate a 386, 486 or Pentium CPU.
+Bochs is capable of running most Operating Systems inside the emulation
+including Linux, Windows'95, DOS, and recently Windows NT 4.
+
+Source code for bochs is available by anonymous FTP under the LGPL.
diff --git a/emulators/bochs/pkg/MESSAGE b/emulators/bochs/pkg/MESSAGE
index 6d51e7c0c27..e1dcf730906 100644
--- a/emulators/bochs/pkg/MESSAGE
+++ b/emulators/bochs/pkg/MESSAGE
@@ -1,8 +1,13 @@
-You need to copy the share/bochs/bochsrc file to your home
-directory and name it .bochsrc.  Then edit it to your 
-tastes defining the hard drives, and floppies as needed.
+You need to copy the @BOCHS_MAINDIR@/bochsrc file to your home
+directory and name it .bochsrc.  Then edit it to your tastes
+defining the hard drives, and floppies as needed.  You also need
+to @BOCHS_FONTDIR@ to your X font path and to enable it
+before running bochs.  e.g.
+
+  $ xset fp+ @BOCHS_FONTDIR@
+  $ xset fp rehash
 
 Documentation is available on the website, and a copy of that
-website is in share/bochs/doc/.  The file install.html will
-assist you in creating a HD "file". (A raw disk partition can
+website is in @BOCHS_DOCDIR@.  The file install.html
+will assist you in creating a HD "file". (A raw disk partition can
 be used as well)
diff --git a/emulators/bochs/pkg/PLIST b/emulators/bochs/pkg/PLIST
index c6c45184816..78079e0f10a 100644
--- a/emulators/bochs/pkg/PLIST
+++ b/emulators/bochs/pkg/PLIST
@@ -1,34 +1,32 @@
-@comment $NetBSD: PLIST,v 1.5 2000/09/05 16:55:42 fredb Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/12/14 14:39:46 kei Exp $
 bin/bochs
-share/bochs/doc/00README
-share/bochs/doc/3rdparty.license.html
-share/bochs/doc/DOS.html
-share/bochs/doc/LICENSE
-share/bochs/doc/Linux.html
-share/bochs/doc/Minix.html
-share/bochs/doc/OldWindows95.html
-share/bochs/doc/Windows31.html
-share/bochs/doc/Windows95.html
-share/bochs/doc/changelog.html
-share/bochs/doc/codingguidelines.html
-share/bochs/doc/configure.html
-share/bochs/doc/construction.html
-share/bochs/doc/cosimulation.html
-share/bochs/doc/debugger.html
-share/bochs/doc/developers.html
-share/bochs/doc/faq.html
-share/bochs/doc/features.html
-share/bochs/doc/fpu.html
-share/bochs/doc/guestNT.html
-share/bochs/doc/index.html
-share/bochs/doc/install.html
-share/bochs/doc/instrumentation.html
-share/bochs/doc/licensing.html
-share/bochs/doc/mtools.html
-share/bochs/doc/sound.html
-share/bochs/doc/undercon.gif
-share/bochs/doc/whatisbochs.html
-share/bochs/doc/win32.html
+share/doc/html/bochs/00README
+share/doc/html/bochs/3rdparty.license.html
+share/doc/html/bochs/DOS.html
+share/doc/html/bochs/Linux.html
+share/doc/html/bochs/Minix.html
+share/doc/html/bochs/OldWindows95.html
+share/doc/html/bochs/Windows31.html
+share/doc/html/bochs/Windows95.html
+share/doc/html/bochs/changelog.html
+share/doc/html/bochs/codingguidelines.html
+share/doc/html/bochs/configure.html
+share/doc/html/bochs/construction.html
+share/doc/html/bochs/cosimulation.html
+share/doc/html/bochs/debugger.html
+share/doc/html/bochs/developers.html
+share/doc/html/bochs/faq.html
+share/doc/html/bochs/features.html
+share/doc/html/bochs/fpu.html
+share/doc/html/bochs/guestNT.html
+share/doc/html/bochs/index.html
+share/doc/html/bochs/install.html
+share/doc/html/bochs/instrumentation.html
+share/doc/html/bochs/mtools.html
+share/doc/html/bochs/sound.html
+share/doc/html/bochs/undercon.gif
+share/doc/html/bochs/whatisbochs.html
+share/doc/html/bochs/win32.html
 share/bochs/bios/BIOS-bochs-990925a
 share/bochs/bios/VGABIOS-elpin-2.20
 share/bochs/xfonts/fonts.dir
@@ -36,7 +34,7 @@ share/bochs/xfonts/hercules.bdf
 share/bochs/xfonts/vga.bdf
 share/bochs/xfonts/vga.pcf
 share/bochs/bochsrc
-@dirrm share/bochs/doc
+@dirrm share/doc/html/bochs
 @dirrm share/bochs/bios
 @dirrm share/bochs/xfonts
 @dirrm share/bochs