Date: Sat, 14 Dec 2013 02:08:20 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336418 - head/emulators/bochs Message-ID: <201312140208.rBE28K08036399@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Sat Dec 14 02:08:19 2013 New Revision: 336418 URL: http://svnweb.freebsd.org/changeset/ports/336418 Log: - Add stage support - Convert a lot of "if's" to options helpers - Convert LIB_DEPENDS to new syntax Modified: head/emulators/bochs/Makefile head/emulators/bochs/pkg-plist (contents, props changed) Modified: head/emulators/bochs/Makefile ============================================================================== --- head/emulators/bochs/Makefile Sat Dec 14 01:53:06 2013 (r336417) +++ head/emulators/bochs/Makefile Sat Dec 14 02:08:19 2013 (r336418) @@ -84,274 +84,120 @@ CXXFLAGS+= -fno-rtti CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MANCOMPRESSED= yes -MAN1= bochs.1 bochs-dlx.1 bxcommit.1 bximage.1 -MAN5= bochsrc.5 - SUB_FILES= pkg-message -NO_STAGE= yes -.include <bsd.port.options.mk> +A20_PIN_CONFIGURE_ENABLE= a20-pin -.if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWXGTK) && empty(PORT_OPTIONS:MX11) -CONFIGURE_ARGS+=--with-nogui -.endif +ALIGN_CHECK_CONFIGURE_ENABLE= alignment-check -.if ${PORT_OPTIONS:MA20_PIN} -CONFIGURE_ARGS+=--enable-a20-pin -.else -CONFIGURE_ARGS+=--disable-a20-pin -.endif +ASSERT_CHECK_CONFIGURE_ENABLE= assert-checks -.if ${PORT_OPTIONS:MALIGN_CHECK} -CONFIGURE_ARGS+=--enable-alignment-check -.else -CONFIGURE_ARGS+=--disable-alignment-check -.endif +AVX_CONFIGURE_ENABLE= avx -.if ${PORT_OPTIONS:MASSERT_CHECK} -CONFIGURE_ARGS+=--enable-assert-checks -.else -CONFIGURE_ARGS+=--disable-assert-checks -.endif +CDROM_CONFIGURE_ENABLE= cdrom -.if ${PORT_OPTIONS:MAVX} -CONFIGURE_ARGS+=--enable-avx -.else -CONFIGURE_ARGS+=--disable-avx -.endif +CHAINING_CONFIGURE_ENABLE= handlers-chaining -.if ${PORT_OPTIONS:MCDROM} -CONFIGURE_ARGS+=--enable-cdrom -.else -CONFIGURE_ARGS+=--disable-cdrom -.endif +CLGD54XX_CONFIGURE_ENABLE= clgd54xx -.if ${PORT_OPTIONS:MCHAINING} -CONFIGURE_ARGS+=--enable-handlers-chaining -.else -CONFIGURE_ARGS+=--disable-handlers-chaining -.endif +CONF_MSRS_CONFIGURE_ENABLE= configurable-msrs -.if ${PORT_OPTIONS:MCLGD54XX} -CONFIGURE_ARGS+=--enable-clgd54xx -.else -CONFIGURE_ARGS+=--disable-clgd54xx -.endif +CPP_SUFX_CONFIGURE_ENABLE= cpp -.if ${PORT_OPTIONS:MCONF_MSRS} -CONFIGURE_ARGS+=--enable-configurable-msrs -.else -CONFIGURE_ARGS+=--disable-configurable-msrs -.endif +DEBUGGER_CONFIGURE_ENABLE= debugger -.if ${PORT_OPTIONS:MCPP_SUFX} -CONFIGURE_ARGS+=--enable-cpp -.else -CONFIGURE_ARGS+=--disable-cpp -.endif +DEBUGGER_X86_CONFIGURE_ENABLE= x86-debugger -.if ${PORT_OPTIONS:MDEBUGGER} -CONFIGURE_ARGS+=--enable-debugger -.else -CONFIGURE_ARGS+=--disable-debugger -.endif +DISASM_CONFIGURE_ENABLE= disasm -.if ${PORT_OPTIONS:MDEBUGGER_X86} -CONFIGURE_ARGS+=--enable-x86-debugger -.else -CONFIGURE_ARGS+=--disable-x86-debugger -.endif +E1000_CONFIGURE_ENABLE= e1000 -.if ${PORT_OPTIONS:MDISASM} -CONFIGURE_ARGS+=--enable-disasm -.else -CONFIGURE_ARGS+=--disable-disasm -.endif +ES1370_CONFIGURE_ENABLE= es1370 -.if ${PORT_OPTIONS:ME1000} -CONFIGURE_ARGS+=--enable-e1000 -.else -CONFIGURE_ARGS+=--disable-e1000 -.endif +FAST_FUNCCALL_CONFIGURE_ENABLE= fast-function-calls -.if ${PORT_OPTIONS:MES1370} -CONFIGURE_ARGS+=--enable-es1370 -.else -CONFIGURE_ARGS+=--disable-es1370 -.endif +FPU_CONFIGURE_ENABLE= fpu -.if ${PORT_OPTIONS:MFAST_FUNCCALL} -CONFIGURE_ARGS+=--enable-fast-function-calls -.else -CONFIGURE_ARGS+=--disable-fast-function-calls -.endif +GAMEPORT_CONFIGURE_ENABLE= gameport -.if ${PORT_OPTIONS:MFPU} -CONFIGURE_ARGS+=--enable-fpu -.else -CONFIGURE_ARGS+=--disable-fpu -WITH_CPU_LEVEL= 3 -.endif +GDB_STUB_CONFIGURE_ENABLE= gdb-stub -.if ${PORT_OPTIONS:MGAMEPORT} -CONFIGURE_ARGS+=--enable-gameport -.else -CONFIGURE_ARGS+=--disable-gameport -.endif +IDLE_HACK_CONFIGURE_ENABLE= idle-hack -.if ${PORT_OPTIONS:MGDB_STUB} -CONFIGURE_ARGS+=--enable-gdb-stub -.else -CONFIGURE_ARGS+=--disable-gdb-stub -.endif +IODEBUG_CONFIGURE_ENABLE= iodebug -.if ${PORT_OPTIONS:MIDLE_HACK} -CONFIGURE_ARGS+=--enable-idle-hack -.else -CONFIGURE_ARGS+=--disable-idle-hack -.endif +LARGE_RAMFILE_CONFIGURE_ENABLE= large-ramfile -.if ${PORT_OPTIONS:MIODEBUG} -CONFIGURE_ARGS+=--enable-iodebug -.else -CONFIGURE_ARGS+=--disable-iodebug -.endif +LOGGING_CONFIGURE_ENABLE= logging -.if ${PORT_OPTIONS:MLARGE_RAMFILE} -CONFIGURE_ARGS+=--enable-large-ramfile -.else -CONFIGURE_ARGS+=--disable-large-ramfile -.endif +LONG_PHY_ADDR_CONFIGURE_ENABLE= long-phy-address -.if ${PORT_OPTIONS:MLOGGING} -CONFIGURE_ARGS+=--enable-logging -.else -CONFIGURE_ARGS+=--disable-logging -.endif +MWAIT_CONFIGURE_ENABLE= monitor-mwait -.if ${PORT_OPTIONS:MLONG_PHY_ADDR} -CONFIGURE_ARGS+=--enable-long-phy-address -.else -CONFIGURE_ARGS+=--disable-long-phy-address -.endif +NE2000_CONFIGURE_ENABLE= ne2000 -.if ${PORT_OPTIONS:MMWAIT} -CONFIGURE_ARGS+=--enable-monitor-mwait -.else -CONFIGURE_ARGS+=--disable-monitor-mwait -.endif +OPTIMIZATIONS_CONFIGURE_ENABLE= all-optimizations -.if ${PORT_OPTIONS:MNE2000} -CONFIGURE_ARGS+=--enable-ne2000 -.else -CONFIGURE_ARGS+=--disable-ne2000 -.endif +PCI_CONFIGURE_ENABLE= pci -.if ${PORT_OPTIONS:MOPTIMIZATIONS} -CONFIGURE_ARGS+=--enable-all-optimizations -.else -CONFIGURE_ARGS+=--disable-all-optimizations -.endif +PLUGINS_CONFIGURE_ENABLE= plugins -.if ${PORT_OPTIONS:MPCI} -CONFIGURE_ARGS+=--enable-pci -.else -CONFIGURE_ARGS+=--disable-pci -.endif +PNIC_CONFIGURE_ENABLE= pnic -.if ${PORT_OPTIONS:MPLUGINS} -CONFIGURE_ARGS+=--enable-plugins -.else -CONFIGURE_ARGS+=--disable-plugins -.endif +RAW_SERIAL_CONFIGURE_ENABLE= raw-serial -.if ${PORT_OPTIONS:MPNIC} -CONFIGURE_ARGS+=--enable-pnic -.else -CONFIGURE_ARGS+=--disable-pnic -.endif +READLINE_USES= readline +READLINE_CONFIGURE_ENABLE= readline -.if ${PORT_OPTIONS:MRAW_SERIAL} -CONFIGURE_ARGS+=--enable-raw-serial -.else -CONFIGURE_ARGS+=--disable-raw-serial -.endif +REPEAT_SPEED_CONFIGURE_ENABLE= repeat-speedups -.if ${PORT_OPTIONS:MREADLINE} -USES+= readline -CONFIGURE_ARGS+=--enable-readline -.else -CONFIGURE_ARGS+=--disable-readline -.endif +RFB_CONFIGURE_WITH= rfb -.if ${PORT_OPTIONS:MREPEAT_SPEED} -CONFIGURE_ARGS+=--enable-repeat-speedups -.else -CONFIGURE_ARGS+=--disable-repeat-speedups -.endif +SB16_CONFIGURE_ENABLE= sb16 -.if ${PORT_OPTIONS:MRFB} -CONFIGURE_ARGS+=--with-rfb -.else -CONFIGURE_ARGS+=--without-rfb -.endif +SDL_USE= SDL=sdl +SDL_CONFIGURE_WITH= sdl -.if ${PORT_OPTIONS:MSB16} -CONFIGURE_ARGS+=--enable-sb16 -.endif +SHOW_IPS_CONFIGURE_ENABLE= show-ips -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -CONFIGURE_ARGS+=--with-sdl -.endif +SMP_CONFIGURE_ENABLE= smp -.if ${PORT_OPTIONS:MSHOW_IPS} -CONFIGURE_ARGS+=--enable-show-ips -.else -CONFIGURE_ARGS+=--disable-show-ips -.endif +SVGALIB_LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib +SVGALIB_CONFIGURE_WITH= svga -.if ${PORT_OPTIONS:MSMP} -CONFIGURE_ARGS+=--enable-smp -WITH_CPU_LEVEL= 6 -.endif +SVM_CONFIGURE_ENABLE= svm -.if ${PORT_OPTIONS:MSVGALIB} -LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib -CONFIGURE_ARGS+=--with-svga -.else -CONFIGURE_ARGS+=--without-svga -.endif +TERM_CONFIGURE_WITH= term -.if ${PORT_OPTIONS:MSVM} -CONFIGURE_ARGS+=--enable-svm -.else -CONFIGURE_ARGS+=--disable-svm -.endif +USB_CONFIGURE_ENABLE= usb -.if ${PORT_OPTIONS:MTERM} -CONFIGURE_ARGS+=--with-term -.else -CONFIGURE_ARGS+=--without-term -.endif +USB_OHCI_CONFIGURE_ENABLE= usb-ohci -.if ${PORT_OPTIONS:MUSB} -CONFIGURE_ARGS+=--enable-usb -.else -CONFIGURE_ARGS+=--disable-usb +USB_XHCI_CONFIGURE_ENABLE= usb-xhci + +VOODOO_CONFIGURE_ENABLE= voodoo + +WXGTK_USE= WX=2.4+ +WXGTK_CONFIGURE_WITH= wx +WXGTK_CONFIGURE_OFF= --disable-debugger-gui + +X11_USE= XORG=xrandr +X11_CONFIGURE_WITH= x11 + +X86_64_CONFIGURE_ENABLE= x86-64 + +.include <bsd.port.options.mk> + +.if empty(PORT_OPTIONS:MTERM) && empty(PORT_OPTIONS:MWXGTK) && empty(PORT_OPTIONS:MX11) +CONFIGURE_ARGS+=--with-nogui .endif -.if ${PORT_OPTIONS:MUSB_OHCI} -CONFIGURE_ARGS+=--enable-usb-ohci -.else -CONFIGURE_ARGS+=--disable-usb-ohci +.if ! ${PORT_OPTIONS:MFPU} +WITH_CPU_LEVEL= 3 .endif -.if ${PORT_OPTIONS:MUSB_XHCI} -CONFIGURE_ARGS+=--enable-usb-xhci -.else -CONFIGURE_ARGS+=--disable-usb-xhci +.if ${PORT_OPTIONS:MSMP} +WITH_CPU_LEVEL= 6 .endif .if ${PORT_OPTIONS:MVMX} && ${PORT_OPTIONS:MX86_64} @@ -364,29 +210,8 @@ CONFIGURE_ARGS+=--enable-vmx=1 WITH_CPU_LEVEL= 6 .endif -.if ${PORT_OPTIONS:MVOODOO} -CONFIGURE_ARGS+=--enable-voodoo -.else -CONFIGURE_ARGS+=--disable-voodoo -.endif - -.if ${PORT_OPTIONS:MWXGTK} -USE_WX= 2.4+ -CONFIGURE_ARGS+=--with-wx -.else -CONFIGURE_ARGS+=--disable-debugger-gui -.endif - -.if ${PORT_OPTIONS:MX11} -USE_XORG= xrandr -CONFIGURE_ARGS+=--with-x11 -.endif - .if ${PORT_OPTIONS:MX86_64} -CONFIGURE_ARGS+=--enable-x86-64 WITH_CPU_LEVEL= 6 -.else -CONFIGURE_ARGS+=--disable-x86-64 .endif .if ${PORT_OPTIONS:MXPM} && ${PORT_OPTIONS:MX11} @@ -464,21 +289,18 @@ post-patch: post-install: .if ${PORT_OPTIONS:MPLUGINS} - @${FIND} ${PREFIX}/lib/bochs ! -type d | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} ${PREFIX}/lib/bochs -type d | ${SORT} -r | \ - ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}/CHANGES - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README - @${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}/TODO - @${INSTALL_DATA} ${WRKSRC}/.bochsrc ${DOCSDIR}/bochsrc-sample.txt - @${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${DOCSDIR} - @${MKDIR} ${DOCSDIR}/html - @${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html -.endif - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} + @${FIND} ${STAGEDIR}${PREFIX}/lib/bochs ! -type d | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${PREFIX}/lib/bochs -type d | ${SORT} -r | \ + ${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} +.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}/CHANGES + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README + ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR}/TODO + ${INSTALL_DATA} ${WRKSRC}/.bochsrc ${STAGEDIR}${DOCSDIR}/bochsrc-sample.txt + ${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/html + ${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${STAGEDIR}${DOCSDIR}/html .include <bsd.port.mk> Modified: head/emulators/bochs/pkg-plist ============================================================================== --- head/emulators/bochs/pkg-plist Sat Dec 14 01:53:06 2013 (r336417) +++ head/emulators/bochs/pkg-plist Sat Dec 14 02:08:19 2013 (r336418) @@ -1,7 +1,11 @@ -@comment $FreeBSD$ bin/bochs bin/bxcommit bin/bximage +man/man1/bochs-dlx.1.gz +man/man1/bochs.1.gz +man/man1/bxcommit.1.gz +man/man1/bximage.1.gz +man/man5/bochsrc.5.gz %%DATADIR%%/BIOS-bochs-latest %%DATADIR%%/BIOS-bochs-legacy %%DATADIR%%/VGABIOS-elpin-2.40
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312140208.rBE28K08036399>