LICENSE + user-destdir.

7 files changed, 40 insertions, 35 deletions

diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 85bfc70f289..3f2728e0b4c 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2010/02/10 19:17:45 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2010/05/04 18:55:46 jym Exp $
 #
 
 DISTNAME=		xen-2.0.7-src
@@ -12,10 +12,14 @@ MAINTAINER=		bouyer@NetBSD.org
 HOMEPAGE=		http://www.cl.cam.ac.uk/research/srg/netos/xen/
 COMMENT=		Userland Tools for Xen
 
+LICENSE=		gnu-gpl-v2
+
 DEPENDS+=		${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 
 PKG_SYSCONFSUBDIR=	xen
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 ONLY_FOR_PLATFORM=	Linux-2.[46]*-i386 NetBSD-*-i386
 
 CONFLICTS+=		libxen-[0-9]*
@@ -28,6 +32,7 @@ MESSAGE_SUBST=		EGDIR=${EGDIR}
 USE_TOOLS+=		gmake
 MAKE_ENV+=		EGDIR=${EGDIR:Q}
 MAKE_ENV+=		MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
+
 PY_PATCHPLIST=		yes
 PYTHON_PATCH_SCRIPTS=	python/xen/util/console_client.py
 PYTHON_PATCH_SCRIPTS+=	python/xen/xend/server/SrvServer.py
@@ -100,12 +105,12 @@ post-build:
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	for f in xend-config.sxp xmexample1 xmexample2 xmexample3; do	\
-		${INSTALL_DATA} ${WRKSRC}/examples/$$f ${EGDIR}/$$f;	\
+		${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f;	\
 	done
 .for s in ${XEND_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${EGDIR}/${s}
+	${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${DESTDIR}${EGDIR}/${s}
 .endfor
 
 .include "../../lang/python/application.mk"
diff --git a/sysutils/xentools20/distinfo b/sysutils/xentools20/distinfo
index 8b197d2bfd5..74aa19617bd 100644
--- a/sysutils/xentools20/distinfo
+++ b/sysutils/xentools20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/11/22 00:12:34 seb Exp $
+$NetBSD: distinfo,v 1.15 2010/05/04 18:55:46 jym Exp $
 
 SHA1 (xen-2.0.7-src.tgz) = 5317100e1e062961e3fee398fccbf023eb8f0337
 RMD160 (xen-2.0.7-src.tgz) = db99fb49e592df7229d4d361c48bab1d23a1d725
@@ -9,12 +9,12 @@ SHA1 (patch-ac) = 282cfea5db2cdf418f43f3ea04168717fa0158d1
 SHA1 (patch-ad) = 6f242d6ad89b4c019cd291313ba8eaa28ae3bfbb
 SHA1 (patch-ae) = 673dac9ea547b77804f591139ffc409340b7b31a
 SHA1 (patch-af) = 5467e64fbd49d6ca35718d42864ed7b44fe76df3
-SHA1 (patch-ag) = 6a19a5cf75894e0d5ba91e4d4214b6bd59de60df
-SHA1 (patch-ah) = 610be8e20e2ef27ce838519144b7b0678b7d6830
+SHA1 (patch-ag) = 47882dc75a56daa5676e9786810f7edec8281e59
+SHA1 (patch-ah) = ee33733289eb6337a2da166201392e3e17e53312
 SHA1 (patch-ai) = 868588b3deff152b33489e3e5a24789b3311e1bd
-SHA1 (patch-aj) = 8712a2641e9aad2468d46d0f554cefca2259b230
-SHA1 (patch-ak) = 2d38643ac8308cbd79876c150a42d463b1c2bfbd
-SHA1 (patch-al) = 6394c54681af520fa21a6839cf32b84a51a146d5
+SHA1 (patch-aj) = 91e5242851bedc2769e3729392d089499c0621a4
+SHA1 (patch-ak) = ef3d96025784f6de42f0fa5dadb5ff97be47f4a5
+SHA1 (patch-al) = d0ccc57b44a08eb787552a0680ea1eed4c1e1f55
 SHA1 (patch-am) = 7392057d2da107e935775627afe2498a81903f71
 SHA1 (patch-an) = 40e0798b8608a280e45f43b11f449c341b1f5a7b
 SHA1 (patch-ap) = 1fb379e7b2ddb7f577d19bbc83cda35e5d265f99
diff --git a/sysutils/xentools20/patches/patch-ag b/sysutils/xentools20/patches/patch-ag
index 9180b7c5de3..49a55b21e98 100644
--- a/sysutils/xentools20/patches/patch-ag
+++ b/sysutils/xentools20/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
+$NetBSD: patch-ag,v 1.3 2010/05/04 18:55:46 jym Exp $
 
 --- misc/Makefile.orig	2005-05-24 00:28:15.000000000 +0000
 +++ misc/Makefile	2005-05-24 00:30:05.000000000 +0000
@@ -10,10 +10,10 @@ $NetBSD: patch-ag,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 -	[ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin
 -	$(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
 -	$(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
-+	$(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
-+	$(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin
-+	$(BSD_INSTALL_SCRIPT) $(INSTALL_BIN) $(PREFIX)/bin
-+	$(BSD_INSTALL_SCRIPT) $(INSTALL_SBIN) $(PREFIX)/sbin
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/sbin
++	$(BSD_INSTALL_SCRIPT) $(INSTALL_BIN) $(DESTDIR)$(PREFIX)/bin
++	$(BSD_INSTALL_SCRIPT) $(INSTALL_SBIN) $(DESTDIR)$(PREFIX)/sbin
  #       No sense in installing miniterm on the Xen box.
  #	$(MAKE) -C miniterm install
  
diff --git a/sysutils/xentools20/patches/patch-ah b/sysutils/xentools20/patches/patch-ah
index a6c05d7477c..1a66513999c 100644
--- a/sysutils/xentools20/patches/patch-ah
+++ b/sysutils/xentools20/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
+$NetBSD: patch-ah,v 1.3 2010/05/04 18:55:46 jym Exp $
 
 --- libxc/Makefile.orig	2005-05-24 00:31:07.000000000 +0000
 +++ libxc/Makefile	2005-05-24 00:34:06.000000000 +0000
@@ -13,13 +13,13 @@ $NetBSD: patch-ah,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 -	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxc.so.$(MAJOR)
 -	ln -sf libxc.so.$(MAJOR) $(DESTDIR)/usr/lib/libxc.so
 -	$(INSTALL_DATA) xc.h $(DESTDIR)/usr/include
-+	$(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib
-+	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/include
-+	$(BSD_INSTALL_LIB) libxc.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
-+	$(BSD_INSTALL_LIB) libxc.a $(PREFIX)/lib
-+	ln -sf libxc.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxc.so.$(MAJOR)
-+	ln -sf libxc.so.$(MAJOR) $(PREFIX)/lib/libxc.so
-+	$(BSD_INSTALL_DATA) xc.h $(PREFIX)/include
++	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(PREFIX)/lib
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/include
++	$(BSD_INSTALL_LIB) libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)/lib
++	$(BSD_INSTALL_LIB) libxc.a $(DESTDIR)$(PREFIX)/lib
++	ln -sf libxc.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)/lib/libxc.so.$(MAJOR)
++	ln -sf libxc.so.$(MAJOR) $(DESTDIR)$(PREFIX)/lib/libxc.so
++	$(BSD_INSTALL_DATA) xc.h $(DESTDIR)$(PREFIX)/include
  
  clean:
  	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
diff --git a/sysutils/xentools20/patches/patch-aj b/sysutils/xentools20/patches/patch-aj
index ac077190adf..18d92a2fa26 100644
--- a/sysutils/xentools20/patches/patch-aj
+++ b/sysutils/xentools20/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
+$NetBSD: patch-aj,v 1.3 2010/05/04 18:55:46 jym Exp $
 
 --- libxutil/Makefile.orig	2005-05-24 00:36:28.000000000 +0000
 +++ libxutil/Makefile	2005-05-24 00:38:14.000000000 +0000
@@ -11,11 +11,11 @@ $NetBSD: patch-aj,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
 -	$(INSTALL_DATA) libxutil.a $(DESTDIR)/usr/lib
 -	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/lib/libxutil.so.$(MAJOR)
 -	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)/usr/lib/libxutil.so
-+	$(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib
-+	$(BSD_INSTALL_LIB) libxutil.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
-+	$(BSD_INSTALL_LIB) libxutil.a $(PREFIX)/lib
-+	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxutil.so.$(MAJOR)
-+	ln -sf libxutil.so.$(MAJOR) $(PREFIX)/lib/libxutil.so
++	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(PREFIX)/lib
++	$(BSD_INSTALL_LIB) libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)/lib
++	$(BSD_INSTALL_LIB) libxutil.a $(DESTDIR)$(PREFIX)/lib
++	ln -sf libxutil.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)/lib/libxutil.so.$(MAJOR)
++	ln -sf libxutil.so.$(MAJOR) $(DESTDIR)$(PREFIX)/lib/libxutil.so
  
  clean:
  	$(RM) *.a *.so* *.o *.opic *.rpm 
diff --git a/sysutils/xentools20/patches/patch-ak b/sysutils/xentools20/patches/patch-ak
index e2f3d85fbb6..57d914a99b8 100644
--- a/sysutils/xentools20/patches/patch-ak
+++ b/sysutils/xentools20/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
+$NetBSD: patch-ak,v 1.3 2010/05/04 18:55:46 jym Exp $
 
 --- misc/miniterm/Makefile.orig	2005-05-24 00:38:57.000000000 +0000
 +++ misc/miniterm/Makefile	2005-05-24 00:39:42.000000000 +0000
@@ -8,8 +8,8 @@ $NetBSD: patch-ak,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
  install: all
 -	[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
 -	$(INSTALL_PROG) $(TARGET) $(DESTDIR)/usr/bin
-+	$(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/bin
++	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(PREFIX)/bin
  
  clean:
  	$(RM) *.o $(TARGET) *~
diff --git a/sysutils/xentools20/patches/patch-al b/sysutils/xentools20/patches/patch-al
index 163b6dceee7..af561df8e32 100644
--- a/sysutils/xentools20/patches/patch-al
+++ b/sysutils/xentools20/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
+$NetBSD: patch-al,v 1.3 2010/05/04 18:55:46 jym Exp $
 
 --- python/Makefile.orig	2005-05-22 10:56:26.000000000 +0000
 +++ python/Makefile	2005-05-24 01:26:40.000000000 +0000
@@ -12,11 +12,11 @@ $NetBSD: patch-al,v 1.2 2005/05/24 16:02:08 xtraeme Exp $
  ifndef XEN_PYTHON_NATIVE_INSTALL
  install: all
 -	CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr"
-+	python setup.py install
++	python setup.py install --root="$(DESTDIR)"
  else
  install: all
 -	CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
-+	python setup.py install
++	python setup.py install --root="$(DESTDIR)"
  endif
  
  clean: