From d258945b9b0f2b978c0ee2fa4c772827122065f0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 Jul 2010 22:24:15 +0200
Subject: fix tsort wrapper for NetBSD

---
 scripts/tsort | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/tsort b/scripts/tsort
index 77ffa1237..93df1aa8a 100755
--- a/scripts/tsort
+++ b/scripts/tsort
@@ -4,10 +4,10 @@
 
 os=$(uname)
 case $os in
-	NetBSD|MirBSD|OpenBSD)
+	MirBSD|OpenBSD)
 		/usr/bin/tsort -r
 		;;
-	FreeBSD)
+	NetBSD|FreeBSD)
 		/usr/bin/tsort | tail -r
 		;;
 	*)
-- 
cgit v1.2.3


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(-)

(limited to 'scripts')

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


From 181bf9bdca8065de5a592587bd86823e0b288ce0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 30 Jul 2010 12:49:03 +0200
Subject: fix build on FreeBSD host

---
 package/firefox/Makefile              |  2 ++
 package/git/Makefile                  |  7 ++---
 package/git/patches/patch-Makefile    | 52 +++++++++++++++++-----------------
 package/libtool/Makefile              |  4 +--
 package/mysql/patches/patch-configure | 53 +++++++++++++++++++++++++++++++++--
 scripts/automake.dep                  |  3 ++
 6 files changed, 86 insertions(+), 35 deletions(-)

(limited to 'scripts')

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 234386e9c..3280d711b 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -44,6 +44,8 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-system-png \
 			--with-system-nss \
 			--with-system-nspr \
+			--with-libIDL-prefix=${STAGING_DIR}/usr \
+			--with-glib-prefix=${STAGING_DIR}/usr \
 			--enable-libxul \
 			--disable-tests \
 			--disable-static \
diff --git a/package/git/Makefile b/package/git/Makefile
index a3c9a8fd6..162cc13ab 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		git
-PKG_VERSION:=		1.7.1
+PKG_VERSION:=		1.7.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		d2fefae2b787a19601c09d89975ce5fb
+PKG_MD5SUM:=		13fc44363df744a401552e73e5476351
 PKG_DESCR:=		fast version control system
 PKG_SECTION:=		scm
 PKG_DEPENDS:=		libopenssl libcurl libexpat libpthread
@@ -18,8 +18,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \
-			NO_CROSS_DIRECTORY_HARDLINKS=1 \
+MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 NO_PYTHON=1 \
 			CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR}
 XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
