Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/atftp/patches/patch-test_Makefile

@@ -1,152 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- atftp-0.7.orig/test/Makefile	2004-03-16 02:53:37.000000000 +0100
-+++ atftp-0.7/test/Makefile	2008-10-09 11:58:55.000000000 +0200
-@@ -13,9 +13,9 @@
- # PARTICULAR PURPOSE.
- 
- 
--srcdir = .
--top_srcdir = ..
--
-+srcdir = /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/test
-+top_srcdir = /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7
-+VPATH = /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/test
- pkgdatadir = $(datadir)/atftp
- pkglibdir = $(libdir)/atftp
- pkgincludedir = $(includedir)/atftp
-@@ -33,7 +33,7 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_triplet = i686-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- subdir = test
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -46,24 +46,24 @@ CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/jp/projets/sources/atftp/atftp-0.7/atftp/missing --run aclocal-1.8
--AMDEP_FALSE = #
--AMDEP_TRUE = 
--AMTAR = ${SHELL} /home/jp/projets/sources/atftp/atftp-0.7/atftp/missing --run tar
--AUTOCONF = ${SHELL} /home/jp/projets/sources/atftp/atftp-0.7/atftp/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jp/projets/sources/atftp/atftp-0.7/atftp/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jp/projets/sources/atftp/atftp-0.7/atftp/missing --run automake-1.8
-+ACLOCAL = ${SHELL} /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/missing --run aclocal-1.8
-+AMDEP_FALSE = 
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/missing --run tar
-+AUTOCONF = ${SHELL} /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/missing --run automake-1.8
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
-+CC = /home/wbrodkorb/adk-glibc/cross_x86/host/bin/i586-linux-gnu-gcc
-+CCDEPMODE = depmode=none
- CFLAGS = -g -Wall -D_REENTRANT -O2
--CPP = gcc -E
--CPPFLAGS = 
-+CPP = /home/wbrodkorb/adk-glibc/cross_x86/host/bin/i586-linux-gnu-gcc -E
-+CPPFLAGS = -isystem /home/wbrodkorb/adk-glibc/cross_x86/target/include -isystem /home/wbrodkorb/adk-glibc/cross_x86/target/usr/include -DNDEBUG
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
--ECHO_C = 
--ECHO_N = -n
-+ECHO_C = \c
-+ECHO_N = 
- ECHO_T = 
- EGREP = grep -E
- EXEEXT = 
-@@ -71,17 +71,17 @@ INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--ISODATE = 2004-03-15
--LDFLAGS = 
-+ISODATE = 2008-10-09
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbrodkorb/adk-glibc/cross_x86/target/usr/lib -L/home/wbrodkorb/adk-glibc/cross_x86/target/lib -L/home/wbrodkorb/adk-glibc/cross_x86/target/usr/lib
- LIBOBJS = 
--LIBPCRE = -lpcre
-+LIBPCRE = 
- LIBPTHREAD = -lpthread
- LIBREADLINE = -lreadline
- LIBS = 
--LIBTERMCAP = 
--LIBWRAP = -lnsl -lwrap
-+LIBTERMCAP = -lncurses
-+LIBWRAP = 
- LTLIBOBJS = 
--MAKEINFO = ${SHELL} /home/jp/projets/sources/atftp/atftp-0.7/atftp/missing --run makeinfo
-+MAKEINFO = ${SHELL} /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/missing --run makeinfo
- OBJEXT = o
- PACKAGE = atftp
- PACKAGE_BUGREPORT = 
-@@ -90,46 +90,46 @@ PACKAGE_STRING = 
- PACKAGE_TARNAME = 
- PACKAGE_VERSION = 
- PATH_SEPARATOR = :
--PLATFORM = pc-i686-linux-gnu
-+PLATFORM = pc-i586-linux-gnu
- SET_MAKE = 
- SHELL = /bin/sh
--STRIP = 
-+STRIP = i586-linux-strip
- VERSION = 0.7
--ac_ct_CC = gcc
-+ac_ct_CC = 
- ac_ct_STRIP = 
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE = 
-+am__fastdepCC_FALSE = 
-+am__fastdepCC_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote = 
- bindir = ${exec_prefix}/bin
- build = i686-pc-linux-gnu
--build_alias = 
-+build_alias = i686-linux-gnu
- build_cpu = i686
- build_os = linux-gnu
- build_vendor = pc
--datadir = ${prefix}/share
-+datadir = /usr/share
- exec_prefix = ${prefix}
--host = i686-pc-linux-gnu
--host_alias = 
--host_cpu = i686
-+host = i586-pc-linux-gnu
-+host_alias = i586-linux
-+host_cpu = i586
- host_os = linux-gnu
- host_vendor = pc
- includedir = ${prefix}/include
- infodir = ${prefix}/info
--install_sh = /home/jp/projets/sources/atftp/atftp-0.7/atftp/install-sh
-+install_sh = /home/wbrodkorb/adk-glibc/build_x86/w-atftp-0.7-2/atftp-0.7/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/lib
-+localstatedir = /var
-+mandir = /usr/share/man
- mkdir_p = mkdir -p -- .
- oldincludedir = /usr/include
--prefix = /usr/local
--program_transform_name = s,x,x,
-+prefix = /usr
-+program_transform_name = s,$$,,;s,^,,
- sbindir = ${exec_prefix}/sbin
- sharedstatedir = ${prefix}/com
--sysconfdir = ${prefix}/etc
--target_alias = 
-+sysconfdir = /etc
-+target_alias = i586-linux
- TESTS = test.sh
- CLEANFILES = *~
- all: all-am

