merge of bbe2ca73dbb6c79907ca7a1181ac42294641e6cf

     and da04e847a88d01afa85aa5baf10077864d9dc548

22 files changed, 113 insertions, 14 deletions

diff --git a/packages/ircp/ircp_0.3.bb b/packages/ircp/ircp_0.3.bb
index 7f65f0b870..1e17b87bed 100644
--- a/packages/ircp/ircp_0.3.bb
+++ b/packages/ircp/ircp_0.3.bb
@@ -1,7 +1,11 @@
 DEPENDS = "openobex"
 LICENSE = "GPL"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/ircp-${PV}.tar.gz"
 
+EXTRA_OECONF="--prefix=${D}"
+
+
 inherit autotools
 
diff --git a/packages/mdadm/mdadm.inc b/packages/mdadm/mdadm.inc
index 25a4a5ed1d..5b293b7a68 100644
--- a/packages/mdadm/mdadm.inc
+++ b/packages/mdadm/mdadm.inc
@@ -7,6 +7,9 @@ LICENSE = "GPL"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/${PN}-${PV}.tar.bz2"
 
+CFLAGS += "-fno-strict-aliasing"
+
+
 inherit autotools
 
 INHIBIT_AUTO_STAGE = "1"
diff --git a/packages/mdadm/mdadm_1.12.0.bb b/packages/mdadm/mdadm_1.12.0.bb
index f41b36fba9..9fa79120b7 100644
--- a/packages/mdadm/mdadm_1.12.0.bb
+++ b/packages/mdadm/mdadm_1.12.0.bb
@@ -1,4 +1,4 @@
 include mdadm.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI += " file://build_flags.patch;patch=1 "
diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb
index d4ee65abba..5acc6071d3 100644
--- a/packages/musicpd/mpd-alsa_0.11.5.bb
+++ b/packages/musicpd/mpd-alsa_0.11.5.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/multimedia"
 DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv"
 RDEPENDS = "libao-alsa"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
            file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"
@@ -19,7 +19,8 @@ INITSCRIPT_NAME = "mpd"
 # in staging - remove the --with and replace with --enable to use the local
 # versions.
 
-EXTRA_OECONF = "--enable-ogg \
+EXTRA_OECONF = "--prefix=${D} \
+		--enable-ogg \
 		--with-id3tag-libraries=${STAGING_LIBDIR} \
 		--with-id3tag-includes=${STAGING_INCDIR} \
 		--with-mad-libraries=${STAGING_LIBDIR} \
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
index a4ef4e9289..0d41cf3e0a 100644
--- a/packages/musicpd/mpd_0.11.5.bb
+++ b/packages/musicpd/mpd_0.11.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SECTION = "console/multimedia"
 DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
            file://save-volume-state.patch;patch=1"
@@ -16,7 +16,8 @@ inherit autotools
 # in staging - remove the --with and replace with --enable to use the local
 # versions.
 
-EXTRA_OECONF = "--enable-ogg \
+EXTRA_OECONF = "--prefix=${D} \
+		--enable-ogg \
 		--with-id3tag-libraries=${STAGING_LIBDIR} \
 		--with-id3tag-includes=${STAGING_INCDIR} \
 		--with-mad-libraries=${STAGING_LIBDIR} \
diff --git a/packages/mutt/mutt-1.5.4i/keymap.h.patch b/packages/mutt/mutt-1.5.4i/keymap.h.patch
new file mode 100644
index 0000000000..40995aa58f
--- /dev/null
+++ b/packages/mutt/mutt-1.5.4i/keymap.h.patch
@@ -0,0 +1,11 @@
+--- mutt-1.5.4/keymap.h.orig	2006-07-01 16:50:25.000000000 +0200
++++ mutt-1.5.4/keymap.h	2006-07-01 16:50:58.000000000 +0200
+@@ -19,6 +19,8 @@
+ #ifndef KEYMAP_H
+ #define KEYMAP_H
+ 
++#include "mapping.h"
++
+ /* maximal length of a key binding sequence used for buffer in km_bindkey */
+ #define MAX_SEQ 8
+ 
diff --git a/packages/mutt/mutt_1.5.4i.bb b/packages/mutt/mutt_1.5.4i.bb
index e6e90dfd1e..50c6019e21 100644
--- a/packages/mutt/mutt_1.5.4i.bb
+++ b/packages/mutt/mutt_1.5.4i.bb
@@ -7,6 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
+PR = "r1"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
 	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz;patch=1 \
 	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz;patch=1 \
@@ -14,6 +15,7 @@ SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
 	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.quote.gz;patch=1 \
 	   file://cppflags.patch;patch=1 \
 	   file://posix1_lim.patch;patch=1 \
+	   file://keymap.h.patch;patch=1 \
 	   file://configure.patch;patch=1"
 S = "${WORKDIR}/mutt-1.5.4"
 
