kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

DESTDIR support for xentools3{,-hvm}.

Browse source
This commit is contained in:
joerg 2008-08-07 16:00:14 +00:00
parent 29932c6bd1
commit 10db7c225d
17 changed files with 114 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sysutils/xentools3-hvm/Makefile
View file

@ -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"

8
sysutils/xentools3-hvm/distinfo
View file

@ -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

6
sysutils/xentools3-hvm/patches/patch-an
View file

@ -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:

6
sysutils/xentools3-hvm/patches/patch-ay
View file

@ -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"; \

6
sysutils/xentools3-hvm/patches/patch-bb
View file

@ -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

24
sysutils/xentools3/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.13 2008/04/27 19:59:40 bouyer Exp $
# $NetBSD: Makefile,v 1.14 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= Userland Tools for Xen
PKG_DESTDIR_SUPPORT= user-destdir
#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
@ -129,7 +131,7 @@ 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} \
${ROOT_USER} ${ROOT_GROUP} 0755
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
.endfor
OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen
@ -172,20 +174,20 @@ post-build:
.endif
INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR}
post-install:
${INSTALL_PROGRAM} ${WRKDIR}/xenbackendd.bin ${PREFIX}/sbin/xenbackendd
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_PROGRAM} ${WRKDIR}/xenbackendd.bin ${DESTDIR}${PREFIX}/sbin/xenbackendd
for f in xend-config.sxp xmexample1 xmexample2 xmexample3 netbsd1; 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
${RM} -rf ${PREFIX}/lib/xen
${INSTALL_DATA_DIR} ${PREFIX}/man/man1 ${PREFIX}/man/man5
${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${PREFIX}/man/man5
${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${PREFIX}/man/man5
${INSTALL_DATA} ${WRKDIR}/xm.1 ${PREFIX}/man/man1
${RM} -rf ${DESTDIR}${PREFIX}/lib/xen
${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
${INSTALL_DATA} ${WRKDIR}/xm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"

22
sysutils/xentools3/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.9 2008/04/27 19:59:40 bouyer Exp $
$NetBSD: distinfo,v 1.10 2008/08/07 16:00:14 joerg Exp $
SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
@ -7,22 +7,22 @@ SHA1 (patch-aa) = dca8b8de73b9bdbb17f8245224575eb881cdf00d
SHA1 (patch-ab) = dcafc8b6c4cd1e4dfc6f4ec806fd8076b3104b86
SHA1 (patch-ac) = 4eb0f474d4e3a685788c1ce92c0b407dc3d7a855
SHA1 (patch-ad) = ec36d712925ddf06aac7d6393ad818a51c4363f3
SHA1 (patch-al) = da759ccbb2c4b48f42178cff47ace7ef42466814
SHA1 (patch-as) = 6f05feeb9dd63f2071d48b0d8aa8c6a0952e60c7
SHA1 (patch-al) = 87f2af4784a8c2266d40788fd572e282f100c7b0
SHA1 (patch-as) = 040208cc9bf1d7fecc120b5b140b8bc72f2f84cf
SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83
SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
SHA1 (patch-aw) = 8039fa7bd7799efc48da9550f861e2212cb3361b
SHA1 (patch-aw) = b4425e0667ae1ee7f2007cfa38210c82a24144a0
SHA1 (patch-ax) = c2fd0f25ed00498039eececcfb467a236f608efa
SHA1 (patch-ba) = 464405094eb798cce37302bdbc935561248ebd4e
SHA1 (patch-ba) = d1f028b099dce2a8b0f7edae64f05f2bb0a984a8
SHA1 (patch-bb) = d6705871ab5655719cac1df2daf03845a8d50fba
SHA1 (patch-bc) = c143c3c587f254af1552667a70e2fac1f0f9665e
SHA1 (patch-be) = dc8e2a96f39cb540eece35468e2e055201c80220
SHA1 (patch-bf) = 8b4ecb5cc6c92e3b52574f725f577df062c4f147
SHA1 (patch-bg) = 3d390a3155db6a1f9c910868b7f615c2f270dc4d
SHA1 (patch-bh) = c9719a85d84268fab81da989b06c7eca341bb6f9
SHA1 (patch-bo) = 473f6615d275d7a9d65ba6abfc7b809cb5e334fb
SHA1 (patch-br) = 906ac9598808f7e9677a04bbe159d174ea6f8b9a
SHA1 (patch-bs) = e6542ccdad7b48536d2d1b0ad533da4b1a784022
SHA1 (patch-bo) = fa73382dbd674cf68cbef9ad265ecd55e6243896
SHA1 (patch-br) = d2ff0637133b75485431cce1bd7ec0695eeabb33
SHA1 (patch-bs) = 259e16912a1e0c1aed88eaada4fb786b82bc9f4c
SHA1 (patch-bt) = d1cfab2ccf14d3df0fdda4c4699258997d2eb5d2
SHA1 (patch-bw) = d4bdb0dcc48cabefb568042d3b58822f8251b1bd
SHA1 (patch-ca) = f999e8159c79ae6cd09004b8cac4ca36da93f79f
@ -47,15 +47,15 @@ SHA1 (patch-cv) = 1fea2a1cd139e2e46655622ad5f02b37e1501e0b
SHA1 (patch-cw) = 7fad0847bb87beddb9330d067132d1f7fc784222
SHA1 (patch-cx) = eed56d9e4535f19a6fc2474765d85135fce15e63
SHA1 (patch-cy) = d8f7b3c7c1fcacb273fed2799b287de8f11a1399
SHA1 (patch-cz) = c40c44d85a6662231328ef3ae86367b63f066632
SHA1 (patch-da) = 97c888dce1c0ccc61d3750e2e3eefcb44f2eb4c6
SHA1 (patch-cz) = 5299209411763ceeed630c9a1fa08ecc9ac0ad0d
SHA1 (patch-da) = 8da2d7866ab17403ae6c50e3771b8e556c257ed4
SHA1 (patch-db) = 5f4262ce891d5109dab2418664eb05f58a8aa535
SHA1 (patch-dc) = 10875cd9267ea5d86b1402ca7f493c67cb57a739
SHA1 (patch-dd) = 66446a6d8293aa52da11dbd28455ae856c184d16
SHA1 (patch-de) = 7cf7fb63984833e8c6110dbbb4de82a6d5e91d32
SHA1 (patch-df) = e1d10ddb899d24d727d60ca49f5b382566d65d2c
SHA1 (patch-dg) = 298bbd22362ab880fea378935a99aef6f4613f27
SHA1 (patch-dh) = 33716556ab6e878dde1f9b5771b7ce231a3805f9
SHA1 (patch-dh) = a9dfb5d6442096c2f0ee49143a002656ce790592
SHA1 (patch-di) = 9d6a5acde713e0b7471adbea2d55e55b3ac77881
SHA1 (patch-dj) = 354ee3ceb1b5ba9b02091de916c328e5a062cb87
SHA1 (patch-dk) = 5685f52835885635eacd305945653f817bbe8a2a

10
sysutils/xentools3/patches/patch-al
View file

@ -1,4 +1,4 @@
$NetBSD: patch-al,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
$NetBSD: patch-al,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- console/Makefile.orig 2007-05-18 16:45:21.000000000 +0200
+++ console/Makefile 2007-05-27 13:45:20.000000000 +0200
@ -21,8 +21,8 @@ $NetBSD: patch-al,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
- $(INSTALL_PROG) xenconsoled $(DESTDIR)/$(DAEMON_INSTALL_DIR)
- $(INSTALL_DIR) $(DESTDIR)/$(CLIENT_INSTALL_DIR)
- $(INSTALL_PROG) xenconsole $(DESTDIR)/$(CLIENT_INSTALL_DIR)
+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM) xenconsoled $(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) xenconsole $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM) xenconsoled ${DESTDIR}$(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) xenconsole ${DESTDIR}$(PREFIX)/bin
+

26
sysutils/xentools3/patches/patch-as
View file

@ -1,4 +1,4 @@
$NetBSD: patch-as,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
$NetBSD: patch-as,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- libxc/Makefile.orig 2007-05-18 16:45:21.000000000 +0200
+++ libxc/Makefile 2007-05-27 13:46:42.000000000 +0200
@ -27,19 +27,19 @@ $NetBSD: patch-as,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
- ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so.$(MAJOR)
- ln -sf libxenguest.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libxenguest.so
- $(INSTALL_DATA) xenguest.h $(DESTDIR)/usr/include
+ $(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib
+ $(BSD_INSTALL_DATA_DIR) $(PREFIX)/include
+ $(BSD_INSTALL_LIB) libxenctrl.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
+ $(BSD_INSTALL_LIB) libxenctrl.a $(PREFIX)/lib
+ ln -sf libxenctrl.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxenctrl.so.$(MAJOR)
+ ln -sf libxenctrl.so.$(MAJOR) $(PREFIX)/lib/libxenctrl.so
+ $(BSD_INSTALL_DATA) xenctrl.h $(PREFIX)/include
+ $(BSD_INSTALL_LIB_DIR) ${DESTDIR}$(PREFIX)/lib
+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/include
+ $(BSD_INSTALL_LIB) libxenctrl.so.$(MAJOR).$(MINOR) ${DESTDIR}$(PREFIX)/lib
+ $(BSD_INSTALL_LIB) libxenctrl.a ${DESTDIR}$(PREFIX)/lib
+ ln -sf libxenctrl.so.$(MAJOR).$(MINOR) ${DESTDIR}$(PREFIX)/lib/libxenctrl.so.$(MAJOR)
+ ln -sf libxenctrl.so.$(MAJOR) ${DESTDIR}$(PREFIX)/lib/libxenctrl.so
+ $(BSD_INSTALL_DATA) xenctrl.h ${DESTDIR}$(PREFIX)/include
+
+ $(BSD_INSTALL_LIB) libxenguest.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
+ $(BSD_INSTALL_LIB) libxenguest.a $(PREFIX)/lib
+ ln -sf libxenguest.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxenguest.so.$(MAJOR)
+ ln -sf libxenguest.so.$(MAJOR) $(PREFIX)/lib/libxenguest.so
+ $(BSD_INSTALL_DATA) xenguest.h $(PREFIX)/include
+ $(BSD_INSTALL_LIB) libxenguest.so.$(MAJOR).$(MINOR) ${DESTDIR}$(PREFIX)/lib
+ $(BSD_INSTALL_LIB) libxenguest.a ${DESTDIR}$(PREFIX)/lib
+ ln -sf libxenguest.so.$(MAJOR).$(MINOR) ${DESTDIR}$(PREFIX)/lib/libxenguest.so.$(MAJOR)
+ ln -sf libxenguest.so.$(MAJOR) ${DESTDIR}$(PREFIX)/lib/libxenguest.so
+ $(BSD_INSTALL_DATA) xenguest.h ${DESTDIR}$(PREFIX)/include
.PHONY: TAGS
TAGS:

14
sysutils/xentools3/patches/patch-aw
View file

@ -1,4 +1,4 @@
$NetBSD: patch-aw,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
$NetBSD: patch-aw,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- misc/Makefile.orig 2007-05-18 16:45:21.000000000 +0200
+++ misc/Makefile 2007-05-27 13:48:51.000000000 +0200
@ -24,12 +24,12 @@ $NetBSD: patch-aw,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
- $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin
- $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin
- $(MAKE) -C lomount install
+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM) $(INSTALL_BIN) $(PREFIX)/bin
+ $(BSD_INSTALL_SCRIPT) $(INSTALL_BIN_SCRIPT) $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) $(INSTALL_SBIN) $(PREFIX)/sbin
+ $(BSD_INSTALL_SCRIPT) $(INSTALL_SBIN_SCRIPT) $(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM) $(INSTALL_BIN) ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_SCRIPT) $(INSTALL_BIN_SCRIPT) ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) $(INSTALL_SBIN) ${DESTDIR}$(PREFIX)/sbin
+ $(BSD_INSTALL_SCRIPT) $(INSTALL_SBIN_SCRIPT) ${DESTDIR}$(PREFIX)/sbin
+# $(MAKE) -C lomount install
# No sense in installing miniterm on the Xen box.
# $(MAKE) -C miniterm install

