summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorMasatomo Nakano <nakano@gentoo.org>2004-05-25 18:00:14 +0000
committerMasatomo Nakano <nakano@gentoo.org>2004-05-25 18:00:14 +0000
commit45b174c4fb3187d95f833c4f67bac46effdb6d08 (patch)
tree352d82141360693a98db59aa889c3b9831049df7 /dev-db
parentApplied all amd64 changes but forgot to keyword ;-) (diff)
downloadhistorical-45b174c4fb3187d95f833c4f67bac46effdb6d08.tar.gz
historical-45b174c4fb3187d95f833c4f67bac46effdb6d08.tar.bz2
historical-45b174c4fb3187d95f833c4f67bac46effdb6d08.zip
Fixed problem about installing jdbc driver.
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/postgresql/ChangeLog5
-rw-r--r--dev-db/postgresql/Manifest4
-rw-r--r--dev-db/postgresql/postgresql-7.4.2-r2.ebuild10
3 files changed, 13 insertions, 6 deletions
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 0683354eaa01..19c7ece3ce1e 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-db/postgresql
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.98 2004/05/25 15:57:26 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.99 2004/05/25 18:00:14 nakano Exp $
+
+ 25 May 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.2-r2.ebuild:
+ Fixed problem about installing jdbc driver.
25 May 2004; Masatomo Nakano <nakano@gentoo.org>
files/pg_autovacuum.init-7.4.2, postgresql-7.4.2-r1.ebuild,
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index a021badf46b7..15a34f7863c5 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,7 +1,7 @@
-MD5 aff6e0e60640227705ef0d9983e8deec postgresql-7.4.2-r2.ebuild 9550
+MD5 e4fff31ddb582979075ad2090a759296 postgresql-7.4.2-r2.ebuild 9770
MD5 9baaa754e37557aad88bb06ca9824145 postgresql-7.3.6.ebuild 7912
MD5 0b7723349832c1638a4df2c598aa0286 postgresql-7.4.2-r1.ebuild 9631
-MD5 81714b902f70f536152450469f42dfbd ChangeLog 18104
+MD5 756d786ebedb6f525ab4a23a6ea093cf ChangeLog 18230
MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
MD5 89b3a541ee6728d8934977b81ca112c2 files/postgresql-7.4.2-gentoo.patch 631
MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.1-hppa-testandset.patch 1596
diff --git a/dev-db/postgresql/postgresql-7.4.2-r2.ebuild b/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
index aaae0e898664..2f67bb688c17 100644
--- a/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r2.ebuild,v 1.5 2004/05/25 15:57:26 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.2-r2.ebuild,v 1.6 2004/05/25 18:00:14 nakano Exp $
inherit eutils gnuconfig flag-o-matic
@@ -102,7 +102,7 @@ src_compile() {
use tcltk && myconf="--with-tcl"
use python && myconf="$myconf --with-python"
use perl && myconf="$myconf --with-perl"
- use jave && myconf="$myconf --with-java"
+ use java && myconf="$myconf --with-java"
use ssl && myconf="$myconf --with-openssl"
use nls && myconf="$myconf --enable-nls"
use libg++ && myconf="$myconf --with-CXX"
@@ -158,8 +158,12 @@ src_install() {
exeinto /usr/bin
if [ "`use java`" ]; then
+ # we need to remove jar file after dojar; otherwise two same jar
+ # file are installed.
dojar ${D}/usr/share/postgresql/java/postgresql.jar || die
-# rm ${D}/usr/share/postgresql/java/postgresql.jar
+ rm ${D}/usr/share/postgresql/java/postgresql.jar
+ dojar ${D}/usr/share/postgresql/java/postgresql-examples.jar || die
+ rm ${D}/usr/share/postgresql/java/postgresql-examples.jar
fi
dodir /usr/include/postgresql/pgsql