some OpenBSD host fixes

10 files changed, 13 insertions, 17 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 71f91f564..b5e9d119f 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -28,9 +28,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 include $(TOPDIR)/mk/python.mk
+
 ifeq ($(ADK_HOST_DARWIN),y)
 PYTHON:=/opt/local/bin/python2.7
 endif
+ifeq ($(ADK_HOST_OPENBSD),y)
+PYTHON:=/usr/local/bin/python2.7
+endif
 
 ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y)
 DRI_DRIVERS:=i915
diff --git a/package/bc/Makefile b/package/bc/Makefile
index d4af2f264..2a5c59900 100644
--- a/package/bc/Makefile
+++ b/package/bc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		d44b5dddebd8a7a7309aea6c36fda117
 PKG_DESCR:=		An arbitrary precision calculator language
 PKG_SECTION:=		utils
-PKG_BUILDDEP:=		flex-host
+PKG_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.gnu.org/software/bc/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/bc/
 
diff --git a/package/bison/Makefile b/package/bison/Makefile
index 16c31b94e..ee268b641 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		032a7b7b9f1a6e278ccde73f82cec5c2
 PKG_DESCR:=		GNU parser generator
 PKG_SECTION:=		lang
-PKG_BUILDDEP:=		flex-host bison-host
+PKG_BUILDDEP:=		m4-host flex-host bison-host
 PKG_URL:=		http://www.gnu.org/software/bison/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 
diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in
index 98e7f3de3..cf6ade9c5 100644
--- a/package/bison/patches/patch-Makefile_in
+++ b/package/bison/patches/patch-Makefile_in
@@ -6,8 +6,8 @@
  $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
 -	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
 -	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
-+	bison$(EXEEXT) --version >doc/bison.help.tmp
-+	bison$(EXEEXT) --help   >>doc/bison.help.tmp
++	echo "3.0.1" >doc/bison.help.tmp
++	echo "no help"   >>doc/bison.help.tmp
  	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
  
  # Depend on configure to get version number changes.
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 88160db91..5d7077306 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=		gmp
 PKG_DESCR:=		GNU multiprecision arithmetic library
 PKG_SECTION:=		libs
 PKG_URL:=		http://gmplib.org/
-PKG_BUILDDEP:=		flex-host bison-host m4-host
+PKG_BUILDDEP:=		m4-host flex-host bison-host
 PKG_LIBNAME:=		libgmp
 PKG_OPTS:=		dev
 
diff --git a/package/libIDL/Makefile b/package/libIDL/Makefile
index aadcd7a17..e4adff641 100644
--- a/package/libIDL/Makefile
+++ b/package/libIDL/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		531fbc1b40b80dd1d6f3b5e76b99067c
 PKG_DESCR:=		libraries for Interface Definition Language files
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib
-PKG_BUILDDEP:=		glib-host glib flex-host bison-host libIDL-host
+PKG_BUILDDEP:=		glib-host glib m4-host flex-host bison-host libIDL-host
 PKG_URL:=		http://www.gnome.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/
 PKG_LIBNAME:=		libidl
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index e96cfe686..45b24cca2 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		3
 PKG_MD5SUM:=		2e1c889494d274aca24ce5f6a748e66e
 PKG_DESCR:=		Netlink library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		flex-host
+PKG_BUILDDEP:=		m4-host flex-host
 PKG_URL:=		http://www.infradead.org/~tgr/libnl/
 PKG_SITES:=		http://www.infradead.org/~tgr/libnl/files/
 PKG_NOPARALLEL:=	1
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 44d6126ef..51b470aae 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		33ba2f10f3a402cb5d34f5e2a904794a
 PKG_DESCR:=		a low-level packet capture library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		flex-host bison-host libnl
+PKG_BUILDDEP:=		m4-host flex-host bison-host libnl
 PKG_URL:=		http://www.tcpdump.org/
 PKG_SITES:=		http://www.tcpdump.org/release/
 PKG_OPTS:=		dev
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh
index b526371ef..022a978c1 100755
--- a/scripts/adkprepare.sh
+++ b/scripts/adkprepare.sh
@@ -34,6 +34,7 @@ openbsd() {
 	pkg_add -v intltool
 	pkg_add -v screen--
 	pkg_add -v vim--no_x11
+	pkg_add -v py-libxml
 }
 
 netbsd() {
diff --git a/scripts/m4 b/scripts/m4
deleted file mode 100755
index 8456bce21..000000000
--- a/scripts/m4
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-if [ -z "$(which gm4 2>/dev/null)" ];then
-	/usr/bin/m4 "$@"
-else
-	gm4 "$@"
-fi