diff --git a/packages/mutt/mutt_1.5.9i.bb b/packages/mutt/mutt_1.5.9i.bb
index c6939454d2..3192eb50f5 100644
--- a/packages/mutt/mutt_1.5.9i.bb
+++ b/packages/mutt/mutt_1.5.9i.bb
@@ -7,6 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
+PR = "r0"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
 	   http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.rr.compressed.gz;patch=1 \
 	   http://mutt.kiev.ua/download/mutt-1.5.9/patch-1.5.9.vvv.nntp.gz;patch=1 \
diff --git a/packages/radlib/files/.mtn2git_empty b/packages/radlib/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/radlib/files/.mtn2git_empty
diff --git a/packages/radlib/files/Makefile.am.patch b/packages/radlib/files/Makefile.am.patch
new file mode 100644
index 0000000000..e1e0e47c2c
--- /dev/null
+++ b/packages/radlib/files/Makefile.am.patch
@@ -0,0 +1,24 @@
+--- radlib-2.6.2/src/Makefile.am.orig	2006-07-01 18:56:09.000000000 +0200
++++ radlib-2.6.2/src/Makefile.am	2006-07-01 18:56:48.000000000 +0200
+@@ -14,8 +14,8 @@
+ 

+ if MYSQL

+ MY_INCLUDES 	= \

+-		-I$(prefix)/include/mysql \

+-		-I/usr/include/mysql

++		-I$(prefix)/include/mysql

++

+ MY_SOURCES  	= \

+ 		$(top_srcdir)/database/mysql/my_database.c \

+ 		$(top_srcdir)/src/raddatabase.c

+@@ -24,8 +24,8 @@
+ endif

+ if PGRESQL

+ PG_INCLUDES 	= \

+-		-I$(prefix)/include \

+-		-I/usr/include

++		-I$(prefix)/include

++

+ PG_SOURCES	= \

+ 		$(top_srcdir)/database/postgresql/pg_database.c \

+ 		$(top_srcdir)/src/raddatabase.c

diff --git a/packages/radlib/radlib-common.inc b/packages/radlib/radlib-common.inc
index 528515b2cd..ba0f6db019 100644
--- a/packages/radlib/radlib-common.inc
+++ b/packages/radlib/radlib-common.inc
@@ -4,7 +4,8 @@ DESCRIPTION = "radlib is a rapid application development library for unix interp
 MAINTAINER = "Mark Teel (mark@teel.ws)"
 HOMEPAGE = "http://www.radlib.teel.ws/"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/radlib/radlib-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/radlib/radlib-${PV}.tar.gz \
+	file://Makefile.am.patch;patch=1"
 
 S = "${WORKDIR}/radlib-${PV}"
 
diff --git a/packages/radlib/radlib-mysql_2.6.2.bb b/packages/radlib/radlib-mysql_2.6.2.bb
index 93375c8300..61b5b8c5ef 100644
--- a/packages/radlib/radlib-mysql_2.6.2.bb
+++ b/packages/radlib/radlib-mysql_2.6.2.bb
@@ -1,3 +1,3 @@
 include radlib-common.inc
 include radlib-mysql.inc
-PR = "r0"
+PR = "r1"
diff --git a/packages/radlib/radlib_2.6.2.bb b/packages/radlib/radlib_2.6.2.bb
index be5f2d0257..a123adc785 100644
--- a/packages/radlib/radlib_2.6.2.bb
+++ b/packages/radlib/radlib_2.6.2.bb
@@ -1,3 +1,3 @@
 include radlib-common.inc
 include radlib.inc
-PR = "r0"
+PR = "r1"
diff --git a/packages/radlib/x b/packages/radlib/x
new file mode 100644
index 0000000000..c27c3cae43
--- /dev/null
+++ b/packages/radlib/x
@@ -0,0 +1 @@
+	file://Makefile.am.patch;patch=1"
diff --git a/packages/wview/files/.mtn2git_empty b/packages/wview/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wview/files/.mtn2git_empty
diff --git a/packages/wview/files/Makefile.am.patch b/packages/wview/files/Makefile.am.patch
new file mode 100644
index 0000000000..1c35ee8c29
--- /dev/null
+++ b/packages/wview/files/Makefile.am.patch
@@ -0,0 +1,24 @@
+--- wview-3.1.3/wunderground/Makefile.am.orig	2006-07-01 18:28:45.000000000 +0200
++++ wview-3.1.3/wunderground/Makefile.am	2006-07-01 18:29:23.000000000 +0200
+@@ -9,8 +9,6 @@
+ INCLUDES = \
+ 		-I$(top_srcdir)/common \
+ 		-I$(prefix)/include \
+-		-I/usr/include \
+-		-I/usr/local/include \
+ 		-D_GNU_SOURCE \
+ 		-DBUILD_WVWUNDERGROUND
+ 
+@@ -36,10 +34,10 @@
+ endif
+ 
+ # define library directories
+-wvwunderd_LDFLAGS = -L/usr/lib -L/usr/local/lib -L$(prefix)/lib
++wvwunderd_LDFLAGS = -L$(prefix)/lib
+ 
+ if DB_MYSQL
+-wvwunderd_LDFLAGS += -L$(prefix)/lib/mysql -L/usr/lib/mysql
++wvwunderd_LDFLAGS += -L$(prefix)/lib/mysql
+ else
+ if DB_PGRESQL
+ wvwunderd_LDFLAGS += -L$(prefix)/lib -L$(prefix)/pgsql/lib
diff --git a/packages/wview/wview-common.inc b/packages/wview/wview-common.inc
index 0efeee271c..0df0707718 100644
--- a/packages/wview/wview-common.inc
+++ b/packages/wview/wview-common.inc
@@ -5,13 +5,14 @@ MAINTAINER = "Mark Teel (mark@teel.ws)"
 HOMEPAGE = "http://www.wviewweather.com/"
 DEPENDS += " bash util-linux gd openssl curl update-rc.d"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/wview/wview-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/wview/wview-${PV}.tar.gz \
