summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-30 15:39:09 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-30 15:39:09 +0200
commit27767d6da4e2dfd2505adff10a88b404831f3f6d (patch)
tree7fcba7ee423e7bc425e4ac85ee3893e9ac777b17
parentdd50e3ad11a5c40e40c0238320332598ebb872e6 (diff)
parent6506a9625c772f787201532cc579c2652ad437c8 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/chillispot/patches/patch-Makefile178
-rw-r--r--package/chillispot/patches/patch-doc_Makefile178
-rw-r--r--package/chillispot/patches/patch-src_Makefile243
-rw-r--r--package/cxxtools/patches/patch-Makefile_in11
-rw-r--r--package/cxxtools/patches/patch-demo_Makefile_in67
-rw-r--r--package/dillo/Makefile1
-rw-r--r--package/firefox/Makefile1
-rw-r--r--package/firefox/patches/patch-configure15
-rw-r--r--package/freeglut/Makefile1
-rw-r--r--package/lvm/Makefile4
-rw-r--r--package/lvm/patches/patch-Makefile_in20
-rw-r--r--package/lvm/patches/patch-doc_Makefile_in14
-rw-r--r--package/lvm/patches/patch-libdm_Makefile_in75
-rw-r--r--package/lvm/patches/patch-make_tmpl_in28
-rw-r--r--package/lvm/patches/patch-scripts_Makefile_in12
-rw-r--r--package/lvm/patches/patch-tools_Makefile_in81
-rwxr-xr-xscripts/adkprepare.sh18
-rw-r--r--scripts/scan-pkgs.sh43
-rwxr-xr-xscripts/tsort4
19 files changed, 199 insertions, 795 deletions
diff --git a/package/chillispot/patches/patch-Makefile b/package/chillispot/patches/patch-Makefile
deleted file mode 100644
index e951e5931..000000000
--- a/package/chillispot/patches/patch-Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/Makefile 2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/Makefile 2009-05-21 20:42:08.000000000 +0200
-@@ -13,9 +13,9 @@
- # PARTICULAR PURPOSE.
-
-
--srcdir = .
--top_srcdir = .
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -33,8 +33,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/chillispot.spec.in \
- $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
-@@ -72,24 +72,24 @@ DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE =
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE =
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS =
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -99,19 +99,19 @@ ECHO_N = -n
- ECHO_T =
- EGREP = grep -E
- EXEEXT =
--F77 = f95
--FFLAGS = -g -O2
-+F77 =
-+FFLAGS =
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS =
--LIBOBJS =
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS = memcmp$U.o
- LIBS =
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS =
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS = memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -120,54 +120,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE =
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE =
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE =
-+ac_ct_AR =
-+ac_ct_CC =
-+ac_ct_CXX =
-+ac_ct_F77 =
-+ac_ct_RANLIB =
-+ac_ct_STRIP =
-+am__fastdepCC_FALSE =
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE =
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote =
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias =
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- 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/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+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
- SUBDIRS = src doc
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/package/chillispot/patches/patch-doc_Makefile b/package/chillispot/patches/patch-doc_Makefile
deleted file mode 100644
index a6290fc41..000000000
--- a/package/chillispot/patches/patch-doc_Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/doc/Makefile 2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/doc/Makefile 2009-05-21 20:42:08.000000000 +0200
-@@ -13,9 +13,9 @@
- # PARTICULAR PURPOSE.
-
-
--srcdir = .
--top_srcdir = ..
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/doc
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -33,8 +33,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- subdir = doc
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -51,24 +51,24 @@ am__installdirs = "$(DESTDIR)$(man8dir)"
- NROFF = nroff
- MANS = $(man_MANS)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE =
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE =
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS =
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -78,19 +78,19 @@ ECHO_N = -n
- ECHO_T =
- EGREP = grep -E
- EXEEXT =
--F77 = f95
--FFLAGS = -g -O2
-+F77 =
-+FFLAGS =
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS =
--LIBOBJS =
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS = memcmp$U.o
- LIBS =
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS =
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS = memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -99,54 +99,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE =
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE =
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE =
-+ac_ct_AR =
-+ac_ct_CC =
-+ac_ct_CXX =
-+ac_ct_F77 =
-+ac_ct_RANLIB =
-+ac_ct_STRIP =
-+am__fastdepCC_FALSE =
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE =
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote =
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias =
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- 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/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+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
- man_MANS = chilli.8
- man_aux = $(man_MANS:.1=.x)
- EXTRA_DIST = $(man_MANS)
diff --git a/package/chillispot/patches/patch-src_Makefile b/package/chillispot/patches/patch-src_Makefile
deleted file mode 100644
index 975e6623e..000000000
--- a/package/chillispot/patches/patch-src_Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- chillispot-1.1.0.orig/src/Makefile 2006-09-24 21:35:16.000000000 +0200
-+++ chillispot-1.1.0/src/Makefile 2009-05-21 20:42:08.000000000 +0200
-@@ -16,9 +16,9 @@
-
- SOURCES = $(chilli_SOURCES)
-
--srcdir = .
--top_srcdir = ..
--
-+srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
-+top_srcdir = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0
-+VPATH = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/src
- pkgdatadir = $(datadir)/chillispot
- pkglibdir = $(libdir)/chillispot
- pkgincludedir = $(includedir)/chillispot
-@@ -36,8 +36,8 @@ POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--build_triplet = i686-pc-linux-gnu
--host_triplet = i686-pc-linux-gnu
-+build_triplet = x86_64-pc-linux-gnu
-+host_triplet = i586-pc-linux-gnu
- sbin_PROGRAMS = chilli$(EXEEXT)
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -73,24 +73,24 @@ DIST_SOURCES = $(chilli_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--ACLOCAL = ${SHELL} /home/jj/chillispot/missing --run aclocal-1.9
--AMDEP_FALSE = #
--AMDEP_TRUE =
--AMTAR = ${SHELL} /home/jj/chillispot/missing --run tar
--AR = ar
--AUTOCONF = ${SHELL} /home/jj/chillispot/missing --run autoconf
--AUTOHEADER = ${SHELL} /home/jj/chillispot/missing --run autoheader
--AUTOMAKE = ${SHELL} /home/jj/chillispot/missing --run automake-1.9
-+ACLOCAL = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run aclocal-1.9
-+AMDEP_FALSE =
-+AMDEP_TRUE = #
-+AMTAR = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run tar
-+AR = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ar
-+AUTOCONF = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoconf
-+AUTOHEADER = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run autoheader
-+AUTOMAKE = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run automake-1.9
- AWK = gawk
--CC = gcc
--CCDEPMODE = depmode=gcc3
--CFLAGS = -g -O2
--CPP = gcc -E
--CPPFLAGS =
--CXX = g++
--CXXCPP = g++ -E
--CXXDEPMODE = depmode=gcc3
--CXXFLAGS = -g -O2
-+CC = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc
-+CCDEPMODE = depmode=none
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
-+CPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-gcc -E
-+CPPFLAGS = -I/home/wbx/openadk/cross_i586/target/usr/include -DNDEBUG
-+CXX = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++
-+CXXCPP = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-g++ -E
-+CXXDEPMODE = depmode=none
-+CXXFLAGS = -fwrapv -fno-ident -Os -pipe -march=geode -fomit-frame-pointer
- CYGPATH_W = echo
- DEFS = -DHAVE_CONFIG_H
- DEPDIR = .deps
-@@ -100,19 +100,19 @@ ECHO_N = -n
- ECHO_T =
- EGREP = grep -E
- EXEEXT =
--F77 = f95
--FFLAGS = -g -O2
-+F77 =
-+FFLAGS =
- INSTALL_DATA = ${INSTALL} -m 644
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_SCRIPT = ${INSTALL}
- INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
--LDFLAGS =
--LIBOBJS =
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_i586/target/usr/lib -L/home/wbx/openadk/cross_i586/target/lib -L/home/wbx/openadk/cross_i586/target/usr/lib
-+LIBOBJS = memcmp$U.o
- LIBS =
- LIBTOOL = $(SHELL) $(top_builddir)/libtool
- LN_S = ln -s
--LTLIBOBJS =
--MAKEINFO = ${SHELL} /home/jj/chillispot/missing --run makeinfo
-+LTLIBOBJS = memcmp$U.lo
-+MAKEINFO = ${SHELL} /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/missing --run makeinfo
- OBJEXT = o
- PACKAGE = chillispot
- PACKAGE_BUGREPORT = bugs@chillispot.org
-@@ -121,54 +121,54 @@ PACKAGE_STRING = chillispot 1.1.0
- PACKAGE_TARNAME = chillispot
- PACKAGE_VERSION = 1.1.0
- PATH_SEPARATOR = :
--RANLIB = ranlib
-+RANLIB = /home/wbx/openadk/cross_i586/host/bin/i586-linux-uclibc-ranlib
- SET_MAKE =
--SHELL = /bin/sh
--STRIP = strip
-+SHELL = /bin/bash
-+STRIP = i586-linux-strip
- VERSION = 1.1.0
--ac_ct_AR = ar
--ac_ct_CC = gcc
--ac_ct_CXX = g++
--ac_ct_F77 = f95
--ac_ct_RANLIB = ranlib
--ac_ct_STRIP = strip
--am__fastdepCC_FALSE = #
--am__fastdepCC_TRUE =
--am__fastdepCXX_FALSE = #
--am__fastdepCXX_TRUE =
-+ac_ct_AR =
-+ac_ct_CC =
-+ac_ct_CXX =
-+ac_ct_F77 =
-+ac_ct_RANLIB =
-+ac_ct_STRIP =
-+am__fastdepCC_FALSE =
-+am__fastdepCC_TRUE = #
-+am__fastdepCXX_FALSE =
-+am__fastdepCXX_TRUE = #
- am__include = include
- am__leading_dot = .
- am__quote =
- am__tar = ${AMTAR} chof - "$$tardir"
- am__untar = ${AMTAR} xf -
- bindir = ${exec_prefix}/bin
--build = i686-pc-linux-gnu
--build_alias =
--build_cpu = i686
-+build = x86_64-pc-linux-gnu
-+build_alias = x86_64-linux-gnu
-+build_cpu = x86_64
- 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/jj/chillispot/install-sh
-+install_sh = /home/wbx/openadk/build_i586/w-chillispot-1.1.0-1/chillispot-1.1.0/install-sh
- libdir = ${exec_prefix}/lib
--libexecdir = ${exec_prefix}/libexec
--localstatedir = ${prefix}/var
--mandir = ${prefix}/man
-+libexecdir = /usr/sbin
-+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
-
- # add -pg to enable gprof
- AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -DSBINDIR='"$(sbindir)"'
-@@ -244,38 +244,38 @@ mostlyclean-compile:
- distclean-compile:
- -rm -f *.tab.c
-
--include ./$(DEPDIR)/chilli.Po
--include ./$(DEPDIR)/cmdline.Po
--include ./$(DEPDIR)/dhcp.Po
--include ./$(DEPDIR)/iphash.Po
--include ./$(DEPDIR)/ippool.Po
--include ./$(DEPDIR)/lookup.Po
--include ./$(DEPDIR)/md5.Po
--include ./$(DEPDIR)/radius.Po
--include ./$(DEPDIR)/redir.Po
--include ./$(DEPDIR)/syserr.Po
--include ./$(DEPDIR)/tun.Po
-+#include ./$(DEPDIR)/chilli.Po
-+#include ./$(DEPDIR)/cmdline.Po
-+#include ./$(DEPDIR)/dhcp.Po
-+#include ./$(DEPDIR)/iphash.Po
-+#include ./$(DEPDIR)/ippool.Po
-+#include ./$(DEPDIR)/lookup.Po
-+#include ./$(DEPDIR)/md5.Po
-+#include ./$(DEPDIR)/radius.Po
-+#include ./$(DEPDIR)/redir.Po
-+#include ./$(DEPDIR)/syserr.Po
-+#include ./$(DEPDIR)/tun.Po
-
- .c.o:
-- if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--# source='$<' object='$@' libtool=no \
--# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--# $(COMPILE) -c $<
-+# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+# source='$<' object='$@' libtool=no
-+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
-+ $(COMPILE) -c $<
-
- .c.obj:
-- if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--# source='$<' object='$@' libtool=no \
--# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--# $(COMPILE) -c `$(CYGPATH_W) '$<'`
-+# if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+# source='$<' object='$@' libtool=no
-+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
-+ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
--# source='$<' object='$@' libtool=yes \
--# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
--# $(LTCOMPILE) -c -o $@ $<
-+# if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+# then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+# source='$<' object='$@' libtool=yes
-+# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp)
-+ $(LTCOMPILE) -c -o $@ $<
-
- mostlyclean-libtool:
- -rm -f *.lo
diff --git a/package/cxxtools/patches/patch-Makefile_in b/package/cxxtools/patches/patch-Makefile_in
deleted file mode 100644
index d0936ae5d..000000000
--- a/package/cxxtools/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- cxxtools-1.4.8.orig/Makefile.in 2008-05-26 19:51:34.000000000 +0200
-+++ cxxtools-1.4.8/Makefile.in 2009-11-19 22:10:18.000000000 +0100
-@@ -200,7 +200,7 @@ subdirs = @subdirs@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = src include demo
-+SUBDIRS = src include
- bin_SCRIPTS = cxxtools-config
- EXTRA_dist = \
- m4/acx_pthread.m4 \
diff --git a/package/cxxtools/patches/patch-demo_Makefile_in b/package/cxxtools/patches/patch-demo_Makefile_in
deleted file mode 100644
index 0fcb3bca3..000000000
--- a/package/cxxtools/patches/patch-demo_Makefile_in
+++ /dev/null
@@ -1,67 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- cxxtools-1.4.8.orig/demo/Makefile.in 2008-05-26 19:51:34.000000000 +0200
-+++ cxxtools-1.4.8/demo/Makefile.in 2009-04-28 22:29:02.476545131 +0200
-@@ -40,7 +40,7 @@ host_triplet = @host@
- noinst_PROGRAMS = arg$(EXEEXT) arg-set$(EXEEXT) cgi$(EXEEXT) \
- dir$(EXEEXT) dlloader$(EXEEXT) dynbuffer$(EXEEXT) \
- getini$(EXEEXT) hd$(EXEEXT) httprequest$(EXEEXT) \
-- iconv$(EXEEXT) log$(EXEEXT) logbench$(EXEEXT) logsh$(EXEEXT) \
-+ log$(EXEEXT) logbench$(EXEEXT) logsh$(EXEEXT) \
- md5sum$(EXEEXT) mime$(EXEEXT) multifstream$(EXEEXT) \
- netcat$(EXEEXT) netio$(EXEEXT) netmsg$(EXEEXT) \
- pipestream$(EXEEXT) pool$(EXEEXT) signals$(EXEEXT) \
-@@ -96,10 +96,6 @@ am_httprequest_OBJECTS = httprequest.$(O
- httprequest_OBJECTS = $(am_httprequest_OBJECTS)
- httprequest_LDADD = $(LDADD)
- httprequest_DEPENDENCIES = $(top_builddir)/src/libcxxtools.la
--am_iconv_OBJECTS = iconv.$(OBJEXT)
--iconv_OBJECTS = $(am_iconv_OBJECTS)
--iconv_LDADD = $(LDADD)
--iconv_DEPENDENCIES = $(top_builddir)/src/libcxxtools.la
- am_log_OBJECTS = log.$(OBJEXT)
- log_OBJECTS = $(am_log_OBJECTS)
- log_LDADD = $(LDADD)
-@@ -170,7 +166,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX --mode=li
- SOURCES = $(arg_SOURCES) $(arg_set_SOURCES) $(cgi_SOURCES) \
- $(cxxlog_SOURCES) $(dir_SOURCES) $(dlloader_SOURCES) \
- $(dynbuffer_SOURCES) $(getini_SOURCES) $(hd_SOURCES) \
-- $(httprequest_SOURCES) $(iconv_SOURCES) $(log_SOURCES) \
-+ $(httprequest_SOURCES) $(log_SOURCES) \
- $(logbench_SOURCES) $(logsh_SOURCES) $(md5sum_SOURCES) \
- $(mime_SOURCES) $(multifstream_SOURCES) $(netcat_SOURCES) \
- $(netio_SOURCES) $(netmsg_SOURCES) $(pipestream_SOURCES) \
-@@ -179,7 +175,7 @@ SOURCES = $(arg_SOURCES) $(arg_set_SOURC
- DIST_SOURCES = $(arg_SOURCES) $(arg_set_SOURCES) $(cgi_SOURCES) \
- $(cxxlog_SOURCES) $(dir_SOURCES) $(dlloader_SOURCES) \
- $(dynbuffer_SOURCES) $(getini_SOURCES) $(hd_SOURCES) \
-- $(httprequest_SOURCES) $(iconv_SOURCES) $(log_SOURCES) \
-+ $(httprequest_SOURCES) $(log_SOURCES) \
- $(logbench_SOURCES) $(logsh_SOURCES) $(md5sum_SOURCES) \
- $(mime_SOURCES) $(multifstream_SOURCES) $(netcat_SOURCES) \
- $(netio_SOURCES) $(netmsg_SOURCES) $(pipestream_SOURCES) \
-@@ -319,7 +315,6 @@ dynbuffer_SOURCES = dynbuffer.cpp
- getini_SOURCES = getini.cpp
- hd_SOURCES = hd.cpp
- httprequest_SOURCES = httprequest.cpp
--iconv_SOURCES = iconv.cpp
- log_SOURCES = log.cpp
- logbench_SOURCES = logbench.cpp
- logsh_SOURCES = logsh.cpp
-@@ -415,9 +410,6 @@ hd$(EXEEXT): $(hd_OBJECTS) $(hd_DEPENDEN
- httprequest$(EXEEXT): $(httprequest_OBJECTS) $(httprequest_DEPENDENCIES)
- @rm -f httprequest$(EXEEXT)
- $(CXXLINK) $(httprequest_LDFLAGS) $(httprequest_OBJECTS) $(httprequest_LDADD) $(LIBS)
--iconv$(EXEEXT): $(iconv_OBJECTS) $(iconv_DEPENDENCIES)
-- @rm -f iconv$(EXEEXT)
-- $(CXXLINK) $(iconv_LDFLAGS) $(iconv_OBJECTS) $(iconv_LDADD) $(LIBS)
- log$(EXEEXT): $(log_OBJECTS) $(log_DEPENDENCIES)
- @rm -f log$(EXEEXT)
- $(CXXLINK) $(log_LDFLAGS) $(log_OBJECTS) $(log_LDADD) $(LIBS)
-@@ -477,7 +469,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getini.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httprequest.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iconv.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logbench.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logsh.Po@am__quote@
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 59f0ac281..5f39f9c79 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -17,6 +17,7 @@ PKG_SITES:= http://www.dillo.org/download/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+PKG_TARGET_DEPENDS:= ibmx40 lemote
PKG_HOST_DEPENDS:= !cygwin
include $(TOPDIR)/mk/package.mk
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 3280d711b..54e62d6b1 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/package/freeglut/Makefile b/package/freeglut/Makefile
index 6d5bdb921..a3585b620 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -13,6 +13,7 @@ PKG_BUILDDEP+= MesaLib
PKG_URL:= http://freeglut.sourceforge.net/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=freeglut/}
+PKG_TARGET_DEPENDS:= ibmx40 lemote
PKG_HOST_DEPENDS:= !cygwin
include $(TOPDIR)/mk/package.mk
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 06e53c8d2..c7d2a4ee6 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= lvm
-PKG_VERSION:= 2.02.62
+PKG_VERSION:= 2.02.72
PKG_RELEASE:= 1
-PKG_MD5SUM:= 72e3d66dc42aaf67dca475196a113528
+PKG_MD5SUM:= a7d0d1235a589869bd13cde0f0d7375d
PKG_DESCR:= logical volume management
PKG_SECTION:= fs
PKG_DEPENDS:= libdevmapper libncurses
diff --git a/package/lvm/patches/patch-Makefile_in b/package/lvm/patches/patch-Makefile_in
deleted file mode 100644
index fd15b0060..000000000
--- a/package/lvm/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- LVM2.2.02.61.orig/Makefile.in 2009-10-02 21:10:31.000000000 +0200
-+++ LVM2.2.02.61/Makefile.in 2010-03-03 19:43:58.976123551 +0100
-@@ -17,7 +17,7 @@ top_srcdir = @top_srcdir@
- top_builddir = @top_builddir@
- VPATH = @srcdir@
-
--SUBDIRS = doc include man scripts
-+SUBDIRS = include
-
- ifeq ("@UDEV_RULES@", "yes")
- SUBDIRS += udev
-@@ -64,7 +64,7 @@ po: tools daemons
- libdm.device-mapper: include.device-mapper
- daemons.device-mapper: libdm.device-mapper
- tools.device-mapper: libdm.device-mapper
--device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
-+device-mapper: tools.device-mapper daemons.device-mapper
-
- ifeq ("@INTL@", "yes")
- lib.pofile: include.pofile
diff --git a/package/lvm/patches/patch-doc_Makefile_in b/package/lvm/patches/patch-doc_Makefile_in
new file mode 100644
index 000000000..0f5ca59fc
--- /dev/null
+++ b/package/lvm/patches/patch-doc_Makefile_in
@@ -0,0 +1,14 @@
+--- LVM2.2.02.72.orig/doc/Makefile.in Thu May 20 13:45:57 2010
++++ LVM2.2.02.72/doc/Makefile.in Fri Jul 30 09:23:26 2010
+@@ -22,8 +22,9 @@ include $(top_builddir)/make.tmpl
+
+ install_lvm2: $(CONFSRC)
+ @if [ ! -e $(confdir)/$(CONFDEST) ]; then \
+- echo "$(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST)"; \
+- $(INSTALL_WDATA) -D $< $(confdir)/$(CONFDEST); \
++ echo "$(INSTALL_WDATA) $< $(confdir)/$(CONFDEST)"; \
++ $(INSTALL_DIR) $(confdir); \
++ $(INSTALL_WDATA) $< $(confdir)/$(CONFDEST); \
+ fi
+
+ install: install_lvm2
diff --git a/package/lvm/patches/patch-libdm_Makefile_in b/package/lvm/patches/patch-libdm_Makefile_in
index 52a52a0fd..9a999133b 100644
--- a/package/lvm/patches/patch-libdm_Makefile_in
+++ b/package/lvm/patches/patch-libdm_Makefile_in
@@ -1,60 +1,51 @@
---- LVM2.2.02.61.orig/libdm/Makefile.in 2009-10-02 21:10:36.000000000 +0200
-+++ LVM2.2.02.61/libdm/Makefile.in 2010-03-08 06:27:03.000000000 +0100
-@@ -35,9 +35,7 @@ SOURCES =\
+--- LVM2.2.02.72.orig/libdm/Makefile.in Fri Jun 25 20:17:39 2010
++++ LVM2.2.02.72/libdm/Makefile.in Fri Jul 30 10:34:15 2010
+@@ -34,10 +34,7 @@ SOURCES =\
INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
-ifeq ("@STATIC_LINK@", "yes")
LIB_STATIC = $(interface)/libdevmapper.a
-endif
-
- ifeq ("@LIB_SUFFIX@","dylib")
- LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -60,9 +58,7 @@ device-mapper: all
+-
+ LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
+ LIB_VERSION = $(LIB_VERSION_DM)
+ TARGETS += libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION)
+@@ -65,11 +62,8 @@ libdevmapper.$(LIB_SUFFIX) libdevmapper.$(LIB_SUFFIX).
+ install_pkgconfig
INSTALL_TYPE = install_dynamic
++INSTALL_TYPE += install_static
-ifeq ("@STATIC_LINK@", "yes")
- INSTALL_TYPE += install_static
-endif
-+INSTALL_TYPE += install_static
-
+-
ifeq ("@PKGCONFIG@", "yes")
INSTALL_TYPE += install_pkgconfig
-@@ -73,26 +69,32 @@ install: $(INSTALL_TYPE) install_include
+ endif
+@@ -79,7 +73,8 @@ install: $(INSTALL_TYPE) install_include
install_device-mapper: install
- install_include:
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
-+ $(INSTALL) -d $(includedir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/libdevmapper.h \
- $(includedir)/libdevmapper.h
+ install_include: $(srcdir)/libdevmapper.h
+- $(INSTALL_DATA) -D $< $(includedir)/$(<F)
++ $(INSTALL_DIR) $(includedir)
++ $(INSTALL_DATA) $< $(includedir)/$(<F)
install_dynamic: install_@interface@
-+ $(INSTALL) -d $(libdir)
- $(LN_S) -f libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM) \
- $(libdir)/libdevmapper.$(LIB_SUFFIX)
-
- install_static: install_@interface@_static
-+ $(INSTALL) -d $(libdir)
- $(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
-
- install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
-
- install_pkgconfig:
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
-+ $(INSTALL) -d $(usrlibdir)/pkgconfig
-+ $(INSTALL) $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
- $(usrlibdir)/pkgconfig/devmapper.pc
-
- install_ioctl_static: ioctl/libdevmapper.a
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
-
- $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
+
+@@ -88,10 +83,12 @@ install_static: install_@interface@_static
+ install_ioctl: install_lib_shared
+
+ install_pkgconfig: libdevmapper.pc
+- $(INSTALL_DATA) -D $< $(pkgconfigdir)/devmapper.pc
++ $(INSTALL_DIR) $(pkgconfigdir)
++ $(INSTALL_DATA) $< $(pkgconfigdir)/devmapper.pc
+
+ install_ioctl_static: $(LIB_STATIC)
+- $(INSTALL_DATA) -D $< $(usrlibdir)/$(<F)
++ $(INSTALL_DIR) $(usrlibdir)
++ $(INSTALL_DATA) $< $(usrlibdir)/$(<F)
+
+ CLEAN_TARGETS += ioctl/libdevmapper.a
+ DISTCLEAN_TARGETS += libdevmapper.pc
diff --git a/package/lvm/patches/patch-make_tmpl_in b/package/lvm/patches/patch-make_tmpl_in
new file mode 100644
index 000000000..7ffbb36b5
--- /dev/null
+++ b/package/lvm/patches/patch-make_tmpl_in
@@ -0,0 +1,28 @@
+--- LVM2.2.02.72.orig/make.tmpl.in Tue Jul 20 16:38:44 2010
++++ LVM2.2.02.72/make.tmpl.in Fri Jul 30 10:22:54 2010
+@@ -312,7 +312,8 @@ $(LIB_SHARED): $(LIB_SHARED).$(LIB_VERSION)
+ $(LN_S) -f $(<F) $@
+
+ install_lib_shared: $(LIB_SHARED)
+- $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
++ $(INSTALL_DIR) $(libdir)
++ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
+ $(INSTALL_DIR) $(usrlibdir)
+ $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
+
+@@ -320,11 +321,13 @@ install_lib_shared: $(LIB_SHARED)
+ # and for compatibility links in libdir are created
+ # when the code is fixed links could be removed.
+ install_dm_plugin: $(LIB_SHARED)
+- $(INSTALL_PROGRAM) -D $< $(libdir)/device-mapper/$(<F)
++ $(INSTALL_DIR) $(libdir)
++ $(INSTALL_PROGRAM) $< $(libdir)/device-mapper/$(<F)
+ $(LN_S) -f device-mapper/$(<F) $(libdir)/$(<F)
+
+ install_lvm2_plugin: $(LIB_SHARED)
+- $(INSTALL_PROGRAM) -D $< $(libdir)/lvm2/$(<F)
++ $(INSTALL_DIR) $(libdir)
++ $(INSTALL_PROGRAM) $< $(libdir)/lvm2/$(<F)
+ $(LN_S) -f lvm2/$(<F) $(libdir)/$(<F)
+ $(LN_S) -f $(<F) $(libdir)/$(<F).$(LIB_VERSION)
+ endif
diff --git a/package/lvm/patches/patch-scripts_Makefile_in b/package/lvm/patches/patch-scripts_Makefile_in
new file mode 100644
index 000000000..1886a1930
--- /dev/null
+++ b/package/lvm/patches/patch-scripts_Makefile_in
@@ -0,0 +1,12 @@
+--- LVM2.2.02.72.orig/scripts/Makefile.in Thu May 20 16:45:17 2010
++++ LVM2.2.02.72/scripts/Makefile.in Fri Jul 30 09:26:25 2010
+@@ -25,7 +25,8 @@ endif
+ vpath %.sh $(srcdir)
+
+ %_install: %.sh
+- $(INSTALL_PROGRAM) -D $< $(sbindir)/$(basename $(<F))
++ $(INSTALL_DIR) $(sbindir)
++ $(INSTALL_PROGRAM) $< $(sbindir)/$(basename $(<F))
+
+ install_lvm2: $(SCRIPTS:.sh=_install)
+
diff --git a/package/lvm/patches/patch-tools_Makefile_in b/package/lvm/patches/patch-tools_Makefile_in
index ae6fcbf8f..81b1efc97 100644
--- a/package/lvm/patches/patch-tools_Makefile_in
+++ b/package/lvm/patches/patch-tools_Makefile_in
@@ -1,55 +1,58 @@
---- LVM2.2.02.61.orig/tools/Makefile.in 2010-01-19 02:10:47.000000000 +0100
-+++ LVM2.2.02.61/tools/Makefile.in 2010-03-03 19:46:06.396138753 +0100
-@@ -165,21 +165,26 @@ cflow: lvm.cflow lvm.xref lvm.tree lvm.r
- endif
+--- LVM2.2.02.72.orig/tools/Makefile.in Fri Jun 25 20:23:10 2010
++++ LVM2.2.02.72/tools/Makefile.in Fri Jul 30 10:13:24 2010
+@@ -157,7 +157,7 @@ liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION): liblvm2cmd.$(
+
+ .commands: $(srcdir)/commands.h $(srcdir)/cmdnames.h Makefile
+ $(CC) -E -P $(srcdir)/cmdnames.h 2> /dev/null | \
+- egrep -v '^ *(|#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
++ egrep -v '^ *(#.*|dumpconfig|formats|help|pvdata|segtypes|version) *$$' > .commands
+
+ ifneq ("$(CFLOW_CMD)", "")
+ CFLOW_SOURCES = $(addprefix $(srcdir)/, $(SOURCES))
+@@ -170,18 +170,22 @@ endif
+ install_dmsetup_dynamic install_dmsetup_static
+
+ install_cmdlib_include: $(srcdir)/lvm2cmd.h
+- $(INSTALL_DATA) -D $< $(includedir)/$(<F)
++ $(INSTALL_DIR) $(includedir)
++ $(INSTALL_DATA) $< $(includedir)/$(<F)
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION)
- $(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
-+ $(INSTALL) -d $(includedir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
- $(includedir)/lvm2cmd.h
+- $(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
++ $(INSTALL_DIR) $(libdir)
++ $(INSTALL_PROGRAM) $< $(libdir)/$(<F).$(LIB_VERSION)
+ $(INSTALL_DIR) $(usrlibdir)
+ $(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
install_cmdlib_static: liblvm2cmd-static.a
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+ $(INSTALL) -d $(libdir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(libdir)/liblvm2cmd.a.$(LIB_VERSION)
- $(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
-+ $(INSTALL) -d $(includedir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 444 $(srcdir)/lvm2cmd.h \
- $(includedir)/lvm2cmd.h
+- $(INSTALL_DATA) -D $< $(usrlibdir)/liblvm2cmd.a
++ $(INSTALL_DIR) $(usrlibdir)
++ $(INSTALL_DATA) $< $(usrlibdir)/liblvm2cmd.a
install_tools_dynamic: lvm .commands
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
-+ $(INSTALL) -d $(sbindir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
- $(sbindir)/lvm
+- $(INSTALL_PROGRAM) -D lvm $(sbindir)/lvm
++ $(INSTALL_DIR) $(sbindir)
++ $(INSTALL_PROGRAM) lvm $(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
- @( \
-@@ -190,14 +195,17 @@ install_tools_dynamic: lvm .commands
- )
+ @for v in `cat .commands`; do \
+ echo "$(LN_S) -f lvm $(sbindir)/$$v"; \
+@@ -189,13 +193,16 @@ install_tools_dynamic: lvm .commands
+ done;
install_tools_static: lvm.static
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
-+ $(INSTALL) -d $(sbindir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
- $(staticdir)/lvm.static
+- $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
++ $(INSTALL_DIR) $(staticdir)
++ $(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
install_dmsetup_dynamic: dmsetup
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
-+ $(INSTALL) -d $(sbindir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+- $(INSTALL_PROGRAM) -D $< $(sbindir)/$(<F)
++ $(INSTALL_DIR) $(sbindir)
++ $(INSTALL_PROGRAM) $< $(sbindir)/$(<F)
install_dmsetup_static: dmsetup.static
-- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
-+ $(INSTALL) -d $(sbindir)
-+ $(INSTALL) $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
+- $(INSTALL_PROGRAM) -D $< $(staticdir)/$(<F)
++ $(INSTALL_DIR) $(staticdir)
++ $(INSTALL_PROGRAM) $< $(staticdir)/$(<F)
install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh
index 5faaed56e..168938952 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,10 +63,13 @@ netbsd() {
pkg_add -vu gtar
pkg_add -vu gsed
pkg_add -vu gawk
+ pkg_add -vu gperf
}
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,11 +77,12 @@ netbsd_full() {
pkg_add -vu bison
pkg_add -vu libIDL
pkg_add -vu xkbcomp
+ pkg_add -vu python26
}
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() {
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index f08ee812a..303935a9b 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"
@@ -36,6 +35,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
@@ -55,8 +55,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 +146,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 +241,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
@@ -241,4 +255,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
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
;;
*)