Install tools/xentrace/formats. It is needed for xentrace_format and makes xentrace and xentrace_format useable.

While here, give xentrace_format execution bits since this is a python script

4 files changed, 19 insertions, 8 deletions

diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile
index 05835308d8d..c33a8f13646 100644
--- a/sysutils/xentools33/Makefile
+++ b/sysutils/xentools33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/08/15 14:06:54 cegger Exp $
+# $NetBSD: Makefile,v 1.4 2008/08/15 20:12:52 cegger Exp $
 #
 
 VERSION=		3.3-18331
@@ -101,6 +101,7 @@ SUBST_FILES.conf+=	python/xen/xm/create.py
 SUBST_FILES.conf+=	python/xen/xm/addlabel.py
 SUBST_FILES.conf+=	python/xen/xm/getlabel.py
 SUBST_FILES.conf+=	python/xen/xm/rmlabel.py
+SUBST_FILES.conf+=	xentrace/Makefile
 SUBST_FILES.conf+=	ioemu/configure
 SUBST_FILES.conf+=	ioemu/vl.c
 SUBST_SED.conf=		-e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
diff --git a/sysutils/xentools33/PLIST b/sysutils/xentools33/PLIST
index 686cc72814b..698b901993d 100644
--- a/sysutils/xentools33/PLIST
+++ b/sysutils/xentools33/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/08/15 14:06:54 cegger Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/08/15 20:12:52 cegger Exp $
 bin/lsevtchn
 bin/pygrub
 bin/readnotes
@@ -21,6 +21,7 @@ bin/xenstore-write
 bin/xentrace
 bin/xentrace_format
 bin/xentrace_setsize
+etc/xen/formats
 include/blktaplib.h
 include/flask.h
 include/fsimage.h
diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo
index e1ed942413c..7de4955a065 100644
--- a/sysutils/xentools33/distinfo
+++ b/sysutils/xentools33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2008/08/15 14:06:54 cegger Exp $
+$NetBSD: distinfo,v 1.6 2008/08/15 20:12:52 cegger Exp $
 
 SHA1 (xen-3.3-18331.tar.gz) = ba2e960f08fbf0ad2b91cc8330d3487c5967cfef
 RMD160 (xen-3.3-18331.tar.gz) = 8a520701fd96cabfb9e66a77813c4dc8e5c633ec
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 8ad21b1a1213e7ffbb5ff407bb4ffdd86bf29c2e
 SHA1 (patch-ad) = 323e854e5872e770580068fa93a74bd0b1531025
 SHA1 (patch-ae) = bb7116a71bf6637591b639511f055836a13d9887
 SHA1 (patch-af) = 5995f0f8ee9cf40c8ac43d02568d942430993b3e
-SHA1 (patch-ag) = 9f1041f09ac8da77292c23ebcf2f86549fcbc7e8
+SHA1 (patch-ag) = 82a8dacd52501b0da48622b6c2b23faec3e900bc
 SHA1 (patch-ah) = cc8d95c73d7f4a08f311e8417d26f53ffd010549
 SHA1 (patch-ai) = 0906a5ec3a7450fc987b01289e2560e60966d00d
 SHA1 (patch-aj) = 64c87cd4d1d22af745043bc66b4fbab884920278
diff --git a/sysutils/xentools33/patches/patch-ag b/sysutils/xentools33/patches/patch-ag
index 3b8cd0f5977..1dc2009254a 100644
--- a/sysutils/xentools33/patches/patch-ag
+++ b/sysutils/xentools33/patches/patch-ag
@@ -1,8 +1,16 @@
-$NetBSD: patch-ag,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
+$NetBSD: patch-ag,v 1.2 2008/08/15 20:12:52 cegger Exp $
 
---- xentrace/Makefile.orig	2008-08-01 16:38:07.000000000 +0200
+--- xentrace/Makefile.orig	2008-08-14 15:26:06.000000000 +0000
 +++ xentrace/Makefile
-@@ -35,14 +35,15 @@ build: $(BIN) $(LIBBIN)
+@@ -14,6 +14,7 @@ LIBBIN   = 
+ SCRIPTS  = xentrace_format
+ MAN1     = $(wildcard *.1)
+ MAN8     = $(wildcard *.8)
++CONFIGDIR = /usr/pkg/etc/xen
+ 
+ ifeq ($(XEN_TARGET_ARCH),x86_32)
+ LIBBIN  += xenctx
+@@ -35,14 +36,16 @@ build: $(BIN) $(LIBBIN)
  
  .PHONY: install
  install: build
@@ -19,10 +27,11 @@ $NetBSD: patch-ag,v 1.1.1.1 2008/08/07 20:26:58 cegger Exp $
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(MAN1DIR)
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(MAN8DIR)
 +	$(BSD_INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)
-+	$(BSD_INSTALL_DATA) $(SCRIPTS) $(DESTDIR)$(BINDIR)
++	$(BSD_INSTALL_LIB) $(SCRIPTS) $(DESTDIR)$(BINDIR)
 +	$(BSD_INSTALL_PROGRAM) $(LIBBIN) $(DESTDIR)$(PRIVATE_BINDIR)
 +	$(BSD_INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR)
 +	$(BSD_INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR)
++	$(BSD_INSTALL_DATA) formats $(DESTDIR)$(CONFIGDIR)
  
  .PHONY: clean
  clean: