Install hotplug scripts (actually called by xenbackendd on NetBSD)

in share/examples/xen/scripts, and copy them to etc/xen/scripts/.
Bump pkgrevision

6 files changed, 53 insertions, 14 deletions

diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile
index 87afc43b638..dd2af54e2d9 100644
--- a/sysutils/xentools41/Makefile
+++ b/sysutils/xentools41/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2011/04/06 10:03:01 cegger Exp $
+# $NetBSD: Makefile,v 1.3 2011/04/15 10:32:22 bouyer Exp $
 #
 
 VERSION=		4.1.0
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools41-${VERSION}
-#PKGREVISION=		1
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 EXTRACT_SUFX=		.tar.gz
@@ -97,6 +97,8 @@ SUBST_SED.conf=		-e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
 
 .include "../../mk/bsd.prefs.mk"
 
+XEND_SCRIPTS=		block vif-bridge vif-ip qemu-ifup
+
 .if ${OPSYS} == "NetBSD"
 SUBST_CLASSES+=		proc
 SUBST_STAGE.proc=	pre-configure
@@ -122,6 +124,11 @@ CONF_FILES=		${EGDIR}/xend-config.sxp \
 
 OWN_DIRS=		${PKG_SYSCONFDIR}/scripts ${VARBASE}/log/xen ${VARBASE}/lib
 
+.for s in ${XEND_SCRIPTS}
+CONF_FILES_PERMS+=	${EGDIR}/scripts/${s} ${PKG_SYSCONFDIR}/scripts/${s} \
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
+.endfor 
+
 pre-build:
 	rm -f ${WRKSRC}/check/check_x11_devel
 .for s in ${BLKTAP_FILES}
diff --git a/sysutils/xentools41/PLIST b/sysutils/xentools41/PLIST
index 187fa056669..4632e841fae 100644
--- a/sysutils/xentools41/PLIST
+++ b/sysutils/xentools41/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/06 09:10:26 cegger Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/04/15 10:32:22 bouyer Exp $
 bin/lsevtchn
 bin/pygrub
 bin/qemu-img-xen
@@ -687,6 +687,10 @@ share/examples/xen/xend-config.sxp
 share/examples/xen/xmexample1
 share/examples/xen/xmexample2
 share/examples/xen/xmexample3
+share/examples/xen/scripts/block
+share/examples/xen/scripts/vif-bridge
+share/examples/xen/scripts/vif-ip
+share/examples/xen/scripts/qemu-ifup
 share/xen/create.dtd
 share/xen/qemu/bios.bin
 share/xen/qemu/vgabios.bin
diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo
index 5c4553d395f..c29b63efda4 100644
--- a/sysutils/xentools41/distinfo
+++ b/sysutils/xentools41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/04/06 09:10:26 cegger Exp $
+$NetBSD: distinfo,v 1.2 2011/04/15 10:32:22 bouyer Exp $
 
 SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485
 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547
@@ -12,11 +12,12 @@ SHA1 (patch-ac) = c3cc5335a1d6b066307c5f03fe72f513a9eb2bdb
 SHA1 (patch-ad) = 5eb15470bff85d30b6d26d8fe094f59fc8e34175
 SHA1 (patch-ae) = 032f9bd48bbe7423d24ec8464ef6b626d7f1369a
 SHA1 (patch-af) = e866e7d96766b735a53432350275810803eeb510
-SHA1 (patch-ag) = f1f58566b41922d661bbe6ea7e4c90d17cecd7fe
-SHA1 (patch-ah) = 1227ce79a9547464059f7de7a18bd342c4741280
+SHA1 (patch-ag) = 90893326dcce4e3e2ef273f22ec5ddf5af0f7cd8
+SHA1 (patch-ah) = ab91c41ef6bbdd7f7f3d992b9f81e43056a765e2
 SHA1 (patch-ai) = 8da6bba38bd7677ea829ca35058f7d2d1d7acad4
 SHA1 (patch-aj) = d0999d8dcbc1eef4de7037db0e54dcd8d2f706eb
-SHA1 (patch-ak) = dee9673fd67f582da64e8f2c14b566032f162f6f
+SHA1 (patch-ak) = 722a6b0541b036d84c703037134e25bc47f3eb65
+SHA1 (patch-al) = d9a310c16db708dd86170a13946f87e4cd21eb7a
 SHA1 (patch-ba) = 2c65e4b4b85e91e92dfb3aa402ebc44694bdff06
 SHA1 (patch-bb) = 64a61fb156bcb6a99ff0963063a0716b808e3b61
 SHA1 (patch-bc) = 25c99a428fda6dee709888ddbcfdcfef5f654564
