Index: head/emulators/bochs/Makefile =================================================================== --- head/emulators/bochs/Makefile (revision 61535) +++ head/emulators/bochs/Makefile (revision 61536) @@ -1,206 +1,215 @@ # ex:ts=8 # Ports collection makefile for: bochs # Date created: 16 December 1997 # Whom: alex # # $FreeBSD$ # PORTNAME= bochs PORTVERSION= 1.4 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ftp://ftp.bochs.com/bochs/ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org .include .if ${XFREE86_VERSION} == 4 BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients .endif # Global variables # USE_XLIB= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_AUTOCONF= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --enable-cdrom \ --disable-split-hd CFLAGS+= -fno-rtti -fno-exceptions -fomit-frame-pointer \ -I${X11BASE}/include # PREFIX isn't honored. force it w/ prefix. MAKE_ARGS= prefix=${PREFIX} .if defined(WITH_BOCHS_PROCESSORS) .if ${WITH_BOCHS_CPU_LEVEL} < 1 || ${WITH_BOCHS_CPU_LEVEL} > 15 .error "WITH_BOCHS_CPU_LEVEL must be an integer value between 1 and 15." .endif CONFIGURE_ARGS+= --enable-processors=${WITH_BOCHS_PROCESSORS} WITH_BOCHS_CPU_LEVEL= 6 .endif .if defined(WITH_BOCHS_CPU_LEVEL) .if ${WITH_BOCHS_CPU_LEVEL} < 3 || ${WITH_BOCHS_CPU_LEVEL} > 6 .error "WITH_BOCHS_CPU_LEVEL must be an integer value between 3 and 6." .endif CONFIGURE_ARGS+= --enable-cpu-level=${WITH_BOCHS_CPU_LEVEL} .endif .if defined(WITH_BOCHS_DEBUGGER) CONFIGURE_ARGS+= --enable-debugger --enable-disasm .endif .if defined(WITH_BOCHS_X86_DEBUGGER) CONFIGURE_ARGS+= --enable-x86-debugger .endif +.if defined(WITH_NE2000) +CONFIGURE_ARGS+= --enable-ne2000 +.endif + .if defined(WITH_SOUND) CONFIGURE_ARGS+= --enable-sb16=linux .endif MAN1= bochs.1 bochsrc.1 bximage.1 MSG_FILE= ${PKGDIR}/pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message # Local variables # BIOS_DIR= ${DATADIR}/bios FONT_DIR= ${DATADIR}/font MKFONTDIR?= mkfontdir # Pre-everything # pre-everything:: .if !defined(WITH_BOCHS_CPU_LEVEL) || !defined(WITH_BOCHS_PROCESSORS) || \ !defined(WITH_BOCHS_DEBUGGER) || !defined(WITH_BOCHS_X86_DEBUGGER) || \ !defined(WITH_SOUND) @${ECHO_MSG} .if !defined(WITH_BOCHS_CPU_LEVEL) @${ECHO_MSG} "If you want to change the processor level to emulate (default is 5, aka Pentium)" @${ECHO_MSG} "Choices are 3,4,5,6 which mean target 386, 486, Pentium or Pentium Pro emulation" @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_CPU_LEVEL=\"" @${ECHO_MSG} .endif .if !defined(WITH_BOCHS_PROCESSORS) @${ECHO_MSG} "If you want to compile with SMP support (implies WITH_BOCHS_CPU_LEVEL=6)." @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_PROCESSORS=\"" @${ECHO_MSG} .endif .if !defined(WITH_BOCHS_DEBUGGER) @${ECHO_MSG} "If you want to compile with builtin debugger and disassembler support." @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_DEBUGGER=yes\"" @${ECHO_MSG} .endif .if !defined(WITH_BOCHS_X86_DEBUGGER) @${ECHO_MSG} "If you want to compile with x86 hardware debugger support." @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_BOCHS_X86_DEBUGGER=yes\"" + @${ECHO_MSG} +.endif +.if !defined(WITH_NE2000) + @${ECHO_MSG} "If you want to compile with networking (ne2000) support." + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_NE2000=yes\"" @${ECHO_MSG} .endif .if !defined(WITH_SOUND) @${ECHO_MSG} "If you want to compile with sound (blaster 16) support." @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_SOUND=yes\"" .endif @${ECHO_MSG} .endif # Post-configure # post-patch: patch-bochsrc patch-mans patch-wrapper patch-message patch-bochsrc: @${PERL} -pi.fbsd -e ' \ s|^vgaromimage:\sbios/|vgaromimage: ${BIOS_DIR}/|; \ s|^romimage:\sfile=bios/|romimage: file=${BIOS_DIR}/|; \ ' ${WRKSRC}/.bochsrc patch-mans: @${PERL} -pi.fbsd -e ' \ s|/usr/local/bochs|${DATADIR}|; \ s|\@VERSION\@|${PORTVERSION}|; \ ' ${WRKSRC}/doc/man/*.1 patch-wrapper: @${SED} 's|%%PREFIX%%|${PREFIX}|;s|%%X11BASE%%|${X11BASE}|; \ s|%%FONT_DIR%%|${FONT_DIR}| \ ' ${FILESDIR}/bochs.sh > ${WRKDIR}/bochs.sh patch-message: @${SED} 's|%%DATADIR%%|${DATADIR}|g' ${MSG_FILE} > ${PKGMESSAGE} # Post-build # post-build: compress-font-file compress-font-file: @${GZIP_CMD} < ${WRKSRC}/font/vga.pcf > ${WRKSRC}/font/vga.pcf.gz # Install # do-install: install-bins install-mans install-bochsrc \ install-bios install-fonts install-docs install-bins: @${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/libexec/bochs.bin @${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin install-mans: .for mansect in 1 .for man in ${MAN${mansect}} @${INSTALL_MAN} ${WRKSRC}/doc/man/${man} \ ${MAN${mansect}PREFIX}/man/man${mansect} .endfor .endfor install-bochsrc: @${MKDIR} ${DATADIR} @${INSTALL_DATA} ${WRKSRC}/.bochsrc ${DATADIR}/bochsrc.sample install-bios: @${MKDIR} ${BIOS_DIR} @${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-* ${BIOS_DIR} @${INSTALL_DATA} ${WRKSRC}/bios/BIOS-* ${BIOS_DIR} install-fonts: @${MKDIR} ${FONT_DIR} @${INSTALL_DATA} ${WRKSRC}/font/vga.pcf.gz ${FONT_DIR} @${MKFONTDIR} ${FONT_DIR} install-docs: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/html @${INSTALL_MAN} ${WRKSRC}/docs-html/*.html ${DOCSDIR}/html @${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${DOCSDIR}/html @${INSTALL_MAN} ${WRKSRC}/docs-html/*.txt ${DOCSDIR}/html @${MV} ${DOCSDIR}/html/*.txt ${DOCSDIR} .endif # Post-install # post-install: install-script display-message install-script: @${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs display-message: @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include Property changes on: head/emulators/bochs/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.45 \ No newline at end of property +1.46 \ No newline at end of property Index: head/emulators/bochs/files/patch-configure.in =================================================================== --- head/emulators/bochs/files/patch-configure.in (nonexistent) +++ head/emulators/bochs/files/patch-configure.in (revision 61536) @@ -0,0 +1,21 @@ +--- configure.in.orig Wed Mar 27 17:20:32 2002 ++++ configure.in Thu May 30 21:32:01 2002 +@@ -101,8 +101,16 @@ + AC_CHECK_FUNCS(usleep, AC_DEFINE(BX_HAVE_USLEEP)) + AC_CHECK_FUNCS(nanosleep, AC_DEFINE(BX_HAVE_NANOSLEEP)) + AC_CHECK_FUNCS(abort, AC_DEFINE(BX_HAVE_ABORT)) +-AC_CHECK_TYPE(socklen_t, AC_DEFINE(BX_HAVE_SOCKLEN_T), , [#include ]) +- ++AC_MSG_CHECKING(for socklen_t) ++AC_TRY_COMPILE([#include ++ #include ], ++ [socklen_t x], ++ [ ++ AC_DEFINE(BX_HAVE_SOCKLEN_T) ++ AC_MSG_RESULT(yes) ++ ], ++ AC_MSG_RESULT(no) ++ ) + AC_MSG_CHECKING(for struct timeval) + AC_TRY_COMPILE([#include ], + [struct timeval x;], Property changes on: head/emulators/bochs/files/patch-configure.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/emulators/bochs/files/patch-main.cc =================================================================== --- head/emulators/bochs/files/patch-main.cc (nonexistent) +++ head/emulators/bochs/files/patch-main.cc (revision 61536) @@ -0,0 +1,11 @@ +--- main.cc.orig Thu May 16 04:26:43 2002 ++++ main.cc Thu May 16 04:26:55 2002 +@@ -1174,7 +1174,7 @@ + BX_MEM(0)->load_ROM(bx_options.vgarom.Opath->getptr (), 0xc0000); + BX_CPU(0)->init (BX_MEM(0)); + #if BX_SUPPORT_APIC +- BX_CPU(0)->local_apic.set_id (i); ++ BX_CPU(0)->local_apic.set_id (0); + #endif + BX_CPU(0)->reset(BX_RESET_HARDWARE); + #else Property changes on: head/emulators/bochs/files/patch-main.cc ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property