+	file://Makefile.am.patch;patch=1"
 
 S = "${WORKDIR}/wview-${PV}"
 
 inherit autotools
 
-EXTRA_OECONF += " --enable-wunderground" 
+EXTRA_OECONF += "--prefix=${D} --enable-wunderground" 
 
 do_install_append() {
 	install -d ${D}/${sysconfdir}/init.d
diff --git a/packages/wview/wview-sim_3.1.3.bb b/packages/wview/wview-sim_3.1.3.bb
index 919e322f42..3f07aecc82 100644
--- a/packages/wview/wview-sim_3.1.3.bb
+++ b/packages/wview/wview-sim_3.1.3.bb
@@ -1,4 +1,4 @@
 include wview-common.inc
 include wview.inc
 EXTRA_OECONF += " --enable-station-sim"
-PR = "r0"
+PR = "r1"
diff --git a/packages/wview/wview-vpro_3.1.3.bb b/packages/wview/wview-vpro_3.1.3.bb
index 1933e077b5..4c84152f3b 100644
--- a/packages/wview/wview-vpro_3.1.3.bb
+++ b/packages/wview/wview-vpro_3.1.3.bb
@@ -1,4 +1,4 @@
 include wview-common.inc
 include wview.inc
 EXTRA_OECONF += " --enable-station-vpro"
-PR = "r0"
+PR = "r1"
diff --git a/packages/wview/wview-wxt510_3.1.3.bb b/packages/wview/wview-wxt510_3.1.3.bb
index b7b0ef236d..84f175f1d8 100644
--- a/packages/wview/wview-wxt510_3.1.3.bb
+++ b/packages/wview/wview-wxt510_3.1.3.bb
@@ -1,4 +1,4 @@
 include wview-common.inc
 include wview.inc
 EXTRA_OECONF += " --enable-station-wxt510"
-PR = "r0"
+PR = "r1"
diff --git a/packages/xinetd/xinetd/service.c.patch b/packages/xinetd/xinetd/service.c.patch
new file mode 100644
index 0000000000..b94ae2184f
--- /dev/null
+++ b/packages/xinetd/xinetd/service.c.patch
@@ -0,0 +1,24 @@
+--- xinetd-2.3.13/xinetd/service.c.orig	2006-07-01 19:14:23.000000000 +0200
++++ xinetd-2.3.13/xinetd/service.c	2006-07-01 19:22:28.000000000 +0200
+@@ -764,8 +764,8 @@
+                return FAILED;
+ 
+             if ( last == NULL ) {
+-               last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ) = 
+-		  SAIN( calloc( 1, sizeof(union xsockaddr) ) );
++               last = SAIN(calloc( 1, sizeof(union xsockaddr) ) );
++	       SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last;
+             }
+ 
+             (void) time( &current_time ) ;
+@@ -791,8 +791,8 @@
+                return FAILED;
+ 
+ 	    if( last == NULL ) {
+-               last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)) = 
+-		  SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
++               last = SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
++	       SVC_LAST_DGRAM_ADDR(sp) = (union xsockaddr *)last;
+             }
+ 
+             (void) time( &current_time ) ;
diff --git a/packages/xinetd/xinetd_2.3.13.bb b/packages/xinetd/xinetd_2.3.13.bb
index 699667cb26..4e67384d45 100644
--- a/packages/xinetd/xinetd_2.3.13.bb
+++ b/packages/xinetd/xinetd_2.3.13.bb
@@ -1,11 +1,12 @@
 DEPENDS = ""
 DESCRIPTION = "Highly configurable, modular and secure inetd"
 MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
-PR="r3"
+PR="r4"
 
 SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
 	  file://xinetd.init \
 	  file://xinetd.conf \
+	  file://service.c.patch;patch=1 \
 	  "
 
 EXTRA_OECONF="--disable-nls"