package/tslib/Makefile

@@ -27,6 +27,9 @@ CONFIGURE_ARGS+=	--disable-ucb1x00 \
 			--disable-linear-h2200 \
 			--disable-arctic2
 
+pre-build:
+	@chmod u+x ${WRKBUILD}/install-sh
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_TSLIB)/etc
 	$(INSTALL_DIR) $(IDIR_TSLIB)/usr/lib/ts

scripts/adkprepare.sh

@@ -1,5 +1,10 @@
 #!/bin/sh
 
+os=$(uname)
+ver=$(uname -r)
+arch=$(uname -m)
+
+ext=0
 while getopts "e" option
 do
 	case $option in
@@ -19,10 +24,44 @@ darwin() {
 
 openbsd() {
 	echo "Preparing OpenBSD for OpenADK"
+	PKG_PATH="ftp://ftp.openbsd.org/pub/OpenBSD/${ver}/packages/${arch}/"
+	export PKG_PATH
+	pkg_add -v gmake
+	pkg_add -v git
+	pkg_add -v bash
+	pkg_add -v unzip
+	pkg_add -v wget
+	pkg_add -v gtar--
+	pkg_add -v gawk
+	pkg_add -v gsed
+	pkg_add -v xz
 }
 
 netbsd() {
 	echo "Preparing NetBSD for OpenADK"
+	PKG_PATH="ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/${arch}/5.0/All/"
+	export PKG_PATH
+	pkg_add -vu xz
+	pkg_add -vu scmgit
+	pkg_add -vu gmake
+	pkg_add -vu mksh
+	pkg_add -vu bash
+	pkg_add -vu wget
+	pkg_add -vu unzip
+	pkg_add -vu gtar
+	pkg_add -vu gsed
+	pkg_add -vu gawk
+}
+
+netbsd_full() {
+	echo "Preparing NetBSD for full OpenADK package builds"
+	pkg_add -vu intltool
+	pkg_add -vu lynx
+	pkg_add -vu pkg-config
+	pkg_add -vu zip
+	pkg_add -vu bison
+	pkg_add -vu libIDL
+	pkg_add -vu xkbcomp
 }
 
 freebsd() {
@@ -35,28 +74,28 @@ freebsd_full() {
 	pkg_add -r intltool lynx bison zip xkbcomp glib20 libIDL
 }
 
-os=$(uname)
-
 case $os in 
 	Linux)
 		linux
-		[[ $ext -eq 1 ]] && linux_full
+		[ $ext -eq 1 ] && linux_full
 		;;
 	FreeBSD)
 		freebsd
-		[[ $ext -eq 1 ]] && freebsd_full
+		[ $ext -eq 1 ] && freebsd_full
 		;;
 	OpenBSD)
 		openbsd
-		[[ $ext -eq 1 ]] && openbsd_full
+		[ $ext -eq 1 ] && openbsd_full
 		;;
 	NetBSD)
 		netbsd
-		[[ $ext -eq 1 ]] && netbsd_full
+		[ $ext -eq 1 ] && netbsd_full
 		;;
 	Darwin)
 		darwin
-		[[ $ext -eq 1 ]] && darwin_full
-		;;	
+		[ $ext -eq 1 ] && darwin_full
+		;;
+	*)
+		echo "OS not supported"
+		;;
 esac
-

scripts/tsort

@@ -7,6 +7,9 @@ case $os in
 	NetBSD|MirBSD|OpenBSD)
 		/usr/bin/tsort -r
 		;;
+	FreeBSD)
+		/usr/bin/tsort | tail -r
+		;;
 	*)
 		/usr/bin/tsort | tac
 		;;

tools/cpio/Makefile

@@ -12,6 +12,7 @@ SRCS+=		\
 		src/ib_getlin.c \
 		src/sfile.c \
 		src/gmatch.c \
+		src/sigset.c \
 		src/memalign.c
 
 SRCS+=		\

tools/cpio/src/cpio.c

@@ -49,7 +49,6 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <string.h>
 #include <unistd.h>
 #include <signal.h>

tools/cpio/src/ib_alloc.c

@@ -28,7 +28,6 @@
 #include	<string.h>
 #include	<errno.h>
 #include	<stdlib.h>
-#include	<malloc.h>
 
 #include	"memalign.h"
 #include	"iblok.h"