Yes minus the hooking to the build yet.

We need more test results for amd64.

On Sun, Jan 20, 2008 at 11:42:13AM +0100, Antoine Jacoutot wrote:
> Hi.
>
> This diff does some cleaning and add missing stuffs to the newly imported 
> kqemu port.
>
> - add missing RCS tags
> - respect $CC
> - add NO_REGRESS
> - s/$LOCALBASE/$PREFIX
> - lowercase email
> - hook to the build
> - add _kqemu user to infrastructure/db/user.list
>
> Comments/OK?
>
> -- 
> Antoine

> Index: user.list
> ===================================================================
> RCS file: /cvs/ports/infrastructure/db/user.list,v
> retrieving revision 1.82
> diff -u -r1.82 user.list
> --- user.list 21 Nov 2007 18:44:34 -0000      1.82
> +++ user.list 20 Jan 2008 10:16:52 -0000
> @@ -105,3 +105,4 @@
>  594 _ejabberd                _ejabberd       net/ejabberd
>  595 _poppassd                _poppassd       sysutils/openpoppassd
>  596 _heartbeat               _heartbeat      sysutils/heartbeat
> +597                  _kqemu          emulators/kqemu
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/Makefile,v
> retrieving revision 1.41
> diff -u -r1.41 Makefile
> --- Makefile  18 Jan 2008 14:42:33 -0000      1.41
> +++ Makefile  20 Jan 2008 10:18:14 -0000
> @@ -16,6 +16,7 @@
>      SUBDIR += gns3
>      SUBDIR += gxemul
>      SUBDIR += ines
> +    SUBDIR += kqemu
>      SUBDIR += mastergear
>      SUBDIR += qemu
>      SUBDIR += redhat
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/emulators/kqemu/Makefile,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile
> --- Makefile  20 Jan 2008 00:13:21 -0000      1.2
> +++ Makefile  20 Jan 2008 10:40:51 -0000
> @@ -1,13 +1,16 @@
> +# $OpenBSD$
> +
>  ONLY_FOR_ARCHS=      i386 amd64
>  
>  COMMENT=             QEMU accelerator module
>  
>  DISTNAME=            kqemu-1.3.0pre11
> +PKGNAME=             ${DISTNAME}p0
>  CATEGORIES=          emulators
>  
>  HOMEPAGE=            http://fabrice.bellard.free.fr/qemu/
>  
> -MAINTAINER=          Todd T. Fries <[EMAIL PROTECTED]>
> +MAINTAINER=          Todd T. Fries <[EMAIL PROTECTED]>
>  
>  # GPL
>  PERMIT_PACKAGE_CDROM=        Yes
> @@ -20,8 +23,15 @@
>  BUILD_DEPENDS=               ::devel/gmake
>  
>  CONFIGURE_STYLE=     gnu
> +CONFIGURE_ARGS=              --cc=${CC} \
> +                     --host-cc=${CC} \
> +                     --make=${MAKE_PROGRAM}
> +
>  MAKE_FILE=           Makefile.openbsd
> -PREFIX=                      ${LOCALBASE}/lib/kqemu
> +INSTDIR=             ${PREFIX}/lib/kqemu
> +SUBST_VARS=          INSTDIR
> +
> +NO_REGRESS=          Yes
>  
>  FILES= Makefile.openbsd kqemu-openbsd.c
>  
> @@ -31,7 +41,7 @@
>  .endfor
>  
>  do-install:
> -     ${INSTALL_DATA_DIR} ${PREFIX}
> -     ${INSTALL_DATA} ${WRKBUILD}/kqemu.o ${PREFIX}
> +     ${INSTALL_DATA_DIR} ${INSTDIR}
> +     ${INSTALL_DATA} ${WRKBUILD}/kqemu.o ${INSTDIR}
>  
>  .include <bsd.port.mk>
> Index: files/Makefile.openbsd
> ===================================================================
> RCS file: /cvs/ports/emulators/kqemu/files/Makefile.openbsd,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 Makefile.openbsd
> --- files/Makefile.openbsd    19 Jan 2008 23:55:19 -0000      1.1.1.1
> +++ files/Makefile.openbsd    20 Jan 2008 10:40:51 -0000
> @@ -1,3 +1,5 @@
> +# $OpenBSD
> +
>  NOMAN = noman
>  
>  .if ${MACHINE_ARCH} == "i386"
> Index: pkg/MESSAGE
> ===================================================================
> RCS file: /cvs/ports/emulators/kqemu/pkg/MESSAGE,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 MESSAGE
> --- pkg/MESSAGE       19 Jan 2008 23:55:19 -0000      1.1.1.1
> +++ pkg/MESSAGE       20 Jan 2008 10:40:51 -0000
> @@ -1,8 +1,8 @@
>  If you want to load this kernel module at boot time, add the following
>  lines to /etc/rc.securelevel :
>  
> -if [ -r /usr/local/lib/kqemu/kqemu.o ]; then
> -     echo ' kqemu'; /sbin/modload /usr/local/lib/kqemu/kqemu.o
> +if [ -r ${INSTDIR}/kqemu.o ]; then
> +     echo ' kqemu'; /sbin/modload ${INSTDIR}/kqemu.o
>  fi
>  
>  If you want a user to be able to use this module, add them to the group
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/emulators/kqemu/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 PLIST
> --- pkg/PLIST 19 Jan 2008 23:55:19 -0000      1.1.1.1
> +++ pkg/PLIST 20 Jan 2008 10:40:51 -0000
> @@ -1,3 +1,4 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2008/01/19 23:55:19 todd Exp $
>  @newgroup _kqemu:597
> -kqemu.o
> +lib/kqemu/
> +lib/kqemu/kqemu.o

Reply via email to