diff --git a/package/git/patches/patch-Makefile b/package/git/patches/patch-Makefile
index 6f3b70e98..dcfd4dd82 100644
--- a/package/git/patches/patch-Makefile
+++ b/package/git/patches/patch-Makefile
@@ -1,26 +1,6 @@
---- git-1.6.5.5.orig/Makefile	2009-12-06 04:51:25.000000000 +0100
-+++ git-1.6.5.5/Makefile	2009-12-07 20:13:40.753866786 +0100
-@@ -218,8 +218,8 @@ uname_V := $(shell sh -c 'uname -v 2>/de
- 
- # CFLAGS and LDFLAGS are for the users to override from the command line.
- 
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
-+CFLAGS ?= -g -O2 -Wall
-+LDFLAGS ?=
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
-@@ -241,7 +241,7 @@ bindir_relative = bin
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--gitexecdir = libexec/git-core
-+gitexecdir = sbin/git-core
- sharedir = $(prefix)/share
- template_dir = share/git-core/templates
- htmldir = share/doc/git-doc
-@@ -1417,7 +1417,6 @@ builtin-help.o: builtin-help.c common-cm
+--- git-1.7.2.1.orig/Makefile	2010-07-28 19:03:43.000000000 +0200
++++ git-1.7.2.1/Makefile	2010-07-30 12:25:52.000000000 +0200
+@@ -1594,7 +1594,6 @@ builtin/help.s builtin/help.o: EXTRA_CPP
  
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -28,11 +8,31 @@
  	ln -s git$X $@ 2>/dev/null || \
  	cp git$X $@
  
-@@ -1749,7 +1748,6 @@ endif
+@@ -1894,7 +1893,6 @@ git-http-push$X: revision.o http.o http-
+ 
+ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
+ 	$(QUIET_LNCP)$(RM) $@ && \
+-	ln $< $@ 2>/dev/null || \
+ 	ln -s $< $@ 2>/dev/null || \
+ 	cp $< $@
+ 
+@@ -2077,18 +2075,16 @@ endif
+ 	{ test "$$bindir/" = "$$execdir/" || \
+ 		{ $(RM) "$$execdir/git$X" && \
+ 		test -z "$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+-		ln "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
++		ln -s "$$bindir/git$X" "$$execdir/git$X" 2>/dev/null || \
  		cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \
- 	{ for p in $(BUILT_INS); do \
+ 	for p in $(BUILT_INS); do \
  		$(RM) "$$execdir/$$p" && \
 -		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
  		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
- 	  done; } && \
+ 	done && \
+ 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
+ 	for p in $$remote_curl_aliases; do \
+ 		$(RM) "$$execdir/$$p" && \
+-		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+ 	done && \
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index d043decca..dbf2e3c05 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtool
-PKG_VERSION:=		2.2.8
+PKG_VERSION:=		2.2.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		cad2a7188242bc8dbab0645532ae3d6f
+PKG_MD5SUM:=		b745d220e88163fcd9eea0a90ccf21b0
 PKG_DESCR:=		a generic dynamic object loading library
 PKG_SECTION:=		lang
 PKG_URL:=		http://www.gnu.org/software/libtool
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 1c61d1a01..aad04ff2b 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,6 +1,53 @@
 --- mysql-5.1.48.orig/configure	2010-06-03 17:54:47.000000000 +0200
-+++ mysql-5.1.48/configure	2010-07-12 22:51:24.267118950 +0200
-@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann
++++ mysql-5.1.48/configure	2010-07-30 11:04:50.000000000 +0200
+@@ -19825,45 +19825,7 @@ fi
+ $as_echo_n "checking \"how to check if pid exists\"... " >&6; }
+ PS=$ac_cv_path_PS
+ # Linux style
+-if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
+-then
+-  FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-# Solaris
+-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-# BSD style
+-elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-# SysV style
+-elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-# Do anybody use this?
+-elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
+-then
+-  FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-else
+-  case $SYSTEM_TYPE in
+-    *freebsd*|*dragonfly*)
+-      FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-      ;;
+-    *darwin*)
+-      FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *cygwin*)
+-      FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+-      ;;
+-    *netware*)
+-      FIND_PROC=
+-      ;;
+-    *)
+-      { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." >&5
+-$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." >&2;}
+-   { (exit 1); exit 1; }; }
+-  esac
+-fi
++FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ 
+ { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
+ $as_echo "\"$FIND_PROC\"" >&6; }
+@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann
    esac
  
  
