Date: Sat, 20 Oct 2001 01:53:31 +0200 (CEST) From: Cyrille Lefevre <clefevre@citeweb.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/31382: Maintainer update: bochs (1.2.1) Message-ID: <200110192353.f9JNrVG24887@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 31382
>Category: ports
>Synopsis: Maintainer update: bochs (1.2.1)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 19 17:00:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 4.4-RC i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 4.4-RC FreeBSD 4.4-RC #7: Thu Sep 20 12:40:17 CEST 2001 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386
>Description:
bochs 1.2.1 is out since... june 2001. I update the port
on august but forgot to submit it!
Makefile
PORTVERSION bumped.
many things have been rewritten.
new conditional variables added :
WITH_BOCHS_PROCESSORS, WITH_BOCHS_CPU_LEVEL
pre-everything added to describe these variables.
pkg-message handling added.
NOPORTSDOC added.
distinfo
updated.
pkg-message
reformatted.
pkg-plist
updated.
html files move to doc/bochs/html subdir.
files/bochs.sh
new file.
>How-To-Repeat:
n/a
>Fix:
take care, the first patch is against /dev/null while the
rest is a cvs diff.
--- /dev/null Sat Oct 20 01:24:51 2001
+++ files/bochs.sh Sat Oct 20 00:47:07 2001
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Bochs wrapper
+#
+
+bin_dir=%%PREFIX%%/libexec
+xbin_dir=%%X11BASE%%/bin
+font_dir=%%FONT_DIR%%
+
+${xbin_dir}/xset -q | grep -q ${font_dir}
+rc=$?
+
+if [ $rc != 0 ]; then
+ ${xbin_dir}/xset fp+ ${font_dir}
+ ${xbin_dir}/xset fp rehash
+fi
+
+${bin_dir}/bochs.bin ${1+"$@"}
+
+if [ $rc != 0 ]; then
+ ${xbin_dir}/xset fp- ${font_dir}
+ ${xbin_dir}/xset fp rehash
+fi
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/bochs/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 2001/08/30 03:58:32 1.38
+++ Makefile 2001/10/19 23:48:01
@@ -7,7 +7,7 @@
#
PORTNAME= bochs
-PORTVERSION= 1.2
+PORTVERSION= 1.2.1
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
@@ -16,58 +16,179 @@
MAINTAINER= clefevre@citeweb.net
+# Global variables
+#
+
USE_XLIB= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-cpu-level=5 \
- --enable-cdrom \
+USE_GMAKE= yes
+
+CONFIGURE_ARGS= --enable-cdrom \
--disable-split-hd
CFLAGS+= -fno-rtti -fno-exceptions -fomit-frame-pointer
-PKGMESSAGE= ${WRKDIR}/pkg-message
+
+# 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
-.ifdef(WITH_BOCHS_DEBUGGER)
+.if defined(WITH_BOCHS_DEBUGGER)
CONFIGURE_ARGS+= --enable-debugger --enable-disasm
.endif
-.ifdef(WITH_BOCHS_X86_DEBUGGER)
+
+.if defined(WITH_BOCHS_X86_DEBUGGER)
CONFIGURE_ARGS+= --enable-x86-debugger
.endif
-.ifdef(WITH_SOUND)
+
+.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
+#
-pre-configure:
- @${PERL} -pi.fbsd \
- -e 's|^vgaromimage:\sbios/|vgaromimage: ${PREFIX}/share/bochs/bios/| ;' \
- -e 's|^romimage:\sfile=bios/|romimage: file=${PREFIX}/share/bochs/bios/|' \
- ${WRKSRC}/.bochsrc
-
-post-build:
- ${GZIP_CMD} < ${WRKSRC}/font/vga.pcf > ${WRKSRC}/font/vga.pcf.gz
- (${ECHO} '#!/bin/sh'; \
- ${ECHO} '${X11BASE}/bin/xset fp+ ${PREFIX}/share/bochs/font'; \
- ${ECHO} 'exec ${PREFIX}/bin/bochs-bin "$$@"') > ${WRKDIR}/bochs.sh
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin/bochs-bin
- ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKDIR}/bochs.sh ${PREFIX}/bin/bochs
- @${MKDIR} ${PREFIX}/share/bochs
- ${INSTALL_DATA} ${WRKSRC}/.bochsrc ${PREFIX}/share/bochs/dot.bochsrc
- @${MKDIR} ${PREFIX}/share/bochs/bios
- ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-* \
- ${PREFIX}/share/bochs/bios
- ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-* \
- ${PREFIX}/share/bochs/bios
- @${MKDIR} ${PREFIX}/share/bochs/font
- ${INSTALL_DATA} ${WRKSRC}/font/vga.pcf.gz ${WRKSRC}/font/fonts.dir \
- ${PREFIX}/share/bochs/font
+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=<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=<number of 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_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} ${PREFIX}/share/doc/bochs
- ${INSTALL_MAN} ${WRKSRC}/docs-html/* ${PREFIX}/share/doc/bochs
+ @${MKDIR} ${DOCSDIR}/html
+ @${INSTALL_MAN} ${WRKSRC}/docs-html/* ${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
-post-install:
- @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message > \
- ${PKGMESSAGE}
+display-message:
+ @${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
+ @${ECHO_MSG}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/emulators/bochs/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo 2001/06/09 00:20:36 1.16
+++ distinfo 2001/08/22 04:16:22
@@ -1 +1 @@
-MD5 (bochs-1.2.tar.gz) = fab61c23bc2b2679da8541eee2222f14
+MD5 (bochs-1.2.1.tar.gz) = 306b58465eb289cfe23921678a41ee93
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/emulators/bochs/pkg-message,v
retrieving revision 1.5
diff -u -r1.5 pkg-message
--- pkg-message 2001/06/02 16:42:56 1.5
+++ pkg-message 2001/09/06 23:20:30
@@ -1,5 +1,3 @@
----------------------------------------------------------------------
- Bochs requires a .bochsrc file to be present in either your current
- directory or your home directory before starting. A sample of the
- .bochsrc file can be found in %%PREFIX%%/share/bochs/dot.bochsrc.
----------------------------------------------------------------------
+**** Bochs requires a .bochsrc file to be present in either your current
+ directory or your home directory before starting. A sample of the
+ .bochsrc file can be found in %%DATADIR%%/bochsrc.sample.
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/emulators/bochs/pkg-plist,v
retrieving revision 1.16
diff -u -r1.16 pkg-plist
--- pkg-plist 2001/06/09 00:20:36 1.16
+++ pkg-plist 2001/10/19 23:48:52
@@ -1,44 +1,46 @@
+@comment $FreeBSD$
bin/bochs
-bin/bochs-bin
bin/bximage
+libexec/bochs.bin
share/bochs/bios/BIOS-bochs-2-processors
share/bochs/bios/BIOS-bochs-4-processors
share/bochs/bios/BIOS-bochs-latest
share/bochs/bios/VGABIOS-elpin-2.40
share/bochs/bios/VGABIOS-elpin-LICENSE
-share/bochs/dot.bochsrc
+share/bochs/bochsrc.sample
share/bochs/font/fonts.dir
share/bochs/font/vga.pcf.gz
-%%PORTDOCS%%share/doc/bochs/00README
-%%PORTDOCS%%share/doc/bochs/3rdparty.license.html
-%%PORTDOCS%%share/doc/bochs/Linux.html
-%%PORTDOCS%%share/doc/bochs/Minix.html
-%%PORTDOCS%%share/doc/bochs/OldWindows95.html
-%%PORTDOCS%%share/doc/bochs/Windows95.html
-%%PORTDOCS%%share/doc/bochs/changelog.html
-%%PORTDOCS%%share/doc/bochs/codingguidelines.html
-%%PORTDOCS%%share/doc/bochs/configure.html
-%%PORTDOCS%%share/doc/bochs/construction.html
-%%PORTDOCS%%share/doc/bochs/cosimulation.html
-%%PORTDOCS%%share/doc/bochs/cvs-status.html
%%PORTDOCS%%share/doc/bochs/cvs-structure.txt
-%%PORTDOCS%%share/doc/bochs/debugger.html
-%%PORTDOCS%%share/doc/bochs/developers.html
-%%PORTDOCS%%share/doc/bochs/faq.html
-%%PORTDOCS%%share/doc/bochs/features.html
-%%PORTDOCS%%share/doc/bochs/fpu.html
-%%PORTDOCS%%share/doc/bochs/guestNT.html
-%%PORTDOCS%%share/doc/bochs/index.html
-%%PORTDOCS%%share/doc/bochs/install.html
-%%PORTDOCS%%share/doc/bochs/instrumentation.html
-%%PORTDOCS%%share/doc/bochs/mtools.html
+%%PORTDOCS%%share/doc/bochs/html/00README
+%%PORTDOCS%%share/doc/bochs/html/3rdparty.license.html
+%%PORTDOCS%%share/doc/bochs/html/Linux.html
+%%PORTDOCS%%share/doc/bochs/html/Minix.html
+%%PORTDOCS%%share/doc/bochs/html/OldWindows95.html
+%%PORTDOCS%%share/doc/bochs/html/Windows95.html
+%%PORTDOCS%%share/doc/bochs/html/changelog.html
+%%PORTDOCS%%share/doc/bochs/html/codingguidelines.html
+%%PORTDOCS%%share/doc/bochs/html/configure.html
+%%PORTDOCS%%share/doc/bochs/html/construction.html
+%%PORTDOCS%%share/doc/bochs/html/cosimulation.html
+%%PORTDOCS%%share/doc/bochs/html/cvs-status.html
+%%PORTDOCS%%share/doc/bochs/html/debugger.html
+%%PORTDOCS%%share/doc/bochs/html/developers.html
+%%PORTDOCS%%share/doc/bochs/html/faq.html
+%%PORTDOCS%%share/doc/bochs/html/features.html
+%%PORTDOCS%%share/doc/bochs/html/fpu.html
+%%PORTDOCS%%share/doc/bochs/html/guestNT.html
+%%PORTDOCS%%share/doc/bochs/html/index.html
+%%PORTDOCS%%share/doc/bochs/html/install.html
+%%PORTDOCS%%share/doc/bochs/html/instrumentation.html
+%%PORTDOCS%%share/doc/bochs/html/mtools.html
+%%PORTDOCS%%share/doc/bochs/html/smp-simulation.html
+%%PORTDOCS%%share/doc/bochs/html/sound.html
+%%PORTDOCS%%share/doc/bochs/html/undercon.gif
+%%PORTDOCS%%share/doc/bochs/html/whatisbochs.html
+%%PORTDOCS%%share/doc/bochs/html/win32.html
%%PORTDOCS%%share/doc/bochs/random.txt
%%PORTDOCS%%share/doc/bochs/release-prep.txt
-%%PORTDOCS%%share/doc/bochs/smp-simulation.html
-%%PORTDOCS%%share/doc/bochs/sound.html
-%%PORTDOCS%%share/doc/bochs/undercon.gif
-%%PORTDOCS%%share/doc/bochs/whatisbochs.html
-%%PORTDOCS%%share/doc/bochs/win32.html
+%%PORTDOCS%%@dirrm share/doc/bochs/html
%%PORTDOCS%%@dirrm share/doc/bochs
@dirrm share/bochs/font
@dirrm share/bochs/bios
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110192353.f9JNrVG24887>