summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-07-01 17:08:25 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-01 17:08:25 +0000
commit57d4c4a48e139da14d04b096c000600f36389f77 (patch)
tree093a411214f846085458772f3bdc7f314ee0d8d3 /packages
parent5770cef667b87b1565d33331521c55a8c88c083c (diff)
parent0bc469ac999a2b4e50fe92cdb71bdc54695f6440 (diff)
merge of 889a2048fa859be73c244aeb31e982b29d624283
and a2b34b40d487e97340ef024b0d3bb91a7b8385b5
Diffstat (limited to 'packages')
-rw-r--r--packages/ircp/ircp_0.3.bb4
-rw-r--r--packages/mdadm/mdadm.inc3
-rw-r--r--packages/mdadm/mdadm_1.12.0.bb2
-rw-r--r--packages/mutt/mutt-1.5.4i/keymap.h.patch11
-rw-r--r--packages/mutt/mutt_1.5.4i.bb2
-rw-r--r--packages/mutt/mutt_1.5.9i.bb1
-rw-r--r--packages/radlib/files/.mtn2git_empty0
-rw-r--r--packages/radlib/files/Makefile.am.patch24
-rw-r--r--packages/radlib/radlib-common.inc3
-rw-r--r--packages/radlib/radlib-mysql_2.6.2.bb2
-rw-r--r--packages/radlib/radlib_2.6.2.bb2
-rw-r--r--packages/radlib/x1
-rw-r--r--packages/wview/files/.mtn2git_empty0
-rw-r--r--packages/wview/files/Makefile.am.patch24
-rw-r--r--packages/wview/wview-common.inc5
-rw-r--r--packages/wview/wview-sim_3.1.3.bb2
-rw-r--r--packages/wview/wview-vpro_3.1.3.bb2
-rw-r--r--packages/wview/wview-wxt510_3.1.3.bb2
18 files changed, 81 insertions, 9 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/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"