Fri Mar 20 17:17:48 2009 UTC ()
* the bochs can be used without x11 - make this optional & bump pkgrevision
* in fact the PLIST.tiny is used when 'tiny' option is disabled - reflect it


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

--- pkgsrc/emulators/bochs/Makefile 2009/03/20 12:57:48 1.56
+++ pkgsrc/emulators/bochs/Makefile 2009/03/20 17:17:48 1.57
@@ -1,61 +1,63 @@ @@ -1,61 +1,63 @@
1# $NetBSD: Makefile,v 1.56 2009/03/20 12:57:48 mishka Exp $ 1# $NetBSD: Makefile,v 1.57 2009/03/20 17:17:48 mishka Exp $
2 2
3DISTNAME= bochs-2.3.7 3DISTNAME= bochs-2.3.7
4PKGREVISION= 2 4PKGREVISION= 3
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
 25CONFIGURE_ARGS+= --with-nogui
25 26
26MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} 27MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q}
27MAKE_ENV+= GUNZIP_CMD=${GUNZIP_CMD:Q} 28MAKE_ENV+= GUNZIP_CMD=${GUNZIP_CMD:Q}
28MAKE_ENV+= WGET=${FETCH_CMD:Q} 29MAKE_ENV+= WGET=${FETCH_CMD:Q}
29 30
30PLIST_VARS+= tiny 31PLIST_VARS+= notiny
31 32
32PKG_OPTIONS_VAR= PKG_OPTIONS.bochs 33PKG_OPTIONS_VAR= PKG_OPTIONS.bochs
33PKG_SUPPORTED_OPTIONS+= debug tiny 34PKG_SUPPORTED_OPTIONS+= debug tiny x11
 35PKG_SUGGESTED_OPTIONS+= x11
34 36
35.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
36.include "../../mk/bsd.options.mk" 38.include "../../mk/bsd.options.mk"
37 39
38# Debugging features for the client operating systems. These options are 40# Debugging features for the client operating systems. These options are
39# not enabled by default because they can adversely impact performance. 41# not enabled by default because they can adversely impact performance.
40.if !empty(PKG_OPTIONS:Mdebug) 42.if !empty(PKG_OPTIONS:Mdebug)
41CONFIGURE_ARGS+= --enable-debugger 43CONFIGURE_ARGS+= --enable-debugger
42CONFIGURE_ARGS+= --enable-disasm 44CONFIGURE_ARGS+= --enable-disasm
43CONFIGURE_ARGS+= --enable-iodebug 45CONFIGURE_ARGS+= --enable-iodebug
44CONFIGURE_ARGS+= --enable-x86-debugger 46CONFIGURE_ARGS+= --enable-x86-debugger
45.endif 47.endif
46 48
47.if empty(PKG_OPTIONS:Mtiny) 49.if empty(PKG_OPTIONS:Mtiny)
48PLIST.tiny= yes 50PLIST.notiny= yes
49 51
50#CONFIGURE_ARGS+= --enable-3dnow 52#CONFIGURE_ARGS+= --enable-3dnow
51CONFIGURE_ARGS+= --enable-4meg-pages 53CONFIGURE_ARGS+= --enable-4meg-pages
52CONFIGURE_ARGS+= --enable-all-optimizations 54CONFIGURE_ARGS+= --enable-all-optimizations
53CONFIGURE_ARGS+= --enable-apic 55CONFIGURE_ARGS+= --enable-apic
54CONFIGURE_ARGS+= --enable-cpu-level=6 56CONFIGURE_ARGS+= --enable-cpu-level=6
55CONFIGURE_ARGS+= --enable-daz 57CONFIGURE_ARGS+= --enable-daz
56CONFIGURE_ARGS+= --enable-fpu 58CONFIGURE_ARGS+= --enable-fpu
57CONFIGURE_ARGS+= --enable-global-pages 59CONFIGURE_ARGS+= --enable-global-pages
58CONFIGURE_ARGS+= --enable-guest2host-tlb 60CONFIGURE_ARGS+= --enable-guest2host-tlb
59CONFIGURE_ARGS+= --enable-host-specific-asms 61CONFIGURE_ARGS+= --enable-host-specific-asms
60CONFIGURE_ARGS+= --enable-icache 62CONFIGURE_ARGS+= --enable-icache
61CONFIGURE_ARGS+= --enable-mmx 63CONFIGURE_ARGS+= --enable-mmx
@@ -88,26 +90,32 @@ CONFIGURE_ARGS+= --enable-fast-function- @@ -88,26 +90,32 @@ CONFIGURE_ARGS+= --enable-fast-function-
88. endif 90. endif
89 91
90. if ${OPSYS} == "Darwin" 92. if ${OPSYS} == "Darwin"
91CONFIGURE_ARGS+= --enable-sb16=osx 93CONFIGURE_ARGS+= --enable-sb16=osx
92. elif ${OPSYS} == "FreeBSD" 94. elif ${OPSYS} == "FreeBSD"
93CONFIGURE_ARGS+= --enable-sb16=freebsd 95CONFIGURE_ARGS+= --enable-sb16=freebsd
94. elif ${OPSYS} == "Linux" 96. elif ${OPSYS} == "Linux"
95CONFIGURE_ARGS+= --enable-sb16=linux 97CONFIGURE_ARGS+= --enable-sb16=linux
96. else 98. else
97CONFIGURE_ARGS+= --enable-sb16=dummy 99CONFIGURE_ARGS+= --enable-sb16=dummy
98. endif 100. endif
99.endif 101.endif
100 102
 103.if empty(PKG_OPTIONS:Mx11)
 104CONFIGURE_ARGS+= --without-x
 105CONFIGURE_ARGS+= --without-x11
 106CONFIGURE_ARGS+= --with-term
 107.endif
 108
