[pkgsrc/trunk]: pkgsrc/sysutils/xentools45 Make it build on netbsd-7.

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/88bbb136278c
branches:  trunk
changeset: 645029:88bbb136278c
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Wed Jan 21 08:53:21 2015 +0000

description:
Make it build on netbsd-7.
Remove dependancy on py-curses and py-xml now that the xm toolstack is gone.
Bump PKGREVISION

diffstat:

 sysutils/xentools45/Makefile                                     |   9 +-----
 sysutils/xentools45/distinfo                                     |   4 +-
 sysutils/xentools45/patches/patch-qemu-xen-traditional_configure |  14 ++++++++-
 3 files changed, 16 insertions(+), 11 deletions(-)

diffs (81 lines):

diff -r ded76589a9fa -r 88bbb136278c sysutils/xentools45/Makefile
--- a/sysutils/xentools45/Makefile      Wed Jan 21 07:02:01 2015 +0000
+++ b/sysutils/xentools45/Makefile      Wed Jan 21 08:53:21 2015 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2015/01/20 16:42:13 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/21 08:53:21 bouyer Exp $
 
 VERSION=       4.5.0
 VERSION_IPXE=  9a93db3f0947484e30e753bbd61a10b17336e20e
 
 DISTNAME=              xen-${VERSION}
 PKGNAME=               xentools45-${VERSION}
-#PKGREVISION=          1
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          http://bits.xensource.com/oss-xen/release/${VERSION}/
 
@@ -23,10 +23,6 @@
 .if !exists(/usr/bin/iasl)
 BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
 .endif
-DEPENDS+=              ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses
-DEPENDS+=              ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
-
-PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-xml
 
 PKG_SYSCONFSUBDIR=     xen
 
@@ -206,7 +202,6 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../textproc/py-xml/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 #.include "../../devel/SDL/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
diff -r ded76589a9fa -r 88bbb136278c sysutils/xentools45/distinfo
--- a/sysutils/xentools45/distinfo      Wed Jan 21 07:02:01 2015 +0000
+++ b/sysutils/xentools45/distinfo      Wed Jan 21 08:53:21 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2015/01/20 16:42:13 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2015/01/21 08:53:21 bouyer Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -36,7 +36,7 @@
 SHA1 (patch-pygrub_Makefile) = 4380d7ddeed41c80e47f8130760f4bdc6842a394
 SHA1 (patch-qemu-xen-traditional_Makefile) = aac50189b3e359314c5d47745d50113f190bbbe0
 SHA1 (patch-qemu-xen-traditional_block-raw-posix.c) = fb03fe527515424d72758b606ab8d2e5bf8c341b
-SHA1 (patch-qemu-xen-traditional_configure) = 34499887d6e426c29e0514407a9b6e23d2496064
+SHA1 (patch-qemu-xen-traditional_configure) = a29520d12c229feed85b335e9241dc085427a3db
 SHA1 (patch-qemu-xen-traditional_hw_e1000.c) = d94874baa64a0974d29c8c3a117cf0fae030952d
 SHA1 (patch-qemu-xen-traditional_hw_ide.c) = fb674b326321f4865183eee889967b1a948698e0
 SHA1 (patch-qemu-xen-traditional_hw_pass-through.c) = b87481f764e16fb1345c44b4f46fa3837901a4e2
diff -r ded76589a9fa -r 88bbb136278c sysutils/xentools45/patches/patch-qemu-xen-traditional_configure
--- a/sysutils/xentools45/patches/patch-qemu-xen-traditional_configure  Wed Jan 21 07:02:01 2015 +0000
+++ b/sysutils/xentools45/patches/patch-qemu-xen-traditional_configure  Wed Jan 21 08:53:21 2015 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-qemu-xen-traditional_configure,v 1.1 2015/01/20 16:42:13 bouyer Exp $
+$NetBSD: patch-qemu-xen-traditional_configure,v 1.2 2015/01/21 08:53:21 bouyer Exp $
 
 --- qemu-xen-traditional/configure.orig        2014-10-06 17:50:24.000000000 +0200
-+++ qemu-xen-traditional/configure     2015-01-19 14:17:28.000000000 +0100
++++ qemu-xen-traditional/configure     2015-01-20 22:58:07.000000000 +0100
 @@ -1089,7 +1089,7 @@
  # Check if tools are available to build documentation.
  if [ -x "`which texi2html 2>/dev/null`" ] && \
@@ -29,3 +29,13 @@
  echo "CC=$cc" >> $config_mak
  echo "HOST_CC=$host_cc" >> $config_mak
  echo "AR=$ar" >> $config_mak
+@@ -1493,7 +1495,9 @@
+ # XXX: suppress that
+ if [ "$bsd" = "yes" ] ; then
+   echo "#define O_LARGEFILE 0" >> $config_h
++  echo "#ifndef MAP_ANONYMOUS" >> $config_h
+   echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h
++  echo "#endif" >> $config_h
+   echo "#define _BSD 1" >> $config_h
+ fi
+