does this fix kqemu on amd64 generic.mp?
On Thu, Oct 30, 2008 at 07:30:56PM +0100, Giovanni Bechis wrote:
> Mikolaj Kucharski wrote:
>> Hi,
>>
>> - use SUBST_CMD
>> - fix path in README.OpenBSD for qemu-ifup
>> - do not hardcode /usr/local in README.OpenBSD
>> - @bin markers - update-plist
>> - patch-level bump
>>
> Latest patch which fixes path in README.OpenBSD.
> Cheers
> Giovanni
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/Makefile,v
> retrieving revision 1.37
> diff -u -p -r1.37 Makefile
> --- Makefile 22 Sep 2008 15:17:54 -0000 1.37
> +++ Makefile 30 Oct 2008 18:18:34 -0000
> @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc
> COMMENT= multi system emulator
>
> DISTNAME= qemu-0.9.1
> -PKGNAME= ${DISTNAME}p4
> +PKGNAME= ${DISTNAME}p5
> CATEGORIES= emulators
>
> HOMEPAGE= http://bellard.org/qemu/
> @@ -49,7 +49,7 @@ WANTLIB+= pthread
> .endif
>
> pre-configure:
> - @perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g;" ${WRKSRC}/vl.c
> ${WRKSRC}/qemu-doc.texi
> + @${SUBST_CMD} ${WRKSRC}/vl.c ${WRKSRC}/qemu-doc.texi
>
> post-install:
> @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qemu
> @@ -57,5 +57,6 @@ post-install:
> @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown ${PREFIX}/share/examples/qemu
> @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qemu
> @${INSTALL_SCRIPT} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/qemu
> + @${SUBST_CMD} ${PREFIX}/share/doc/qemu/README.OpenBSD
>
> .include <bsd.port.mk>
> Index: files/README.OpenBSD
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/files/README.OpenBSD,v
> retrieving revision 1.1
> diff -u -p -r1.1 README.OpenBSD
> --- files/README.OpenBSD 28 Apr 2008 22:52:38 -0000 1.1
> +++ files/README.OpenBSD 30 Oct 2008 18:18:34 -0000
> @@ -52,7 +52,7 @@ README for OpenBSD users
> privileges to open and configure /dev/tunN. There is no way to drop from
> root privileges at this point.
>
> - %SYSCONFDIR%/qemu-ifup contains some default settings that permit one to do
> + ${SYSCONFDIR}/qemu-ifup contains some default settings that permit one to
> do
> the following:
>
> # qemu -net nic -net tap virtual.hd
> @@ -155,13 +155,13 @@ README for OpenBSD users
> is a complete example that may be cut-and-pasted into rc.local:
>
> hddir=/var/vm
> - if [ -x /usr/local/bin/qemu ]; then
> + if [ -x ${TRUEPREFIX}/bin/qemu ]; then
> echo -n 'Qemu: vmi386'
> (
> export ETHER=trunk101
> export BRIDGE=bridge101
>
> - /usr/local/bin/qemu \
> + ${TRUEPREFIX}/bin/qemu \
> -daemonize \
> -nographic \
> -net nic,vlan=0,model=rtl8139,macaddr=52:54:00:4e:62:8f \
> Index: patches/patch-qemu-doc_texi
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/patches/patch-qemu-doc_texi,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-qemu-doc_texi
> --- patches/patch-qemu-doc_texi 19 Jun 2008 05:51:17 -0000 1.4
> +++ patches/patch-qemu-doc_texi 30 Oct 2008 18:18:35 -0000
> @@ -6,7 +6,7 @@ $OpenBSD: patch-qemu-doc_texi,v 1.4 2008
>
> Note that a SAMBA server must be installed on the host OS in
> [EMAIL PROTECTED]/usr/sbin/smbd}. QEMU was tested successfully with smbd
> version
> [EMAIL PROTECTED]/libexec/smbd}. QEMU was tested successfully with smbd
> version
> [EMAIL PROTECTED]/libexec/smbd}. QEMU was tested successfully with smbd
> version
> 2.2.7a from the Red Hat 9 and version 3.0.10-1.fc3 from Fedora Core 3.
>
> @item -redir [tcp|udp]:@var{host-port}:[EMAIL PROTECTED]:@var{guest-port}
> Index: patches/patch-vl_c
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/patches/patch-vl_c,v
> retrieving revision 1.19
> diff -u -p -r1.19 patch-vl_c
> --- patches/patch-vl_c 22 Sep 2008 15:17:54 -0000 1.19
> +++ patches/patch-vl_c 30 Oct 2008 18:18:36 -0000
> @@ -16,7 +16,7 @@ $OpenBSD: patch-vl_c,v 1.19 2008/09/22 1
> #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
> #else
> -#define SMBD_COMMAND "/usr/sbin/smbd"
> -+#define SMBD_COMMAND "!!LOCALBASE!!/libexec/smbd"
> ++#define SMBD_COMMAND "${LOCALBASE}/libexec/smbd"
> #endif
>
> //#define DEBUG_UNUSED_IOPORT
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/emulators/qemu/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST
> --- pkg/PLIST 28 Apr 2008 22:52:38 -0000 1.10
> +++ pkg/PLIST 30 Oct 2008 18:18:36 -0000
> @@ -1,21 +1,21 @@
> @comment $OpenBSD: PLIST,v 1.10 2008/04/28 22:52:38 todd Exp $
> @pkgpath emulators/qemu,kqemu
> -bin/qemu
> -bin/qemu-img
> -bin/qemu-system-arm
> -bin/qemu-system-cris
> -bin/qemu-system-m68k
> -bin/qemu-system-mips
> -bin/qemu-system-mips64
> -bin/qemu-system-mips64el
> -bin/qemu-system-mipsel
> -bin/qemu-system-ppc
> -bin/qemu-system-ppc64
> -bin/qemu-system-ppcemb
> -bin/qemu-system-sh4
> -bin/qemu-system-sh4eb
> -bin/qemu-system-sparc
> -bin/qemu-system-x86_64
> [EMAIL PROTECTED] bin/qemu
> [EMAIL PROTECTED] bin/qemu-img
> [EMAIL PROTECTED] bin/qemu-system-arm
> [EMAIL PROTECTED] bin/qemu-system-cris
> [EMAIL PROTECTED] bin/qemu-system-m68k
> [EMAIL PROTECTED] bin/qemu-system-mips
> [EMAIL PROTECTED] bin/qemu-system-mips64
> [EMAIL PROTECTED] bin/qemu-system-mips64el
> [EMAIL PROTECTED] bin/qemu-system-mipsel
> [EMAIL PROTECTED] bin/qemu-system-ppc
> [EMAIL PROTECTED] bin/qemu-system-ppc64
> [EMAIL PROTECTED] bin/qemu-system-ppcemb
> [EMAIL PROTECTED] bin/qemu-system-sh4
> [EMAIL PROTECTED] bin/qemu-system-sh4eb
> [EMAIL PROTECTED] bin/qemu-system-sparc
> [EMAIL PROTECTED] bin/qemu-system-x86_64
> @man man/man1/qemu-img.1
> @man man/man1/qemu.1
> share/doc/qemu/
> @@ -31,7 +31,6 @@ share/examples/qemu/qemu-ifup
> @mode 755
> @sample ${SYSCONFDIR}/qemu-ifup
> @mode
> -share/nls/pl_PL.ISO_8859-2/
> share/qemu/
> share/qemu/bios.bin
> share/qemu/keymaps/
