diff options
| author | bad <bad@pkgsrc.org> | 2016-04-04 15:03:14 +0000 |
|---|---|---|
| committer | bad <bad@pkgsrc.org> | 2016-04-04 15:03:14 +0000 |
| commit | 884bcd86ed84d3ea68c18377c966dd5c46be78d4 (patch) | |
| tree | 05b13d4d325a30ff56689f760275da23880c1a17 | |
| parent | 295da0c261b9d97cdc37826a7a9835623871caf2 (diff) | |
| download | pkgsrc-884bcd86ed84d3ea68c18377c966dd5c46be78d4.tar.gz | |
Honor PKG_SYSCONFDIR.
While here drop know unnecessary XEN_CONFIG_DIR from MAKE_ENV.
| -rw-r--r-- | sysutils/xentools42/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/xentools42/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xentools42/patches/patch-.._docs_misc_xl-disk-configuration.txt | 13 |
3 files changed, 20 insertions, 3 deletions
diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index bda70a27a6e..c7b8e19d2aa 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2016/02/26 10:24:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.43 2016/04/04 15:03:14 bad Exp $ VERSION= 4.2.5 VERSION_IPXE= 1.0.0 @@ -51,12 +51,13 @@ GNU_CONFIGURE= YES #CONFIGURE_ARGS+= --enable-xenapi CONFIGURE_ARGS+= --disable-seabios +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} + MAKE_ENV+= PREFIX=${prefix:Q} WRKSRC=${WRKSRC} MAKE_ENV+= EGDIR=${EGDIR} MAKE_ENV+= BASH_COMPLETION_DIR=${EGDIR} MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} MAKE_ENV+= VARBASE=${VARBASE} -MAKE_ENV+= XEN_CONFIG_DIR=${PKG_SYSCONFDIR} MAKE_ENV+= V=YES MAKE_ENV+= NO_WERROR=1 @@ -140,6 +141,8 @@ SUBST_CLASSES+= conf SUBST_STAGE.conf= pre-configure SUBST_FILES.conf+= python/xen/xm/create.py SUBST_FILES.conf+= ocaml/xenstored/define.ml +SUBST_FILES.conf+= libxl/xl_cmdtable.c +SUBST_FILES.conf+= ../docs/misc/xl-disk-configuration.txt SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup hotplugpath.sh diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo index c0fc6f47a5a..fe05d4ab364 100644 --- a/sysutils/xentools42/distinfo +++ b/sysutils/xentools42/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2016/03/19 00:32:10 rillig Exp $ +$NetBSD: distinfo,v 1.24 2016/04/04 15:03:14 bad Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -26,6 +26,7 @@ SHA1 (patch-.._docs_man_xl.pod.1) = 740ad6f53e113b755bc6b04abce4ec9ba08eb815 SHA1 (patch-.._docs_man_xlcpupool.cfg.pod.5) = a693a79a1f1c16548f62f7da1fa58fa28030990f SHA1 (patch-.._docs_man_xm.pod.1) = 975b7570da4bf9fd9cb79539fbd36b8dfbcbd571 SHA1 (patch-.._docs_man_xmdomain.cfg.pod.5) = 5563a72e203e789a86f4166c71ddb3fcff5215c6 +SHA1 (patch-.._docs_misc_xl-disk-configuration.txt) = 2e6d363228fa050679db1016ca925c279c657490 SHA1 (patch-CVE-2015-2152) = 676339abef9e79595f6c40de31ca740f8284c7a2 SHA1 (patch-CVE-2015-2752) = 81c197a9adba59b1a1fe86a35f1edc55c27d2c2c SHA1 (patch-CVE-2015-3209) = abbfe580c03b5fd591d1fd893671f8d2b48f4123 diff --git a/sysutils/xentools42/patches/patch-.._docs_misc_xl-disk-configuration.txt b/sysutils/xentools42/patches/patch-.._docs_misc_xl-disk-configuration.txt new file mode 100644 index 00000000000..6ec00cb0ff7 --- /dev/null +++ b/sysutils/xentools42/patches/patch-.._docs_misc_xl-disk-configuration.txt @@ -0,0 +1,13 @@ +$NetBSD: patch-.._docs_misc_xl-disk-configuration.txt,v 1.1 2016/04/04 15:03:14 bad Exp $ + +--- ../docs/misc/xl-disk-configuration.txt.orig 2015-11-03 10:11:18.000000000 +0100 ++++ ../docs/misc/xl-disk-configuration.txt 2016-03-29 22:48:24.000000000 +0200 +@@ -161,7 +161,7 @@ + + Specifies that <target> is not a normal host path, but rather + information to be interpreted by the executable program <script>, +-(looked for in /etc/xen/scripts, if it doesn't contain a slash). ++(looked for in @XENDCONFDIR@/scripts, if it doesn't contain a slash). + + These scripts are normally called "block-<script>". + |