From 88bbfd520998eab45c20b6d0b52793b2b6ad3907 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 30 Jul 2010 10:45:58 +0200
Subject: python is required for firefox, disable build of firefox on BSD for
 now

---
 package/firefox/Makefile                |  1 +
 package/firefox/patches/patch-configure | 15 ++++++++++++---
 scripts/adkprepare.sh                   |  3 +++
 scripts/scan-pkgs.sh                    | 12 ++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 234386e9c..970037f08 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -21,6 +21,7 @@ DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
 
 WRKDIST=		${WRKDIR}/mozilla-1.9.2
 PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote
+PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index f424b3787..28035c66a 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,6 +1,15 @@
---- mozilla-1.9.2.orig/configure	2010-04-02 18:07:41.000000000 +0200
-+++ mozilla-1.9.2/configure	2010-04-11 14:38:39.000000000 +0200
-@@ -21012,8 +21012,8 @@ if test -n "$CROSS_COMPILE"; then
+--- mozilla-1.9.2.orig/configure	2010-07-23 00:00:19.000000000 +0200
++++ mozilla-1.9.2/configure	2010-07-30 09:52:43.000000000 +0200
+@@ -3970,7 +3970,7 @@ else
+     echo "$ac_t""yes" 1>&6    
+ fi
+ 
+-  for ac_prog in $PYTHON python2.5 python2.4 python
++  for ac_prog in $PYTHON python2.6 python2.5 python2.4 python
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -21285,8 +21285,8 @@ if test -n "$CROSS_COMPILE"; then
          HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
      fi
      if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh
index 5faaed56e..ac5169986 100755
--- a/scripts/adkprepare.sh
+++ b/scripts/adkprepare.sh
@@ -55,6 +55,8 @@ netbsd() {
 
 netbsd_full() {
 	echo "Preparing NetBSD for full OpenADK package builds"
+	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/"
+	export PKG_PATH
 	pkg_add -vu intltool
 	pkg_add -vu lynx
 	pkg_add -vu pkg-config
@@ -62,6 +64,7 @@ netbsd_full() {
 	pkg_add -vu bison
 	pkg_add -vu libIDL
 	pkg_add -vu xkbcomp
+	pkg_add -vu python26
 }
 
 freebsd() {
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index f08ee812a..9470c0d3f 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -36,6 +36,7 @@ fi
 if [[ -n $ADK_PACKAGE_FIREFOX ]]; then
 	NEED_ZIP="$NEED_ZIP firefox"
 	NEED_LIBIDL="$NEED_LIBIDL firefox"
+	NEED_PYTHON="$NEED_PYTHON firefox"
 fi
 
 if [[ -n $ADK_COMPILE_HEIMDAL ]]; then
@@ -241,4 +242,15 @@ if [[ -n $NEED_FLEX ]]; then
 	fi
 fi
 
+if [[ -n $NEED_PYTHON ]]; then
+	if ! which python >/dev/null 2>&1; then
+		if ! test -x /usr/pkg/bin/python2.6 >/dev/null; then
+			echo >&2 You need python to to use $NEED_PYTHON package
+			out=1
+		fi
+	fi
+fi
+
+exit $out
+
 exit $out
-- 
cgit v1.2.3