diff options
author | wiz <wiz> | 2002-05-13 14:47:41 +0000 |
---|---|---|
committer | wiz <wiz> | 2002-05-13 14:47:41 +0000 |
commit | 193210af54a1e372b48be9e188857608796bec47 (patch) | |
tree | d4ef598fc033949c1ca192e30077eb158e2488b5 /emulators/bochs | |
parent | 619c737c0a0630c1061b8e0a96bec14176af425c (diff) | |
download | pkgsrc-193210af54a1e372b48be9e188857608796bec47.tar.gz |
Install some more files (bximage, man pages, docs), sort PLIST,
regen a patch, and handle gui.cc slightly differently (sent back).
Diffstat (limited to 'emulators/bochs')
-rw-r--r-- | emulators/bochs/Makefile | 8 | ||||
-rw-r--r-- | emulators/bochs/PLIST | 36 | ||||
-rw-r--r-- | emulators/bochs/distinfo | 5 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ab | 9 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ac | 14 |
5 files changed, 49 insertions, 23 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 716be405401..3e81367702a 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/05/13 14:12:03 fredb Exp $ +# $NetBSD: Makefile,v 1.18 2002/05/13 14:47:41 wiz Exp $ DISTNAME= bochs-1.4 CATEGORIES= emulators @@ -6,7 +6,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://bochs.sourceforge.net/ -COMMENT= I386 machine emulator capable of running dos/windows +COMMENT= i386 machine emulator capable of running DOS/Windows GNU_CONFIGURE= yes USE_GMAKE= yes @@ -14,7 +14,6 @@ USE_GMAKE= yes # performance. The number of processors can be either 1 (default), 2, or 4. #CONFIGURE_ARGS+= --enable-debugger --enable-disasm #CONFIGURE_ARGS+= --enable-processors=2 -CONFIGURE_ENV+= CXXFLAGS=-I${X11BASE}/include USE_X11= yes BOCHS_MAINDIR= ${PREFIX}/share/bochs @@ -42,12 +41,15 @@ do-install: ${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} ${WRKSRC}/docs-html/*.txt ${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_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/bochsrc ${PREFIX}/share/bochs + ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1 ${X11BASE}/bin/mkfontdir ${PREFIX}/share/bochs/xfonts .include "../../mk/bsd.pkg.mk" diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST index d980bec07b1..cc5b72007bd 100644 --- a/emulators/bochs/PLIST +++ b/emulators/bochs/PLIST @@ -1,5 +1,22 @@ -@comment $NetBSD: PLIST,v 1.3 2002/05/13 14:12:03 fredb Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/05/13 14:47:41 wiz Exp $ bin/bochs +bin/bximage +man/man1/bochs-dlx.1 +man/man1/bochs.1 +man/man1/bochsrc.1 +man/man1/bximage.1 +share/bochs/bios/BIOS-bochs-2-processors +share/bochs/bios/BIOS-bochs-4-processors +share/bochs/bios/BIOS-bochs-latest +share/bochs/bios/VGABIOS-elpin-2.40 +share/bochs/bios/VGABIOS-elpin-LICENSE +share/bochs/bios/VGABIOS-lgpl-0.3a +share/bochs/bios/VGABIOS-lgpl-README +share/bochs/bochsrc +share/bochs/xfonts/fonts.dir +share/bochs/xfonts/hercules.bdf +share/bochs/xfonts/vga.bdf +share/bochs/xfonts/vga.pcf share/doc/html/bochs/00README share/doc/html/bochs/3rdparty.license.html share/doc/html/bochs/Linux.html @@ -12,6 +29,7 @@ share/doc/html/bochs/configure.html share/doc/html/bochs/construction.html share/doc/html/bochs/cosimulation.html share/doc/html/bochs/cvs-status.html +share/doc/html/bochs/cvs-structure.txt share/doc/html/bochs/debugger.html share/doc/html/bochs/developers.html share/doc/html/bochs/faq.html @@ -23,24 +41,14 @@ share/doc/html/bochs/install.html share/doc/html/bochs/instrumentation.html share/doc/html/bochs/iodebug.html share/doc/html/bochs/mtools.html +share/doc/html/bochs/random.txt +share/doc/html/bochs/release-prep.txt share/doc/html/bochs/smp-simulation.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-2-processors -share/bochs/bios/BIOS-bochs-4-processors -share/bochs/bios/BIOS-bochs-latest -share/bochs/bios/VGABIOS-lgpl-0.3a -share/bochs/bios/VGABIOS-lgpl-README -share/bochs/bios/VGABIOS-elpin-2.40 -share/bochs/bios/VGABIOS-elpin-LICENSE -share/bochs/xfonts/fonts.dir -share/bochs/xfonts/hercules.bdf -share/bochs/xfonts/vga.bdf -share/bochs/xfonts/vga.pcf -share/bochs/bochsrc @dirrm share/doc/html/bochs -@dirrm share/bochs/bios @dirrm share/bochs/xfonts +@dirrm share/bochs/bios @dirrm share/bochs diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index b20bd88cc4b..a0477e7f6ec 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.6 2002/05/13 14:12:03 fredb Exp $ +$NetBSD: distinfo,v 1.7 2002/05/13 14:47:41 wiz Exp $ SHA1 (bochs-1.4.tar.gz) = db5f1763c8d048831daad34fa81b0f3b15e5e0a8 Size (bochs-1.4.tar.gz) = 1389919 bytes SHA1 (patch-aa) = a7fdb6c2e4d4f13a80ea44b0c857d5cf52f6d2c6 -SHA1 (patch-ab) = 340261dc14c65626b44abd2f7665cf2a87b233b4 +SHA1 (patch-ab) = 13ef85883d8f66862194f3ee3ffc577a3676fb3a +SHA1 (patch-ac) = 1536b5a110c05452aa423f1581cd09c8f4a486f4 SHA1 (patch-ae) = 05b4d7663735594f427a236428d6cea9510c080e diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab index bec68e63b7a..1ec2881d194 100644 --- a/emulators/bochs/patches/patch-ab +++ b/emulators/bochs/patches/patch-ab @@ -1,7 +1,8 @@ -$NetBSD: patch-ab,v 1.2 1999/10/25 16:05:38 drochner Exp $ ---- Makefile.in.orig Sat Oct 23 21:34:14 1999 -+++ Makefile.in Sat Oct 23 21:35:39 1999 -@@ -101,7 +101,7 @@ +$NetBSD: patch-ab,v 1.3 2002/05/13 14:47:41 wiz Exp $ + +--- Makefile.in.orig Thu Mar 28 01:28:42 2002 ++++ Makefile.in +@@ -164,7 +164,7 @@ @DISASM_VAR@ @INSTRUMENT_VAR@ @DYNAMIC_VAR@ $(BX_OBJS) \ $(SIMX86_OBJS) \ $(FPU_LIB) diff --git a/emulators/bochs/patches/patch-ac b/emulators/bochs/patches/patch-ac new file mode 100644 index 00000000000..59f758e02be --- /dev/null +++ b/emulators/bochs/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.5 2002/05/13 14:47:41 wiz Exp $ + +--- gui/Makefile.in.orig Sun May 12 23:47:32 2002 ++++ gui/Makefile.in +@@ -82,6 +82,9 @@ + beos.o: beos.@CPP_SUFFIX@ + $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(BEOS_CFLAGS) $< + ++gui.o: gui.@CPP_SUFFIX@ ++ $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $< ++ + x.o: x.@CPP_SUFFIX@ + $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(BX_INCDIRS) $(X_CFLAGS) $< + |