kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* the bochs can be used without x11 - make this optional & bump pkgrevision

Browse source 
* in fact the PLIST.tiny is used when 'tiny' option is disabled - reflect it
This commit is contained in:
mishka 2009-03-20 17:17:48 +00:00
parent 5292a6fe55
commit 6bb47a3368
2 changed files with 45 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
emulators/bochs/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.56 2009/03/20 12:57:48 mishka Exp $
# $NetBSD: Makefile,v 1.57 2009/03/20 17:17:48 mishka Exp $
DISTNAME= bochs-2.3.7
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
@ -22,15 +22,17 @@ CXXFLAGS+= -DPARANOID
CONFIGURE_ARGS+= --enable-cdrom
CONFIGURE_ARGS+= --enable-ne2000
CONFIGURE_ARGS+= --with-nogui
MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q}
MAKE_ENV+= GUNZIP_CMD=${GUNZIP_CMD:Q}
MAKE_ENV+= WGET=${FETCH_CMD:Q}
PLIST_VARS+= tiny
PLIST_VARS+= notiny
PKG_OPTIONS_VAR= PKG_OPTIONS.bochs
PKG_SUPPORTED_OPTIONS+= debug tiny
PKG_SUPPORTED_OPTIONS+= debug tiny x11
PKG_SUGGESTED_OPTIONS+= x11
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"
@ -45,7 +47,7 @@ CONFIGURE_ARGS+= --enable-x86-debugger
.endif
.if empty(PKG_OPTIONS:Mtiny)
PLIST.tiny= yes
PLIST.notiny= yes
#CONFIGURE_ARGS+= --enable-3dnow
CONFIGURE_ARGS+= --enable-4meg-pages
@ -98,6 +100,12 @@ CONFIGURE_ARGS+= --enable-sb16=dummy
. endif
.endif
.if empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS+= --without-x
CONFIGURE_ARGS+= --without-x11
CONFIGURE_ARGS+= --with-term
.endif
.if ${OPSYS} == "Linux"
BOCHSRC_SUBST+= -e 's,@FLOPPY_BSD@,\#,'
BOCHSRC_SUBST+= -e 's,@FLOPPY_LINUX@,,'
@ -125,12 +133,16 @@ post-install:
${RM} -rf ${PREFIX}/libexec/bochs.app/.build
${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
.else
. if empty(PKG_OPTIONS:Mx11)
. include "../../mk/curses.buildlink3.mk"
. else
BUILDLINK_DEPMETHOD.libXt?= build
. include "../../x11/libSM/buildlink3.mk"
. include "../../x11/libX11/buildlink3.mk"
. include "../../x11/libXpm/buildlink3.mk"
. include "../../x11/libXt/buildlink3.mk"
. endif
.endif
pre-configure:

56
emulators/bochs/PLIST
View file

@ -1,32 +1,32 @@
@comment $NetBSD: PLIST,v 1.11 2009/03/20 12:57:48 mishka Exp $
@comment $NetBSD: PLIST,v 1.12 2009/03/20 17:17:48 mishka Exp $
bin/bochs
bin/bxcommit
bin/bximage
${PLIST.tiny}lib/bochs/plugins/libbx_acpi.la
${PLIST.tiny}lib/bochs/plugins/libbx_biosdev.la
${PLIST.tiny}lib/bochs/plugins/libbx_busmouse.la
${PLIST.tiny}lib/bochs/plugins/libbx_cmos.la
${PLIST.tiny}lib/bochs/plugins/libbx_dma.la
${PLIST.tiny}lib/bochs/plugins/libbx_extfpuirq.la
${PLIST.tiny}lib/bochs/plugins/libbx_floppy.la
${PLIST.tiny}lib/bochs/plugins/libbx_gameport.la
${PLIST.tiny}lib/bochs/plugins/libbx_harddrv.la
${PLIST.tiny}lib/bochs/plugins/libbx_keyboard.la
${PLIST.tiny}lib/bochs/plugins/libbx_ne2k.la
${PLIST.tiny}lib/bochs/plugins/libbx_parallel.la
${PLIST.tiny}lib/bochs/plugins/libbx_pci.la
${PLIST.tiny}lib/bochs/plugins/libbx_pci2isa.la
${PLIST.tiny}lib/bochs/plugins/libbx_pci_ide.la
${PLIST.tiny}lib/bochs/plugins/libbx_pcipnic.la
${PLIST.tiny}lib/bochs/plugins/libbx_pciusb.la
${PLIST.tiny}lib/bochs/plugins/libbx_pcivga.la
${PLIST.tiny}lib/bochs/plugins/libbx_pic.la
${PLIST.tiny}lib/bochs/plugins/libbx_sb16.la
${PLIST.tiny}lib/bochs/plugins/libbx_serial.la
${PLIST.tiny}lib/bochs/plugins/libbx_speaker.la
${PLIST.tiny}lib/bochs/plugins/libbx_unmapped.la
${PLIST.tiny}lib/bochs/plugins/libbx_vga.la
${PLIST.tiny}lib/bochs/plugins/libbx_x.la
${PLIST.notiny}lib/bochs/plugins/libbx_acpi.la
${PLIST.notiny}lib/bochs/plugins/libbx_biosdev.la
${PLIST.notiny}lib/bochs/plugins/libbx_busmouse.la
${PLIST.notiny}lib/bochs/plugins/libbx_cmos.la
${PLIST.notiny}lib/bochs/plugins/libbx_dma.la
${PLIST.notiny}lib/bochs/plugins/libbx_extfpuirq.la
${PLIST.notiny}lib/bochs/plugins/libbx_floppy.la
${PLIST.notiny}lib/bochs/plugins/libbx_gameport.la
${PLIST.notiny}lib/bochs/plugins/libbx_harddrv.la
${PLIST.notiny}lib/bochs/plugins/libbx_keyboard.la
${PLIST.notiny}lib/bochs/plugins/libbx_ne2k.la
${PLIST.notiny}lib/bochs/plugins/libbx_parallel.la
${PLIST.notiny}lib/bochs/plugins/libbx_pci.la
${PLIST.notiny}lib/bochs/plugins/libbx_pci2isa.la
${PLIST.notiny}lib/bochs/plugins/libbx_pci_ide.la
${PLIST.notiny}lib/bochs/plugins/libbx_pcipnic.la
${PLIST.notiny}lib/bochs/plugins/libbx_pciusb.la
${PLIST.notiny}lib/bochs/plugins/libbx_pcivga.la
${PLIST.notiny}lib/bochs/plugins/libbx_pic.la
${PLIST.notiny}lib/bochs/plugins/libbx_sb16.la
${PLIST.notiny}lib/bochs/plugins/libbx_serial.la
${PLIST.notiny}lib/bochs/plugins/libbx_speaker.la
${PLIST.notiny}lib/bochs/plugins/libbx_unmapped.la
${PLIST.notiny}lib/bochs/plugins/libbx_vga.la
${PLIST.notiny}lib/bochs/plugins/libbx_x.la
man/man1/bochs-dlx.1
man/man1/bochs.1
man/man1/bxcommit.1
@ -62,5 +62,5 @@ share/doc/bochs/bochsrc-sample.txt
@dirrm share/doc/bochs
@dirrm share/bochs/keymaps
@dirrm share/bochs
${PLIST.tiny}@dirrm lib/bochs/plugins
${PLIST.tiny}@dirrm lib/bochs
${PLIST.notiny}@dirrm lib/bochs/plugins
${PLIST.notiny}@dirrm lib/bochs