diff options
author | joerg <joerg> | 2008-09-30 15:08:34 +0000 |
---|---|---|
committer | joerg <joerg> | 2008-09-30 15:08:34 +0000 |
commit | 5abe18029cfc319f58c0c0f02525596556749ab4 (patch) | |
tree | 42c81051938ad8795f8b31f31a9ba75481e84523 /sysutils/xentools33 | |
parent | fdb32a1fb4f51a7032cd68ca71d3dab086244ecb (diff) | |
download | pkgsrc-5abe18029cfc319f58c0c0f02525596556749ab4.tar.gz |
Don't install qemu documentation. Install formats to share/examples/xen
as well and use config file framework. Sort PLIST.
Diffstat (limited to 'sysutils/xentools33')
-rw-r--r-- | sysutils/xentools33/Makefile | 7 | ||||
-rw-r--r-- | sysutils/xentools33/PLIST | 7 | ||||
-rw-r--r-- | sysutils/xentools33/distinfo | 6 | ||||
-rw-r--r-- | sysutils/xentools33/patches/patch-ag | 4 | ||||
-rw-r--r-- | sysutils/xentools33/patches/patch-fd | 12 |
5 files changed, 19 insertions, 17 deletions
diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index 31507a4cf54..bdba4bb59e2 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2008/08/22 17:04:11 cegger Exp $ +# $NetBSD: Makefile,v 1.9 2008/09/30 15:08:34 joerg Exp $ # VERSION= 3.3.0 DISTNAME= xen-${VERSION} PKGNAME= xentools33-${VERSION} +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ EXTRACT_SUFX= .tar.gz @@ -134,7 +135,9 @@ BLKTAP_FILES= blk_netbsd.c blktapctrl_netbsd.c XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup -CONF_FILES= ${EGDIR}/xend-config.sxp \ +CONF_FILES= ${EGDIR}/formats ${PKG_SYSCONFDIR}/formats + +CONF_FILES+= ${EGDIR}/xend-config.sxp \ ${PKG_SYSCONFDIR}/xend-config.sxp .for s in ${XEND_SCRIPTS} CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \ diff --git a/sysutils/xentools33/PLIST b/sysutils/xentools33/PLIST index 64dc78fbf4e..247406f7e0d 100644 --- a/sysutils/xentools33/PLIST +++ b/sysutils/xentools33/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2008/09/03 09:36:16 cegger Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/09/30 15:08:34 joerg Exp $ bin/lsevtchn bin/pygrub bin/readnotes @@ -21,7 +21,6 @@ bin/xenstore-write bin/xentrace bin/xentrace_format bin/xentrace_setsize -etc/xen/formats include/blktaplib.h include/flask.h include/fsimage.h @@ -502,12 +501,13 @@ sbin/xentop sbin/xentrace_setmask sbin/xm sbin/xsview -share/doc/xen/README.xenmon share/doc/xen/README.blktap +share/doc/xen/README.xenmon share/examples/rc.d/xenbackendd share/examples/rc.d/xend share/examples/rc.d/xendomains share/examples/xen/block +share/examples/xen/formats share/examples/xen/hvm share/examples/xen/${LOWER_OPSYS}1 share/examples/xen/qemu-ifup @@ -596,4 +596,3 @@ share/xen/qemu/keymaps/tr @dirrm include/xen/arch-ia64/hvm @dirrm include/xen/arch-ia64 @dirrm include/xen -@dirrm etc/xen diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo index 2adcacdefb4..221c285699a 100644 --- a/sysutils/xentools33/distinfo +++ b/sysutils/xentools33/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2008/09/03 09:38:07 cegger Exp $ +$NetBSD: distinfo,v 1.12 2008/09/30 15:08:34 joerg Exp $ SHA1 (xen-3.3.0.tar.gz) = b6365864eeb5125e0f66a056c4c72816e1789358 RMD160 (xen-3.3.0.tar.gz) = c98c08617e302ef4004d17cb0ba161d0ed7af59c @@ -9,7 +9,7 @@ SHA1 (patch-ac) = 70af1b1a787b9dad9e41a2ffe14d595c6797b4d7 SHA1 (patch-ad) = 323e854e5872e770580068fa93a74bd0b1531025 SHA1 (patch-ae) = bb7116a71bf6637591b639511f055836a13d9887 SHA1 (patch-af) = 5995f0f8ee9cf40c8ac43d02568d942430993b3e -SHA1 (patch-ag) = ea577052200524182389effd2232cf2d0578670c +SHA1 (patch-ag) = 6b6c26c5fbb28b9cc37e76b250cc90fed111e78a SHA1 (patch-ah) = cc8d95c73d7f4a08f311e8417d26f53ffd010549 SHA1 (patch-ai) = 0906a5ec3a7450fc987b01289e2560e60966d00d SHA1 (patch-aj) = 64c87cd4d1d22af745043bc66b4fbab884920278 @@ -47,5 +47,5 @@ SHA1 (patch-eg) = 84e816c95167828314ef901e324772249a407c41 SHA1 (patch-fa) = b4a4b7334357ebcd1646886c18c9772e8b9ae765 SHA1 (patch-fb) = 22a07628566b43aa786c410927d29a283e8cf141 SHA1 (patch-fc) = 37c9b0897182de93a01f9620ef6346ef68157770 -SHA1 (patch-fd) = 3592c62ab0f0e5375fc433ef426bc56b1603a8f4 +SHA1 (patch-fd) = cb4741bf33050d72cfbcd2eff4a8632d976de643 SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3 diff --git a/sysutils/xentools33/patches/patch-ag b/sysutils/xentools33/patches/patch-ag index 5ea05252916..bc7924a6b7f 100644 --- a/sysutils/xentools33/patches/patch-ag +++ b/sysutils/xentools33/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.3 2008/09/03 09:38:07 cegger Exp $ +$NetBSD: patch-ag,v 1.4 2008/09/30 15:08:34 joerg Exp $ --- xentrace/Makefile.orig 2008-08-22 09:49:09.000000000 +0000 +++ xentrace/Makefile @@ -31,7 +31,7 @@ $NetBSD: patch-ag,v 1.3 2008/09/03 09:38:07 cegger Exp $ + $(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) ++ $(BSD_INSTALL_DATA) formats $(DESTDIR)$(PREFIX)/share/examples/xen .PHONY: clean clean: diff --git a/sysutils/xentools33/patches/patch-fd b/sysutils/xentools33/patches/patch-fd index 95e0f8db444..5b72a02ae96 100644 --- a/sysutils/xentools33/patches/patch-fd +++ b/sysutils/xentools33/patches/patch-fd @@ -1,6 +1,6 @@ -$NetBSD: patch-fd,v 1.1.1.1 2008/08/07 20:26:59 cegger Exp $ +$NetBSD: patch-fd,v 1.2 2008/09/30 15:08:34 joerg Exp $ ---- ioemu/Makefile.orig 2008-08-01 14:38:07.000000000 +0000 +--- ioemu/Makefile.orig 2008-08-22 11:49:08.000000000 +0200 +++ ioemu/Makefile @@ -44,10 +44,11 @@ subdir-%: @@ -24,13 +24,13 @@ $NetBSD: patch-fd,v 1.1.1.1 2008/08/07 20:26:59 cegger Exp $ install-doc: $(DOCS) - mkdir -p "$(DESTDIR)$(docdir)" - $(INSTALL_DATA) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" -+ $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(docdir)" -+ $(BSD_INSTALL_DATA) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" ++ #$(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(docdir)" ++ #$(BSD_INSTALL_DATA) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" ifndef CONFIG_WIN32 - mkdir -p "$(DESTDIR)$(mandir)/man1" - $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" -+ $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(mandir)/man1" -+ $(BSD_INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" ++ #$(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(mandir)/man1" ++ #$(BSD_INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" endif install: all $(if $(BUILD_DOCS),install-doc) |