CVS commit: pkgsrc/emulators/haxm

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Feb 15 00:49:08 UTC 2019

Modified Files:
        pkgsrc/emulators/haxm: Makefile PLIST
        pkgsrc/emulators/haxm/files: haxm-modload.in

Log Message:
haxm: align KMODULEDIR to the style of base modules

Install haxm.kmod into a subdir haxm.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/haxm/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/haxm/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/haxm/files/haxm-modload.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/haxm/Makefile
diff -u pkgsrc/emulators/haxm/Makefile:1.6 pkgsrc/emulators/haxm/Makefile:1.7
--- pkgsrc/emulators/haxm/Makefile:1.6  Thu Feb 14 23:17:55 2019
+++ pkgsrc/emulators/haxm/Makefile      Fri Feb 15 00:49:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/02/14 23:17:55 kamil Exp $
+# $NetBSD: Makefile,v 1.7 2019/02/15 00:49:08 kamil Exp $
 
 GITHUB_PROJECT=        haxm
 GITHUB_TAG=    3bdfd1a39021df9b4dfe69e05a277e4e6456494a
@@ -6,6 +6,8 @@ DISTNAME=       haxm-1.20190214.${GITHUB_TAG}
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=intel/}
 
+PKGREVISION=   1
+
 MAINTAINER=    kamil%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/intel/haxm/
 COMMENT=       Intel Hardware Accelerated Execution Manager
@@ -35,7 +37,7 @@ CFLAGS+=      -Wno-error=address-of-packed-me
 .endif
 
 KMOD=          haxm.kmod
-KMODULEDIR=    stand/${MACHINE}/${OS_VERSION}/modules
+KMODULEDIR=    stand/${MACHINE}/${OS_VERSION}/modules/haxm
 
 INSTALLATION_DIRS+=    sbin            # auxiliary scripts
 INSTALLATION_DIRS+=    ${KMODULEDIR}

Index: pkgsrc/emulators/haxm/PLIST
diff -u pkgsrc/emulators/haxm/PLIST:1.1 pkgsrc/emulators/haxm/PLIST:1.2
--- pkgsrc/emulators/haxm/PLIST:1.1     Wed Feb 13 05:20:15 2019
+++ pkgsrc/emulators/haxm/PLIST Fri Feb 15 00:49:08 2019
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2019/02/13 05:20:15 kamil Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/02/15 00:49:08 kamil Exp $
 sbin/haxm-mknod
 sbin/haxm-modload
 sbin/haxm-modunload
-stand/${MACHINE}/${OS_VERSION}/modules/haxm.kmod
+stand/${MACHINE}/${OS_VERSION}/modules/haxm/haxm.kmod

Index: pkgsrc/emulators/haxm/files/haxm-modload.in
diff -u pkgsrc/emulators/haxm/files/haxm-modload.in:1.1 pkgsrc/emulators/haxm/files/haxm-modload.in:1.2
--- pkgsrc/emulators/haxm/files/haxm-modload.in:1.1     Wed Feb 13 05:20:15 2019
+++ pkgsrc/emulators/haxm/files/haxm-modload.in Fri Feb 15 00:49:08 2019
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-modload @PREFIX@/stand/@MACHINE@/@OS_VERSION@/modules/haxm.kmod
+modload @PREFIX@/stand/@MACHINE@/@OS_VERSION@/modules/haxm/haxm.kmod