20
sysutils/xentools3/patches/patch-ba
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ba,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
$NetBSD: patch-ba,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- python/Makefile.orig 2007-05-18 16:45:21.000000000 +0200
+++ python/Makefile 2007-05-27 14:33:00.000000000 +0200
@ -16,32 +16,32 @@ $NetBSD: patch-ba,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()")
install: install-messages install-dtd
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force --install-lib="$(DESTDIR)$(LIBPATH)/python"
+ python setup.py install
+ python setup.py install --root=${DESTDIR}
else
install: install-messages install-dtd
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force
+ python setup.py install
+ python setup.py install --root=${DESTDIR}
endif
install-dtd: all
- $(INSTALL_DIR) $(DESTDIR)/usr/share/xen
- $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)/usr/share/xen
+ $(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/xen
+ $(BSD_INSTALL_DATA) xen/xm/create.dtd $(PREFIX)/share/xen
+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/share/xen
+ $(BSD_INSTALL_DATA) xen/xm/create.dtd ${DESTDIR}$(PREFIX)/share/xen
install-messages: all
if which $(MSGFMT) >/dev/null ; then \
- mkdir -p $(DESTDIR)$(NLSDIR); \
+ $(BSD_INSTALL_DATA_DIR) $(NLSDIR); \
+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(NLSDIR); \
for l in $(LINGUAS); do \
- $(INSTALL_DIR) $(DESTDIR)$(NLSDIR)/$$l; \
- $(INSTALL_DIR) $(DESTDIR)$(NLSDIR)/$$l/LC_MESSAGES; \
- $(INSTALL_DATA) $(PODIR)/$$l.mo \
- $(DESTDIR)$(NLSDIR)/$$l/LC_MESSAGES/$(POPACKAGE).mo; \
+ $(BSD_INSTALL_DATA_DIR) $(NLSDIR)/$$l; \
+ $(BSD_INSTALL_DATA_DIR) $(NLSDIR)/$$l/LC_MESSAGES; \
+ $(BSD_INSTALL_DATA) $(PODIR)/$$l.mo \
+ $(NLSDIR)/$$l/LC_MESSAGES/$(POPACKAGE).mo; \
+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(NLSDIR)/$$l; \
+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(NLSDIR)/$$l/LC_MESSAGES; \
+ $(BSD_INSTALL_DATA) ${DESTDIR}$(PODIR)/$$l.mo \
+ ${DESTDIR}$(NLSDIR)/$$l/LC_MESSAGES/$(POPACKAGE).mo; \
done ; \
fi

6
sysutils/xentools3/patches/patch-bo
View file

@ -1,4 +1,4 @@
$NetBSD: patch-bo,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
$NetBSD: patch-bo,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- xcutils/Makefile.orig 2007-05-18 16:45:21.000000000 +0200
+++ xcutils/Makefile 2007-05-27 14:37:57.000000000 +0200
@ -18,8 +18,8 @@ $NetBSD: patch-bo,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
- [ -d $(DESTDIR)$(PROGRAMS_INSTALL_DIR) ] || \
- $(INSTALL_DIR) $(DESTDIR)$(PROGRAMS_INSTALL_DIR)
- $(INSTALL_PROG) $(PROGRAMS) $(DESTDIR)$(PROGRAMS_INSTALL_DIR)
+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) $(PROGRAMS) $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) $(PROGRAMS) ${DESTDIR}$(PREFIX)/bin
.PHONY: clean