@@ -198,7 +245,7 @@
  
    { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
  $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
-@@ -48581,101 +48398,6 @@ fi
+@@ -48581,101 +48360,6 @@ fi
  done
  
  
diff --git a/scripts/automake.dep b/scripts/automake.dep
index 13e4e87a9..2cfd5d3ce 100644
--- a/scripts/automake.dep
+++ b/scripts/automake.dep
@@ -9,6 +9,8 @@ configure missing
 aclocal.m4 configure.in
 aclocal.m4 configure.ac
 aclocal.m4 acinclude.m4
+config-h.in configure.in
+config-h.in configure.ac
 config.h.in configure.in
 config.h.in configure.ac
 config.h.in aclocal.m4
@@ -31,3 +33,4 @@ configure.in configure.files
 acinclude.m4 admin/libtool.m4.in
 acinclude.m4 admin/acinclude.m4.in
 acinclude.m4 libltdl/ltdl.m4
+libtoolize.in configure
-- 
cgit v1.2.3


From f6fc0696b89cf3c15479a1fe69de2c6acfe72d9f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 30 Jul 2010 11:09:08 +0200
Subject: add openbsd function

---
 scripts/adkprepare.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh
index 5faaed56e..acf6bfbfd 100755
--- a/scripts/adkprepare.sh
+++ b/scripts/adkprepare.sh
@@ -37,6 +37,18 @@ openbsd() {
 	pkg_add -v xz
 }
 
+openbsd_full() {
+	PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
+	export PKG_PATH
+	pkg_add -v bison
+	pkg_add -v zip
+	pkg_add -v intltool
+	pkg_add -v libIDL
+	pkg_add -v m4
+	pkg_add -v autoconf-2.62p0
+	pkg_add -v gperf
+}
+
 netbsd() {
 	echo "Preparing NetBSD for OpenADK"
 	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/"
@@ -51,6 +63,7 @@ netbsd() {
 	pkg_add -vu gtar
 	pkg_add -vu gsed
 	pkg_add -vu gawk
+	pkg_add -vu gperf
 }
 
 netbsd_full() {
@@ -66,7 +79,7 @@ netbsd_full() {
 
 freebsd() {
 	echo "Preparing FreeBSD for OpenADK"
-	pkg_add -r git gmake mksh bash wget unzip gtar gsed gawk
+	pkg_add -r git gmake mksh bash wget unzip gtar gsed gawk gperf
 }
 
 freebsd_full() {
-- 
cgit v1.2.3


From 4d36338cd8f5a2ede3f6d199a9e507fe10b95959 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 30 Jul 2010 11:09:34 +0200
Subject: automake needs autoconf, autoconf needs m4

---
 scripts/scan-pkgs.sh | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index f08ee812a..ef278da92 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -26,7 +26,6 @@ out=0
 if [[ -n $ADK_NATIVE ]];then
 	if [[ -n $ADK_PACKAGE_GIT ]];then
 		NEED_CURLDEV="$NEED_CURLDEV git"
-		NEED_SSLDEV="$NEED_SSLDEV git"
 	fi
 	if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then
 		NEED_RPM="$NEED_RPM rpm"
@@ -55,8 +54,15 @@ if [[ -n $ADK_COMPILE_AVAHI ]]; then
 	NEED_PKGCONFIG="$NEED_PKGCONFIG avahi"
 fi
 
+if [[ -n $ADK_COMPILE_AUTOCONF ]]; then
+	NEED_M4="$NEED_M4 autoconf"
+fi
+
+if [[ -n $ADK_COMPILE_AUTOMAKE ]]; then
+	NEED_AUTOCONF="$NEED_AUTOCONF automake"
+fi
+
 if [[ -n $ADK_PACKAGE_SQUID ]]; then
-	NEED_SSLDEV="$NEED_SSLDEV squid"
 	NEED_GXX="$NEED_GXX squid"
 fi
 
@@ -139,6 +145,20 @@ if [[ -n $NEED_MKFONTDIR ]]; then
 	fi
 fi
 
+if [[ -n $NEED_M4 ]]; then
+	if ! which m4 >/dev/null 2>&1; then
+		echo >&2 You need GNU m4 to build $NEED_M4
+		out=1
+	fi
+fi
+
+if [[ -n $NEED_AUTOCONF ]]; then
+	if ! which autoconf >/dev/null 2>&1; then
+		echo >&2 You need autoconf to build $NEED_AUTOCONF
+		out=1
+	fi
+fi
+
 if [[ -n $NEED_INTL ]]; then
 	if ! which intltool-update >/dev/null 2>&1; then
 		echo >&2 You need intltool to build $NEED_INTL
@@ -220,13 +240,6 @@ if [[ -n $NEED_GLIBZWO ]]; then
 	fi
 fi
 
-if [[ -n $ADK_USE_CCACHE ]]; then
-        if ! which ccache >/dev/null 2>&1; then
-                echo >&2 You have selected to build with ccache, but ccache could not be found.
-                out=1
-        fi
-fi
-
 if [[ -n $NEED_RPM ]]; then
 	if ! which rpmbuild >/dev/null 2>&1; then
 		echo >&2 You need rpmbuild to to use $NEED_RPM package backend
-- 
cgit v1.2.3