diff --git a/sysutils/xentools41/patches/patch-ag b/sysutils/xentools41/patches/patch-ag
index fabbf1cde4d..731699e3b93 100644
--- a/sysutils/xentools41/patches/patch-ag
+++ b/sysutils/xentools41/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $
+$NetBSD: patch-ag,v 1.2 2011/04/15 10:32:22 bouyer Exp $
 
 --- ../config/NetBSD.mk.orig	2011-03-25 11:42:47.000000000 +0100
-+++ ../config/NetBSD.mk	2011-03-31 17:21:05.000000000 +0200
-@@ -7,12 +7,12 @@
++++ ../config/NetBSD.mk	2011-04-15 11:36:19.000000000 +0200
+@@ -7,12 +7,13 @@
  LIBEXEC = $(PREFIX)/libexec
  PRIVATE_BINDIR = $(BINDIR)
  
@@ -18,5 +18,6 @@ $NetBSD: patch-ag,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $
 -XEN_LOCK_DIR = $(PREFIX)/var/lib
 -endif
 +XEN_LOCK_DIR = $(VARBASE)/run
++XEN_EXAMPLES_DIR=$(PREFIX)/share/examples/xen
  
  WGET = ftp
diff --git a/sysutils/xentools41/patches/patch-ah b/sysutils/xentools41/patches/patch-ah
index 7f6db20c2d3..84b0d927fe0 100644
--- a/sysutils/xentools41/patches/patch-ah
+++ b/sysutils/xentools41/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $
+$NetBSD: patch-ah,v 1.2 2011/04/15 10:32:22 bouyer Exp $
 
---- hotplug/NetBSD/Makefile.orig	2011-03-31 16:18:33.000000000 +0200
-+++ hotplug/NetBSD/Makefile	2011-03-31 16:22:07.000000000 +0200
+--- hotplug/NetBSD/Makefile.orig	2011-03-25 11:42:50.000000000 +0100
++++ hotplug/NetBSD/Makefile	2011-04-15 11:38:32.000000000 +0200
 @@ -8,7 +8,7 @@
  XEN_SCRIPTS += vif-ip
  
@@ -11,7 +11,21 @@ $NetBSD: patch-ah,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $
  
  .PHONY: all
  all:
-@@ -33,12 +33,6 @@
+@@ -21,10 +21,11 @@
+ 
+ .PHONY: install-scripts
+ install-scripts:
+-	$(INSTALL_DIR) $(DESTDIR)$(XEN_SCRIPT_DIR)
++	$(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)
++	$(INSTALL_DIR) $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts
+ 	set -e; for i in $(XEN_SCRIPTS); \
+ 	   do \
+-	   $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \
++	   $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_EXAMPLES_DIR)/scripts; \
+ 	done
+ 	set -e; for i in $(XEN_SCRIPT_DATA); \
+ 	   do \
+@@ -33,12 +34,6 @@
  
  .PHONY: install-rcd
  install-rcd:
diff --git a/sysutils/xentools41/patches/patch-al b/sysutils/xentools41/patches/patch-al
new file mode 100644
index 00000000000..88936f1e595
--- /dev/null
+++ b/sysutils/xentools41/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2011/04/15 10:32:22 bouyer Exp $
+
+--- ioemu-qemu-xen/i386-dm/hookstarget.mak.orig	2011-04-15 11:45:21.000000000 +0200
++++ ioemu-qemu-xen/i386-dm/hookstarget.mak	2011-04-15 11:46:36.000000000 +0200
+@@ -2,5 +2,5 @@
+ 
+ install-hook:
+ 	$(INSTALL_DIR) "$(DESTDIR)/$(bindir)"
+-	$(INSTALL_DIR) "$(DESTDIR)/$(configdir)"
+-	$(INSTALL_PROG) $(QEMU_ROOT)/i386-dm/qemu-ifup-$(IOEMU_OS) "$(DESTDIR)/$(configdir)/qemu-ifup"
++	$(INSTALL_DIR) "$(DESTDIR)/$(XEN_EXAMPLES_DIR)/scripts"
++	$(INSTALL_PROG) $(QEMU_ROOT)/i386-dm/qemu-ifup-$(IOEMU_OS) "$(DESTDIR)/$(XEN_EXAMPLES_DIR)/scripts/qemu-ifup"