postgresql: fix packaging and staging for 8.1.x

* modular packaging for lib, seperate client from server
* NOTE: 8.2.x and 8.3.x may have different header file location

4 files changed, 58 insertions, 3 deletions

diff --git a/packages/postgresql/postgresql.inc b/packages/postgresql/postgresql.inc
index 36ec1187aa..9f1335b2bd 100644
--- a/packages/postgresql/postgresql.inc
+++ b/packages/postgresql/postgresql.inc
@@ -7,10 +7,65 @@ DEPENDS = "zlib readline"
 
 SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
 
+LEAD_SONAME = "libpq.so"
+
 inherit autotools pkgconfig
 
 do_compile_append() {
          cp /usr/sbin/zic ${S}/src/timezone/
 }
 
+do_stage() {
+         autotools_stage_includes
+         
+         mkdir -p ${STAGING_LIBDIR}/pgsql
+         oe_libinstall -a -so -C src/interfaces/libpq libpq ${STAGING_LIBDIR}/pgsql
+
+         oe_libinstall -a -so -C src/interfaces/ecpg/ecpglib libecpg ${STAGING_LIBDIR}
+         oe_libinstall -a -so -C src/interfaces/ecpg/compatlib libecpg_compat ${STAGING_LIBDIR}
+         oe_libinstall -a -so -C src/interfaces/ecpg/pgtypeslib libpgtypes ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "${PN}-client ${PN}-server-dev ${PN}-timezone \
+             libecpg-compat-dbg libecpg-compat \
+             libecpg-dbg libecpg libecpg-dev \
+             libpq-dbg libpq libpq-dev \ 
+             libpgtypes-dbg libpgtypes "
+
+FILES_${PN}-client = "${bindir}/clusterdb \
+                ${bindir}/createdb \
+                ${bindir}/createlang \
+                ${bindir}/createuser \
+                ${bindir}/dropdb \
+                ${bindir}/droplang \
+                ${bindir}/dropuser \
+                ${bindir}/pg_dump \
+                ${bindir}/pg_dumpall \
+                ${bindir}/pg_restore \
+                ${bindir}/psql \
+                ${bindir}/reindexdb \
+                ${bindir}/vacuumdb \
+                ${bindir}/vacuumlo \
+                ${datadir}/${PN}/psqlrc.sample"
+
 FILES_${PN}-doc += "${prefix}/doc/"
+FILES_${PN}-timezone = "${datadir}/${PN}/timezone"
+FILES_${PN}-server-dev = "${includedir}/${PN}/server"
+
+FILES_libecpg = "${libdir}/libecpg*.so.*"
+FILES_libecpg-dbg = "${libdir}/.debug/libecpg*"
+FILES_libecpg-dev = "${libdir}/libecpg*.a ${libdir}/libecpg*.so \
+                     ${libdir}/libpgtypes*.a ${libdir}/libpgtypes*.so \
+                     ${includedir}/ecpg*.h ${includedir}/${PN}/ecpg*.h \
+                     ${includedir}/pgtypes*.h ${includedir}/${PN}/informix \
+                     ${includedir}/sql3types.h ${includedir}/sqlca.h"
+
+FILES_libpq = "${libdir}/libpq*.so.*"
+FILES_libpq-dbg = "${libdir}/.debug/libpq*"
+FILES_libpq-dev = "${libdir}/libpq*.a ${libdir}/libpq*.so ${libdir}/libpgport.a \
+                   ${includedir}"
+
+FILES_libecpg-compat = "${libdir}/libecpg_compat*.so.*"
+FILES_libecpg-compat-dbg = "${libdir}/.debug/libecpg_compat*"
+FILES_libpgtypes = "${libdir}/libpgtypes*.so.*"
+FILES_libpgtypes-dbg = "${libdir}/.debug/libpgtypes*"
diff --git a/packages/postgresql/postgresql_8.1.4.bb b/packages/postgresql/postgresql_8.1.4.bb
index 27b067b5cb..eb03642085 100644
--- a/packages/postgresql/postgresql_8.1.4.bb
+++ b/packages/postgresql/postgresql_8.1.4.bb
@@ -1,3 +1,3 @@
 require postgresql.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/postgresql/postgresql_8.1.8.bb b/packages/postgresql/postgresql_8.1.8.bb
index 27b067b5cb..eb03642085 100644
--- a/packages/postgresql/postgresql_8.1.8.bb
+++ b/packages/postgresql/postgresql_8.1.8.bb
@@ -1,3 +1,3 @@
 require postgresql.inc
 
-PR = "r1"
+PR = "r2"
diff --git a/packages/postgresql/postgresql_8.2.4.bb b/packages/postgresql/postgresql_8.2.4.bb
index 3dc8577c1c..6e778e5b49 100644
--- a/packages/postgresql/postgresql_8.2.4.bb
+++ b/packages/postgresql/postgresql_8.2.4.bb
@@ -1,6 +1,6 @@
 require postgresql.inc
 
-PR = "r1"
+PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "http://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${P}.tar.bz2 \