Fri Mar 20 12:57:48 2009 UTC ()
Fix package installation with the 'tiny' option enabled. Bump revision.


(mishka)
diff -r1.55 -r1.56 pkgsrc/emulators/bochs/Makefile
diff -r1.10 -r1.11 pkgsrc/emulators/bochs/PLIST
cvs diff -r1.55 -r1.56 pkgsrc/emulators/bochs/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/bochs/Makefile 2009/03/20 12:20:29 1.55
+++ pkgsrc/emulators/bochs/Makefile 2009/03/20 12:57:48 1.56
@@ -1,58 +1,62 @@ @@ -1,58 +1,62 @@
1# $NetBSD: Makefile,v 1.55 2009/03/20 12:20:29 mishka Exp $ 1# $NetBSD: Makefile,v 1.56 2009/03/20 12:57:48 mishka Exp $
2 2
3DISTNAME= bochs-2.3.7 3DISTNAME= bochs-2.3.7
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://bochs.sourceforge.net/ 9HOMEPAGE= http://bochs.sourceforge.net/
10COMMENT= IA32 and AMD64 PC emulator 10COMMENT= IA32 and AMD64 PC emulator
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16USE_TOOLS+= gunzip gzip 16USE_TOOLS+= gunzip gzip
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19 19
20ONLY_FOR_COMPILER= gcc 20ONLY_FOR_COMPILER= gcc
21CXXFLAGS+= -DPARANOID 21CXXFLAGS+= -DPARANOID
22 22
23CONFIGURE_ARGS+= --enable-cdrom 23CONFIGURE_ARGS+= --enable-cdrom
24CONFIGURE_ARGS+= --enable-ne2000 24CONFIGURE_ARGS+= --enable-ne2000
25 25
26MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} 26MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q}
27MAKE_ENV+= GUNZIP_CMD=${GUNZIP_CMD:Q} 27MAKE_ENV+= GUNZIP_CMD=${GUNZIP_CMD:Q}
28MAKE_ENV+= WGET=${FETCH_CMD:Q} 28MAKE_ENV+= WGET=${FETCH_CMD:Q}
29 29
 30PLIST_VARS+= tiny
 31
30PKG_OPTIONS_VAR= PKG_OPTIONS.bochs 32PKG_OPTIONS_VAR= PKG_OPTIONS.bochs
31PKG_SUPPORTED_OPTIONS+= debug tiny 33PKG_SUPPORTED_OPTIONS+= debug tiny
32 34
33.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
34.include "../../mk/bsd.options.mk" 36.include "../../mk/bsd.options.mk"
35 37
36# Debugging features for the client operating systems. These options are 38# Debugging features for the client operating systems. These options are
37# not enabled by default because they can adversely impact performance. 39# not enabled by default because they can adversely impact performance.
38.if !empty(PKG_OPTIONS:Mdebug) 40.if !empty(PKG_OPTIONS:Mdebug)
39CONFIGURE_ARGS+= --enable-debugger 41CONFIGURE_ARGS+= --enable-debugger
40CONFIGURE_ARGS+= --enable-disasm 42CONFIGURE_ARGS+= --enable-disasm
41CONFIGURE_ARGS+= --enable-iodebug 43CONFIGURE_ARGS+= --enable-iodebug
42CONFIGURE_ARGS+= --enable-x86-debugger 44CONFIGURE_ARGS+= --enable-x86-debugger
43.endif 45.endif
44 46
45.if empty(PKG_OPTIONS:Mtiny) 47.if empty(PKG_OPTIONS:Mtiny)
 48PLIST.tiny= yes
 49
