diff options
| author | abs <abs@pkgsrc.org> | 2012-05-10 16:07:36 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2012-05-10 16:07:36 +0000 |
| commit | fc165f52752b285c8149f730b9b5b0b22d00a1e1 (patch) | |
| tree | 30336897a2d64cbe9381af2e0e6f294200423628 /sysutils | |
| parent | 87841bd950c6922939dbd2edc324f4f0241f68d0 (diff) | |
| download | pkgsrc-fc165f52752b285c8149f730b9b5b0b22d00a1e1.tar.gz | |
Correctly handle PKG_SYSCONFDIR - bump pkgrevision
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xentools41/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/xentools41/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xentools41/patches/patch-config_StdGNU.mk | 15 |
3 files changed, 20 insertions, 3 deletions
diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile index bc085484acb..1f9b6cef2fe 100644 --- a/sysutils/xentools41/Makefile +++ b/sysutils/xentools41/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.16 2012/03/09 12:34:23 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2012/05/10 16:07:36 abs Exp $ # # VERSION is set in version.mk as it is shared with other packages .include "version.mk" DISTNAME= xen-${VERSION} PKGNAME= xentools41-${VERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ @@ -54,6 +54,7 @@ MAKE_ENV+= EGDIR=${EGDIR:Q} MAKE_ENV+= BASH_COMPLETION_DIR=${EGDIR:Q} MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} MAKE_ENV+= VARBASE=${VARBASE} +MAKE_ENV+= XEN_CONFIG_DIR=${PKG_SYSCONFDIR} #MAKE_ENV+= INSTALL_DIR=${BSD_INSTALL_DATA_DIR} #MAKE_ENV+= INSTALL_DATA=${BSD_INSTALL_DATA} diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo index 83162ae9fcd..919d6130bb6 100644 --- a/sysutils/xentools41/distinfo +++ b/sysutils/xentools41/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2012/02/03 17:00:25 bouyer Exp $ +$NetBSD: distinfo,v 1.18 2012/05/10 16:07:36 abs Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -29,6 +29,7 @@ SHA1 (patch-ce) = 613f4c4605af860e5f88b68c49a0e7870ba6ecde SHA1 (patch-cf) = c8740b1c9cfac686f2e4e32c7613b5f02206459d SHA1 (patch-cg) = 119029fda1d4ecee90d0a108151596cb3ef0ec74 SHA1 (patch-ch) = 84e816c95167828314ef901e324772249a407c41 +SHA1 (patch-config_StdGNU.mk) = bbded4d6da3fae55bfd8dad42ac9b45721ee1ebe SHA1 (patch-da) = 1a7ecd9536340deac2945786b9faae55680525ca SHA1 (patch-db) = 4766f9925462023332793bcea4321072758e289d SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e diff --git a/sysutils/xentools41/patches/patch-config_StdGNU.mk b/sysutils/xentools41/patches/patch-config_StdGNU.mk new file mode 100644 index 00000000000..dbf1058da80 --- /dev/null +++ b/sysutils/xentools41/patches/patch-config_StdGNU.mk @@ -0,0 +1,15 @@ +$NetBSD: patch-config_StdGNU.mk,v 1.1 2012/05/10 16:07:36 abs Exp $ + +Allow XEN_CONFIG_DIR to be overriden in the environment + +--- ../config/StdGNU.mk.orig 2012-05-10 15:51:14.000000000 +0000 ++++ ../config/StdGNU.mk +@@ -53,7 +53,7 @@ endif + + SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR) + +-XEN_CONFIG_DIR = $(CONFIG_DIR)/xen ++XEN_CONFIG_DIR ?= $(CONFIG_DIR)/xen + XEN_SCRIPT_DIR = $(XEN_CONFIG_DIR)/scripts + + SOCKET_LIBS = |