6
sysutils/xentools3/patches/patch-br
View file

@ -1,4 +1,4 @@
$NetBSD: patch-br,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
$NetBSD: patch-br,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- xenstat/xentop/Makefile.orig 2007-01-08 16:00:52.000000000 +0100
+++ xenstat/xentop/Makefile 2007-04-25 18:43:18.000000000 +0200
@ -9,8 +9,8 @@ $NetBSD: patch-br,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
- $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop
- $(INSTALL_DIR) $(DESTDIR)$(man1dir)
- $(INSTALL_DATA) xentop.1 $(DESTDIR)$(man1dir)/xentop.1
+ $(BSD_INSTALL_PROGRAM) xentop $(PREFIX)/sbin
+ $(BSD_INSTALL_DATA) xentop.1 $(PREFIX)/$(PKGMANDIR)/man1
+ $(BSD_INSTALL_PROGRAM) xentop ${DESTDIR}$(PREFIX)/sbin
+ $(BSD_INSTALL_DATA) xentop.1 ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1
endif

30
sysutils/xentools3/patches/patch-bs
View file

@ -1,4 +1,4 @@
$NetBSD: patch-bs,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
$NetBSD: patch-bs,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- xenstore/Makefile.orig 2007-05-18 16:45:21.000000000 +0200
+++ xenstore/Makefile 2007-05-27 14:41:40.000000000 +0200
@ -30,20 +30,20 @@ $NetBSD: patch-bs,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
- $(INSTALL_DATA) libxenstore.a $(DESTDIR)/usr/$(LIBDIR)
- $(INSTALL_DATA) xs.h $(DESTDIR)/usr/include
- $(INSTALL_DATA) xs_lib.h $(DESTDIR)/usr/include
+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin
+ $(BSD_INSTALL_DATA_DIR) -p $(PREFIX)/include
+ $(BSD_INSTALL_PROGRAM) xenstored $(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM) $(CLIENTS) $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) xenstore-control $(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) xenstore-ls $(PREFIX)/bin
+ $(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib
+ $(BSD_INSTALL_LIB) libxenstore.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
+ ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libxenstore.so.$(MAJOR)
+ ln -sf libxenstore.so.$(MAJOR) $(PREFIX)/lib/libxenstore.so
+ $(BSD_INSTALL_LIB) libxenstore.a $(PREFIX)/lib
+ $(BSD_INSTALL_DATA) xs.h $(PREFIX)/include
+ $(BSD_INSTALL_DATA) xs_lib.h $(PREFIX)/include
+ $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(PREFIX)/sbin
+ $(BSD_INSTALL_DATA_DIR) -p ${DESTDIR}$(PREFIX)/include
+ $(BSD_INSTALL_PROGRAM) xenstored ${DESTDIR}$(PREFIX)/sbin
+ $(BSD_INSTALL_PROGRAM) $(CLIENTS) ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) xenstore-control ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_PROGRAM) xenstore-ls ${DESTDIR}$(PREFIX)/bin
+ $(BSD_INSTALL_LIB_DIR) ${DESTDIR}$(PREFIX)/lib
+ $(BSD_INSTALL_LIB) libxenstore.so.$(MAJOR).$(MINOR) ${DESTDIR}$(PREFIX)/lib
+ ln -sf libxenstore.so.$(MAJOR).$(MINOR) ${DESTDIR}$(PREFIX)/lib/libxenstore.so.$(MAJOR)
+ ln -sf libxenstore.so.$(MAJOR) ${DESTDIR}$(PREFIX)/lib/libxenstore.so
+ $(BSD_INSTALL_LIB) libxenstore.a ${DESTDIR}$(PREFIX)/lib
+ $(BSD_INSTALL_DATA) xs.h ${DESTDIR}$(PREFIX)/include
+ $(BSD_INSTALL_DATA) xs_lib.h ${DESTDIR}$(PREFIX)/include
-include $(PROG_DEP)