46#CONFIGURE_ARGS+= --enable-3dnow 50#CONFIGURE_ARGS+= --enable-3dnow
47CONFIGURE_ARGS+= --enable-4meg-pages 51CONFIGURE_ARGS+= --enable-4meg-pages
48CONFIGURE_ARGS+= --enable-all-optimizations 52CONFIGURE_ARGS+= --enable-all-optimizations
49CONFIGURE_ARGS+= --enable-apic 53CONFIGURE_ARGS+= --enable-apic
50CONFIGURE_ARGS+= --enable-cpu-level=6 54CONFIGURE_ARGS+= --enable-cpu-level=6
51CONFIGURE_ARGS+= --enable-daz 55CONFIGURE_ARGS+= --enable-daz
52CONFIGURE_ARGS+= --enable-fpu 56CONFIGURE_ARGS+= --enable-fpu
53CONFIGURE_ARGS+= --enable-global-pages 57CONFIGURE_ARGS+= --enable-global-pages
54CONFIGURE_ARGS+= --enable-guest2host-tlb 58CONFIGURE_ARGS+= --enable-guest2host-tlb
55CONFIGURE_ARGS+= --enable-host-specific-asms 59CONFIGURE_ARGS+= --enable-host-specific-asms
56CONFIGURE_ARGS+= --enable-icache 60CONFIGURE_ARGS+= --enable-icache
57CONFIGURE_ARGS+= --enable-mmx 61CONFIGURE_ARGS+= --enable-mmx
58CONFIGURE_ARGS+= --enable-pae 62CONFIGURE_ARGS+= --enable-pae
cvs diff -r1.10 -r1.11 pkgsrc/emulators/bochs/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/bochs/PLIST 2008/12/06 12:00:56 1.10
+++ pkgsrc/emulators/bochs/PLIST 2009/03/20 12:57:48 1.11
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1@comment $NetBSD: PLIST,v 1.10 2008/12/06 12:00:56 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.11 2009/03/20 12:57:48 mishka Exp $
2bin/bochs 2bin/bochs
3bin/bxcommit 3bin/bxcommit
4bin/bximage 4bin/bximage
5lib/bochs/plugins/libbx_acpi.la 5${PLIST.tiny}lib/bochs/plugins/libbx_acpi.la
6lib/bochs/plugins/libbx_biosdev.la 6${PLIST.tiny}lib/bochs/plugins/libbx_biosdev.la
7lib/bochs/plugins/libbx_busmouse.la 7${PLIST.tiny}lib/bochs/plugins/libbx_busmouse.la
8lib/bochs/plugins/libbx_cmos.la 8${PLIST.tiny}lib/bochs/plugins/libbx_cmos.la
9lib/bochs/plugins/libbx_dma.la 9${PLIST.tiny}lib/bochs/plugins/libbx_dma.la
10lib/bochs/plugins/libbx_extfpuirq.la 10${PLIST.tiny}lib/bochs/plugins/libbx_extfpuirq.la
11lib/bochs/plugins/libbx_floppy.la 11${PLIST.tiny}lib/bochs/plugins/libbx_floppy.la
12lib/bochs/plugins/libbx_gameport.la 12${PLIST.tiny}lib/bochs/plugins/libbx_gameport.la
13lib/bochs/plugins/libbx_harddrv.la 13${PLIST.tiny}lib/bochs/plugins/libbx_harddrv.la
14lib/bochs/plugins/libbx_keyboard.la 14${PLIST.tiny}lib/bochs/plugins/libbx_keyboard.la
15lib/bochs/plugins/libbx_ne2k.la 15${PLIST.tiny}lib/bochs/plugins/libbx_ne2k.la
16lib/bochs/plugins/libbx_parallel.la 16${PLIST.tiny}lib/bochs/plugins/libbx_parallel.la
17lib/bochs/plugins/libbx_pci.la 17${PLIST.tiny}lib/bochs/plugins/libbx_pci.la
18lib/bochs/plugins/libbx_pci2isa.la 18${PLIST.tiny}lib/bochs/plugins/libbx_pci2isa.la
19lib/bochs/plugins/libbx_pci_ide.la 19${PLIST.tiny}lib/bochs/plugins/libbx_pci_ide.la
20lib/bochs/plugins/libbx_pcipnic.la 20${PLIST.tiny}lib/bochs/plugins/libbx_pcipnic.la
21lib/bochs/plugins/libbx_pciusb.la 21${PLIST.tiny}lib/bochs/plugins/libbx_pciusb.la
22lib/bochs/plugins/libbx_pcivga.la 22${PLIST.tiny}lib/bochs/plugins/libbx_pcivga.la
23lib/bochs/plugins/libbx_pic.la 23${PLIST.tiny}lib/bochs/plugins/libbx_pic.la
24lib/bochs/plugins/libbx_sb16.la 24${PLIST.tiny}lib/bochs/plugins/libbx_sb16.la
25lib/bochs/plugins/libbx_serial.la 25${PLIST.tiny}lib/bochs/plugins/libbx_serial.la
26lib/bochs/plugins/libbx_speaker.la 26${PLIST.tiny}lib/bochs/plugins/libbx_speaker.la
27lib/bochs/plugins/libbx_unmapped.la 27${PLIST.tiny}lib/bochs/plugins/libbx_unmapped.la
28lib/bochs/plugins/libbx_vga.la 28${PLIST.tiny}lib/bochs/plugins/libbx_vga.la
29lib/bochs/plugins/libbx_x.la 29${PLIST.tiny}lib/bochs/plugins/libbx_x.la
30man/man1/bochs-dlx.1 30man/man1/bochs-dlx.1
31man/man1/bochs.1 31man/man1/bochs.1
32man/man1/bxcommit.1 32man/man1/bxcommit.1
33man/man1/bximage.1 33man/man1/bximage.1
34man/man5/bochsrc.5 34man/man5/bochsrc.5
35share/bochs/BIOS-bochs-latest 35share/bochs/BIOS-bochs-latest
36share/bochs/BIOS-bochs-legacy 36share/bochs/BIOS-bochs-legacy
37share/bochs/VGABIOS-elpin-2.40 37share/bochs/VGABIOS-elpin-2.40
38share/bochs/VGABIOS-elpin-LICENSE 38share/bochs/VGABIOS-elpin-LICENSE
39share/bochs/VGABIOS-lgpl-README 39share/bochs/VGABIOS-lgpl-README
40share/bochs/VGABIOS-lgpl-latest 40share/bochs/VGABIOS-lgpl-latest
41share/bochs/VGABIOS-lgpl-latest-cirrus 41share/bochs/VGABIOS-lgpl-latest-cirrus
42share/bochs/VGABIOS-lgpl-latest-cirrus-debug 42share/bochs/VGABIOS-lgpl-latest-cirrus-debug
@@ -52,15 +52,15 @@ share/bochs/keymaps/x11-pc-it.map @@ -52,15 +52,15 @@ share/bochs/keymaps/x11-pc-it.map
52share/bochs/keymaps/x11-pc-ru.map 52share/bochs/keymaps/x11-pc-ru.map
53share/bochs/keymaps/x11-pc-se.map 53share/bochs/keymaps/x11-pc-se.map
54share/bochs/keymaps/x11-pc-si.map 54share/bochs/keymaps/x11-pc-si.map
55share/bochs/keymaps/x11-pc-uk.map 55share/bochs/keymaps/x11-pc-uk.map
56share/bochs/keymaps/x11-pc-us.map 56share/bochs/keymaps/x11-pc-us.map
57share/doc/bochs/CHANGES 57share/doc/bochs/CHANGES
58share/doc/bochs/COPYING 58share/doc/bochs/COPYING
59share/doc/bochs/README 59share/doc/bochs/README
60share/doc/bochs/TODO 60share/doc/bochs/TODO
61share/doc/bochs/bochsrc-sample.txt 61share/doc/bochs/bochsrc-sample.txt
62@dirrm share/doc/bochs 62@dirrm share/doc/bochs
63@dirrm share/bochs/keymaps 63@dirrm share/bochs/keymaps
64@dirrm share/bochs 64@dirrm share/bochs
65@dirrm lib/bochs/plugins 65${PLIST.tiny}@dirrm lib/bochs/plugins
66@dirrm lib/bochs 66${PLIST.tiny}@dirrm lib/bochs