101.if ${OPSYS} == "Linux" 109.if ${OPSYS} == "Linux"
102BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,' 110BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,'
103BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,,' 111BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,,'
104.elif ${OPSYS} == "Darwin" 112.elif ${OPSYS} == "Darwin"
105BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,' 113BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,'
106BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,' 114BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,'
107.else 115.else
108BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,,' 116BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,,'
109BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,' 117BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,\#,'
110.endif 118.endif
111 119
112.if ${OPSYS} == "Darwin" 120.if ${OPSYS} == "Darwin"
113MESSAGE_SRC= ${.CURDIR}/MESSAGE.Darwin 121MESSAGE_SRC= ${.CURDIR}/MESSAGE.Darwin
@@ -115,26 +123,30 @@ PLIST_SRC= ${.CURDIR}/PLIST.Darwin @@ -115,26 +123,30 @@ PLIST_SRC= ${.CURDIR}/PLIST.Darwin
115 123
116post-build: 124post-build:
117 { ${ECHO} '#! ${SH}'; \ 125 { ${ECHO} '#! ${SH}'; \
118 ${ECHO} 'exec ${PREFIX}/libexec/bochs.app/Contents/MacOS/bochs'\ 126 ${ECHO} 'exec ${PREFIX}/libexec/bochs.app/Contents/MacOS/bochs'\
119 '"$$@"'; } >${WRKDIR}/bochs.sh 127 '"$$@"'; } >${WRKDIR}/bochs.sh
120 128
121post-install: 129post-install:
122 /Developer/Tools/CpMac -r -p ${WRKSRC}/bochs.app ${PREFIX}/libexec 130 /Developer/Tools/CpMac -r -p ${WRKSRC}/bochs.app ${PREFIX}/libexec
123 ${INSTALL_PROGRAM} ${WRKSRC}/bxcommit ${PREFIX}/bin 131 ${INSTALL_PROGRAM} ${WRKSRC}/bxcommit ${PREFIX}/bin
124 ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin 132 ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin
125 ${RM} -rf ${PREFIX}/libexec/bochs.app/.build 133 ${RM} -rf ${PREFIX}/libexec/bochs.app/.build
126 ${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs 134 ${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
127.else 135.else
 136. if empty(PKG_OPTIONS:Mx11)
 137. include "../../mk/curses.buildlink3.mk"
 138. else
128BUILDLINK_DEPMETHOD.libXt?= build 139BUILDLINK_DEPMETHOD.libXt?= build
129 140
130. include "../../x11/libSM/buildlink3.mk" 141. include "../../x11/libSM/buildlink3.mk"
131. include "../../x11/libX11/buildlink3.mk" 142. include "../../x11/libX11/buildlink3.mk"
132. include "../../x11/libXpm/buildlink3.mk" 143. include "../../x11/libXpm/buildlink3.mk"
133. include "../../x11/libXt/buildlink3.mk" 144. include "../../x11/libXt/buildlink3.mk"
 145. endif
134.endif 146.endif
135 147
136pre-configure: 148pre-configure:
137 ${SED} ${BOCHSRC_SUBST} <${WRKSRC}/.bochsrc >${WRKSRC}/.bochsrc.new 149 ${SED} ${BOCHSRC_SUBST} <${WRKSRC}/.bochsrc >${WRKSRC}/.bochsrc.new
138 mv ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc 150 mv ${WRKSRC}/.bochsrc.new ${WRKSRC}/.bochsrc
139 151
140.include "../../mk/bsd.pkg.mk" 152.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/emulators/bochs/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/bochs/PLIST 2009/03/20 12:57:48 1.11
+++ pkgsrc/emulators/bochs/PLIST 2009/03/20 17:17:48 1.12
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1@comment $NetBSD: PLIST,v 1.11 2009/03/20 12:57:48 mishka Exp $ 1@comment $NetBSD: PLIST,v 1.12 2009/03/20 17:17:48 mishka Exp $
2bin/bochs 2bin/bochs
3bin/bxcommit 3bin/bxcommit
4bin/bximage 4bin/bximage
5${PLIST.tiny}lib/bochs/plugins/libbx_acpi.la 5${PLIST.notiny}lib/bochs/plugins/libbx_acpi.la
6${PLIST.tiny}lib/bochs/plugins/libbx_biosdev.la 6${PLIST.notiny}lib/bochs/plugins/libbx_biosdev.la
7${PLIST.tiny}lib/bochs/plugins/libbx_busmouse.la 7${PLIST.notiny}lib/bochs/plugins/libbx_busmouse.la
8${PLIST.tiny}lib/bochs/plugins/libbx_cmos.la 8${PLIST.notiny}lib/bochs/plugins/libbx_cmos.la
9${PLIST.tiny}lib/bochs/plugins/libbx_dma.la 9${PLIST.notiny}lib/bochs/plugins/libbx_dma.la
10${PLIST.tiny}lib/bochs/plugins/libbx_extfpuirq.la 10${PLIST.notiny}lib/bochs/plugins/libbx_extfpuirq.la
11${PLIST.tiny}lib/bochs/plugins/libbx_floppy.la 11${PLIST.notiny}lib/bochs/plugins/libbx_floppy.la
12${PLIST.tiny}lib/bochs/plugins/libbx_gameport.la 12${PLIST.notiny}lib/bochs/plugins/libbx_gameport.la
13${PLIST.tiny}lib/bochs/plugins/libbx_harddrv.la 13${PLIST.notiny}lib/bochs/plugins/libbx_harddrv.la
14${PLIST.tiny}lib/bochs/plugins/libbx_keyboard.la 14${PLIST.notiny}lib/bochs/plugins/libbx_keyboard.la
15${PLIST.tiny}lib/bochs/plugins/libbx_ne2k.la 15${PLIST.notiny}lib/bochs/plugins/libbx_ne2k.la
16${PLIST.tiny}lib/bochs/plugins/libbx_parallel.la 16${PLIST.notiny}lib/bochs/plugins/libbx_parallel.la
17${PLIST.tiny}lib/bochs/plugins/libbx_pci.la 17${PLIST.notiny}lib/bochs/plugins/libbx_pci.la
18${PLIST.tiny}lib/bochs/plugins/libbx_pci2isa.la 18${PLIST.notiny}lib/bochs/plugins/libbx_pci2isa.la
19${PLIST.tiny}lib/bochs/plugins/libbx_pci_ide.la 19${PLIST.notiny}lib/bochs/plugins/libbx_pci_ide.la
20${PLIST.tiny}lib/bochs/plugins/libbx_pcipnic.la 20${PLIST.notiny}lib/bochs/plugins/libbx_pcipnic.la
21${PLIST.tiny}lib/bochs/plugins/libbx_pciusb.la 21${PLIST.notiny}lib/bochs/plugins/libbx_pciusb.la
22${PLIST.tiny}lib/bochs/plugins/libbx_pcivga.la 22${PLIST.notiny}lib/bochs/plugins/libbx_pcivga.la
23${PLIST.tiny}lib/bochs/plugins/libbx_pic.la 23${PLIST.notiny}lib/bochs/plugins/libbx_pic.la
24${PLIST.tiny}lib/bochs/plugins/libbx_sb16.la 24${PLIST.notiny}lib/bochs/plugins/libbx_sb16.la
25${PLIST.tiny}lib/bochs/plugins/libbx_serial.la 25${PLIST.notiny}lib/bochs/plugins/libbx_serial.la
26${PLIST.tiny}lib/bochs/plugins/libbx_speaker.la 26${PLIST.notiny}lib/bochs/plugins/libbx_speaker.la
27${PLIST.tiny}lib/bochs/plugins/libbx_unmapped.la 27${PLIST.notiny}lib/bochs/plugins/libbx_unmapped.la
28${PLIST.tiny}lib/bochs/plugins/libbx_vga.la 28${PLIST.notiny}lib/bochs/plugins/libbx_vga.la
29${PLIST.tiny}lib/bochs/plugins/libbx_x.la 29${PLIST.notiny}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${PLIST.tiny}@dirrm lib/bochs/plugins 65${PLIST.notiny}@dirrm lib/bochs/plugins
66${PLIST.tiny}@dirrm lib/bochs 66${PLIST.notiny}@dirrm lib/bochs