DESTDIR support for xentools3{,-hvm}.

5 files changed, 19 insertions, 15 deletions

diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index e1551dedb69..c266ff8fc63 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/04/27 19:59:40 bouyer Exp $
+# $NetBSD: Makefile,v 1.8 2008/08/07 16:00:14 joerg Exp $
 #
 
 VERSION=		3.1.4
@@ -12,6 +12,8 @@ MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://xen.org/
 COMMENT=		Tools for Virtual Machine Extensions support in Xen
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_DEPENDS+=	dev86-[0-9]*:../../devel/dev86 # needed to build firmware
 
 PKG_SYSCONFSUBDIR=	xen
@@ -75,6 +77,8 @@ CONF_FILES_PERMS+=	${EGDIR}/qemu-ifup ${PKG_SYSCONFDIR}/scripts/qemu-ifup \
 
 OWN_DIRS=		${PKG_SYSCONFDIR}/scripts
 
+INSTALLATION_DIRS=	${EGDIR}
+
 pre-build:
 .if !exists(/usr/include/xen/xenio.h)
 	${MKDIR} ${WRKSRC}/libxc/xen
@@ -104,7 +108,7 @@ post-build:
 
 post-install:
 	for f in hvm qemu-ifup; do \
-		${INSTALL_DATA} ${WRKSRC}/examples/$$f ${EGDIR}/$$f;	\
+		${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f;	\
 	done
 
 .include "../../lang/python/application.mk"
diff --git a/sysutils/xentools3-hvm/distinfo b/sysutils/xentools3-hvm/distinfo
index e5386cf508d..0f6807da9cf 100644
--- a/sysutils/xentools3-hvm/distinfo
+++ b/sysutils/xentools3-hvm/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2008/04/27 19:59:40 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2008/08/07 16:00:14 joerg Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
 Size (xen-3.1.4.tar.gz) = 6894493 bytes
 SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa
-SHA1 (patch-an) = cb6e3a7eac490851f2eacf557f05daf0d6966cce
+SHA1 (patch-an) = 37650fa861ed8219aa0682e84c5c8ba41a8cdff0
 SHA1 (patch-ao) = d1250258d09cf9b330a4e9d52e85332a0eef7998
 SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
 SHA1 (patch-ar) = c8748761267dd82c75deab79d13b71d56bcf2223
@@ -14,9 +14,9 @@ SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83
 SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
 SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a
 SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713
-SHA1 (patch-ay) = 6c5b1e469d6dfd853f68a3151ee46e7c56d8247c
+SHA1 (patch-ay) = a93f5098f54e16706efe55878c98cc3687d24d64
 SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6
-SHA1 (patch-bb) = 19e3d323efab335a50f0410d1197ecbee5b7798b
+SHA1 (patch-bb) = c07dfb4783694f827e0268bd780af135a800f980
 SHA1 (patch-bv) = 2ba938aef7a5c9eb417e443577b841bae0e0550a
 SHA1 (patch-ck) = d085b0ced66544963441fff5231e06fd9ac03878
 SHA1 (patch-cl) = ad26eee7b315ec512453c73cdc29253e0fa6266f
diff --git a/sysutils/xentools3-hvm/patches/patch-an b/sysutils/xentools3-hvm/patches/patch-an
index 14e97f5919b..a9bda237f2b 100644
--- a/sysutils/xentools3-hvm/patches/patch-an
+++ b/sysutils/xentools3-hvm/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
+$NetBSD: patch-an,v 1.2 2008/08/07 16:00:14 joerg Exp $
 
 --- firmware/Makefile.orig	2007-05-18 16:45:21.000000000 +0200
 +++ firmware/Makefile	2007-06-12 22:21:53.000000000 +0200
@@ -17,8 +17,8 @@ $NetBSD: patch-an,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  install: all
 -	[ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR)
 -	[ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR)
-+	$(BSD_INSTALL_DATA_DIR) $(INST_DIR)
-+	$(BSD_INSTALL_DATA) $(TARGET) $(INST_DIR)
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INST_DIR)
++	$(BSD_INSTALL_DATA) $(TARGET) ${DESTDIR}$(INST_DIR)
  
  .PHONY: clean
  clean: 
diff --git a/sysutils/xentools3-hvm/patches/patch-ay b/sysutils/xentools3-hvm/patches/patch-ay
index 32471e1af4d..2556174b3b7 100644
--- a/sysutils/xentools3-hvm/patches/patch-ay
+++ b/sysutils/xentools3-hvm/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
+$NetBSD: patch-ay,v 1.2 2008/08/07 16:00:14 joerg Exp $
 
 --- ioemu/Makefile.orig	2007-05-18 16:45:21.000000000 +0200
 +++ ioemu/Makefile	2007-06-12 22:28:21.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ay,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  
  install: all $(if $(BUILD_DOCS),install-doc)
 -	mkdir -p "$(DESTDIR)$(bindir)"
-+	$(BSD_INSTALL_PROGRAM_DIR) "$(bindir)"
++	$(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(bindir)
  #	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
  #	mkdir -p "$(DESTDIR)$(datadir)"
  #	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
@@ -16,7 +16,7 @@ $NetBSD: patch-ay,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  #	done
  ifndef CONFIG_WIN32
 -	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
-+	$(BSD_INSTALL_DATA_DIR) "$(datadir)/keymaps"
++	$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(datadir)/keymaps
  	for x in $(KEYMAPS); do \
 -		$(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
 +		$(BSD_INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
diff --git a/sysutils/xentools3-hvm/patches/patch-bb b/sysutils/xentools3-hvm/patches/patch-bb
index e58a3131709..b9f1553ed47 100644
--- a/sysutils/xentools3-hvm/patches/patch-bb
+++ b/sysutils/xentools3-hvm/patches/patch-bb
@@ -1,4 +1,4 @@
-$NetBSD: patch-bb,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
+$NetBSD: patch-bb,v 1.2 2008/08/07 16:00:14 joerg Exp $
 
 --- ioemu/Makefile.target.orig	2007-01-08 16:00:48.000000000 +0100
 +++ ioemu/Makefile.target	2007-04-26 21:38:21.000000000 +0200
@@ -12,8 +12,8 @@ $NetBSD: patch-bb,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
 -endif
 -	$(INSTALL_PROG) $(TARGET_PATH)/qemu-dm.debug "$(DESTDIR)$(bindir)"
 -	$(INSTALL_PROG) $(TARGET_PATH)/qemu-ifup "$(DESTDIR)$(configdir)"
-+	$(BSD_INSTALL_PROGRAM_DIR) "$(bindir)"
-+	$(BSD_INSTALL_PROGRAM) $(PROGS) "$(DESTDIR)$(bindir)"
++	$(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(bindir)
++	$(BSD_INSTALL_PROGRAM) $(PROGS) ${DESTDIR}$(bindir)
  
  ifneq ($(wildcard .depend),)
  include .depend