merge of '04d71b254a1cb165a6dab2688fc19c937e10afc5'

     and '3db1a7f8ffb636e2a0489fd213705447a66fd326'

4 files changed, 25 insertions, 56 deletions

diff --git a/packages/postgresql/postgresql.inc b/packages/postgresql/postgresql.inc
new file mode 100644
index 0000000000..36ec1187aa
--- /dev/null
+++ b/packages/postgresql/postgresql.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "PostgreSQL is a powerful, open source relational database system."
+HOMEPAGE = "http://www.postgresql.com"
+LICENSE = "BSD"
+DEPENDS = "zlib readline"
+
+#WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
+
+SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
+
+inherit autotools pkgconfig
+
+do_compile_append() {
+         cp /usr/sbin/zic ${S}/src/timezone/
+}
+
+FILES_${PN}-doc += "${prefix}/doc/"
diff --git a/packages/postgresql/postgresql_8.1.4.bb b/packages/postgresql/postgresql_8.1.4.bb
index 083fed5a21..27b067b5cb 100644
--- a/packages/postgresql/postgresql_8.1.4.bb
+++ b/packages/postgresql/postgresql_8.1.4.bb
@@ -1,20 +1,3 @@
-DESCRIPTION = "PostgreSQL is a powerful, open source relational database system."
-HOMEPAGE = "http://www.postgresql.com"
-LICENSE = "BSD"
-DEPENDS = "zlib readline"
-
-#WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
-
-SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
-
-
-inherit autotools pkgconfig
-
-FILES_${PN}-doc += "${prefix}/doc/"
-
-do_compile_append() {
-cp /usr/sbin/zic ${S}/src/timezone/
-}
-
-
+require postgresql.inc
 
+PR = "r1"
diff --git a/packages/postgresql/postgresql_8.1.8.bb b/packages/postgresql/postgresql_8.1.8.bb
index be44052437..27b067b5cb 100644
--- a/packages/postgresql/postgresql_8.1.8.bb
+++ b/packages/postgresql/postgresql_8.1.8.bb
@@ -1,20 +1,3 @@
-DESCRIPTION = "PostgreSQL is a powerful, open source relational database system."
-HOMEPAGE = "http://www.postgresql.com"
-LICENSE = "BSD"
-DEPENDS = "zlib readline"
-
-#WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
-
-SRC_URI = "ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v${PV}/${P}.tar.bz2"
-
-
-inherit autotools pkgconfig
-
-FILES_${PN}-doc += "${prefix}/doc/"
-
-do_compile_append() {
-cp /usr/sbin/zic ${S}/src/timezone/
-}
-
-
+require postgresql.inc
 
+PR = "r1"
diff --git a/packages/postgresql/postgresql_8.2.4.bb b/packages/postgresql/postgresql_8.2.4.bb
index 3f65a4fd0d..3dc8577c1c 100644
--- a/packages/postgresql/postgresql_8.2.4.bb
+++ b/packages/postgresql/postgresql_8.2.4.bb
@@ -1,20 +1,7 @@
-DESCRIPTION = "PostgreSQL is a powerful, open source relational database system."
-HOMEPAGE = "http://www.postgresql.com"
-LICENSE = "BSD"
-DEPENDS = "zlib readline"
-
-#WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
-
-SRC_URI = "ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v${PV}/${P}.tar.bz2 \
-	file://no-ecpg-test.patch;patch=1"
-
-
-inherit autotools pkgconfig
-
-FILES_${PN}-doc += "${prefix}/doc/"
-
-do_compile_append() {
-cp /usr/sbin/zic ${S}/src/timezone/
-}
+require postgresql.inc
 
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${P}.tar.bz2 \
+           file://no-ecpg-test.patch;patch=1"