CVS commit: pkgsrc/sysutils/xenstoretools

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Jan  4 16:40:11 UTC 2017

Modified Files:
        pkgsrc/sysutils/xenstoretools: Makefile PLIST

Log Message:
Switch over to using Xen 4.6 tools from 4.1


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/xenstoretools/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/xenstoretools/PLIST

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

Modified files:

Index: pkgsrc/sysutils/xenstoretools/Makefile
diff -u pkgsrc/sysutils/xenstoretools/Makefile:1.6 pkgsrc/sysutils/xenstoretools/Makefile:1.7
--- pkgsrc/sysutils/xenstoretools/Makefile:1.6  Thu Dec 29 23:12:23 2016
+++ pkgsrc/sysutils/xenstoretools/Makefile      Wed Jan  4 16:40:11 2017
@@ -1,27 +1,31 @@
-# $NetBSD: Makefile,v 1.6 2016/12/29 23:12:23 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/04 16:40:11 sborrill Exp $
+#
+
+# VERSION is set in xentool46/version.mk
+.include               "../../sysutils/xentools46/version.mk"
 
 DISTNAME=      xen-${VERSION}
 PKGNAME=       xenstoretools-${VERSION}
-PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  http://bits.xensource.com/oss-xen/release/${VERSION}/
 
-DISTFILES=     ${DISTNAME}.tar.gz
-DISTFILES+=    ipxe-git-v${VERSION_IPXE}.tar.gz
-SITES.ipxe-git-v${VERSION_IPXE}.tar.gz+= http://xenbits.xensource.com/xen-extfiles/
+DISTFILES=                                     ${DISTNAME}.tar.gz
+DISTFILES+=                                    ipxe-git-${VERSION_IPXE}.tar.gz
+SITES.ipxe-git-${VERSION_IPXE}.tar.gz +=       http://xenbits.xensource.com/xen-extfiles/
 
 MAINTAINER=            sborrill%NetBSD.org@localhost
 HOMEPAGE=              http://xen.org/
-COMMENT=               Xenstore Tools for Xen 4.1.x
-LICENSE=               gnu-gpl-v2
-
-VERSION=               4.1.6.1
-VERSION_IPXE=          1.0.0
+COMMENT=               Xenstore Tools for Xen 4.6.x
 
+LICENSE=               gnu-gpl-v2
+DISTINFO_FILE=         ${.CURDIR}/../xentools46/distinfo
+PATCHDIR=              ${.CURDIR}/../xentools46/patches
 BUILD_DIRS=            xenstore
 BUILD_TARGET=          clients
-INSTALL_TARGET=                installclients
 INSTALL_DIRS=          xenstore
+INSTALL_MAKE_FLAGS+=   XENSTORE_XENSTORED=n
+
+GNU_CONFIGURE=         yes
 
 PKG_SYSCONFSUBDIR=     xen
 WRKSRC=                        ${WRKDIR}/xen-${VERSION}/tools
@@ -35,7 +39,7 @@ CONFLICTS+=           xentools20-[0-9]*
 CONFLICTS+=            xentools3*
 CONFLICTS+=            xentools4*
 
-USE_TOOLS+=            gmake
+USE_TOOLS+=            gmake pkg-config
 
 MAKE_ENV+=             PREFIX=${prefix:Q} WRKSRC=${WRKSRC}
 MAKE_ENV+=             MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
@@ -46,9 +50,16 @@ FILES_SUBST+=                PREFIX=${PREFIX}
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALLATION_DIRS=     bin lib
+INSTALLATION_DIRS=     bin include lib
 
 pre-build:
        ${LN} -s ../../xen/include/public ${WRKSRC}/xenstore/xen
 
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/yajl/buildlink3.mk"
+.include "../../devel/argp/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/xenstoretools/PLIST
diff -u pkgsrc/sysutils/xenstoretools/PLIST:1.3 pkgsrc/sysutils/xenstoretools/PLIST:1.4
--- pkgsrc/sysutils/xenstoretools/PLIST:1.3     Tue Mar 11 14:05:16 2014
+++ pkgsrc/sysutils/xenstoretools/PLIST Wed Jan  4 16:40:11 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:16 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/01/04 16:40:11 sborrill Exp $
 bin/xenstore
 bin/xenstore-chmod
 bin/xenstore-control
@@ -9,6 +9,13 @@ bin/xenstore-read
 bin/xenstore-rm
 bin/xenstore-watch
 bin/xenstore-write
+include/xenstore-compat/xs.h
+include/xenstore-compat/xs_lib.h
+include/xenstore.h
+include/xenstore_lib.h
+include/xs.h
+include/xs_lib.h
+lib/libxenstore.a
 lib/libxenstore.so
 lib/libxenstore.so.3.0
-lib/libxenstore.so.3.0.0
+lib/libxenstore.so.3.0.3