6
sysutils/xentools3/patches/patch-cz
View file

@ -1,4 +1,4 @@
$NetBSD: patch-cz,v 1.1 2008/03/03 16:45:27 hannken Exp $
$NetBSD: patch-cz,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- libfsimage/Rules.mk.orig 2008-01-31 10:06:54.000000000 +0000
+++ libfsimage/Rules.mk 2008-03-01 11:52:28.000000000 +0000
@ -8,8 +8,8 @@ $NetBSD: patch-cz,v 1.1 2008/03/03 16:45:27 hannken Exp $
fs-install: fs-all
- $(INSTALL_DIR) $(DESTDIR)/usr/$(FSDIR)
- $(INSTALL_PROG) $(FSLIB) $(DESTDIR)/usr/$(FSDIR)
+ $(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib/fs/$(FS)
+ $(BSD_INSTALL_LIB) $(FSLIB) $(PREFIX)/lib/fs/$(FS)
+ $(BSD_INSTALL_LIB_DIR) ${DESTDIR}$(PREFIX)/lib/fs/$(FS)
+ $(BSD_INSTALL_LIB) $(FSLIB) ${DESTDIR}$(PREFIX)/lib/fs/$(FS)
$(FSLIB): $(PIC_OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS)

18
sysutils/xentools3/patches/patch-da
View file

@ -1,4 +1,4 @@
$NetBSD: patch-da,v 1.1 2008/03/03 16:45:27 hannken Exp $
$NetBSD: patch-da,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- libfsimage/common/Makefile.orig 2008-01-31 10:06:54.000000000 +0000
+++ libfsimage/common/Makefile 2008-03-01 11:52:28.000000000 +0000
@ -23,14 +23,14 @@ $NetBSD: patch-da,v 1.1 2008/03/03 16:45:27 hannken Exp $
- $(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
- $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
- $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
+ $(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib
+ $(BSD_INSTALL_DATA_DIR) $(PREFIX)/include
+ $(BSD_INSTALL_LIB) libfsimage.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
+ ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libfsimage.so.$(MAJOR)
+ ln -sf libfsimage.so.$(MAJOR) $(PREFIX)/lib/libfsimage.so
+ $(BSD_INSTALL_DATA) fsimage.h $(PREFIX)/include
+ $(BSD_INSTALL_DATA) fsimage_plugin.h $(PREFIX)/include
+ $(BSD_INSTALL_DATA) fsimage_grub.h $(PREFIX)/include
+ $(BSD_INSTALL_LIB_DIR) ${DESTDIR}$(PREFIX)/lib
+ $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/include
+ $(BSD_INSTALL_LIB) libfsimage.so.$(MAJOR).$(MINOR) ${DESTDIR}$(PREFIX)/lib
+ ln -sf libfsimage.so.$(MAJOR).$(MINOR) ${DESTDIR}$(PREFIX)/lib/libfsimage.so.$(MAJOR)
+ ln -sf libfsimage.so.$(MAJOR) ${DESTDIR}$(PREFIX)/lib/libfsimage.so
+ $(BSD_INSTALL_DATA) fsimage.h ${DESTDIR}$(PREFIX)/include
+ $(BSD_INSTALL_DATA) fsimage_plugin.h ${DESTDIR}$(PREFIX)/include
+ $(BSD_INSTALL_DATA) fsimage_grub.h ${DESTDIR}$(PREFIX)/include
clean distclean:
rm -f $(PIC_OBJS) $(LIB)

6
sysutils/xentools3/patches/patch-dh
View file

@ -1,4 +1,4 @@
$NetBSD: patch-dh,v 1.1 2008/03/03 16:45:27 hannken Exp $
$NetBSD: patch-dh,v 1.2 2008/08/07 16:00:14 joerg Exp $
--- pygrub/Makefile.orig 2008-01-31 10:06:54.000000000 +0000
+++ pygrub/Makefile 2008-03-01 12:03:11.000000000 +0000
@ -11,12 +11,12 @@ $NetBSD: patch-dh,v 1.1 2008/03/03 16:45:27 hannken Exp $
install: all
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --install-lib="$(DESTDIR)$(LIBPATH)/python"
- $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ python setup.py install
+ python setup.py install --root=${DESTDIR}
else
install: all
- CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)"
- $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+ python setup.py install
+ python setup.py install --root=${DESTDIR}
endif
.PHONY: clean