New upstream version; Also adjust the UFFI library loading strategy for PostgreSQL; Resolves Bug #139208.

Package-Manager: portage-2.1.1_pre2-r2

5 files changed, 266 insertions, 27 deletions

diff --git a/dev-lisp/cl-sql/ChangeLog b/dev-lisp/cl-sql/ChangeLog
index ff058da471d9..40751a3b2549 100644
--- a/dev-lisp/cl-sql/ChangeLog
+++ b/dev-lisp/cl-sql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lisp/cl-sql
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.27 2006/04/30 05:54:00 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/ChangeLog,v 1.28 2006/07/10 17:18:27 mkennedy Exp $
+
+*cl-sql-3.6.3 (10 Jul 2006)
+
+  10 Jul 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/3.6.3-gentoo.patch, +cl-sql-3.6.3.ebuild:
+  New upstream version; Also adjust the UFFI library loading strategy for
+  PostgreSQL; Resolves Bug #139208.
 
   30 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
   +files/3.5.6-gentoo.patch:
diff --git a/dev-lisp/cl-sql/Manifest b/dev-lisp/cl-sql/Manifest
index f1f2ca063422..f30cfd133768 100644
--- a/dev-lisp/cl-sql/Manifest
+++ b/dev-lisp/cl-sql/Manifest
@@ -1,43 +1,49 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 3.5.2-gentoo.patch 4994 RMD160 57d945be8405f949f18c531d75542f894df82709 SHA1 8bb8ee62ee217581478fa8152801490462d9b3a5 SHA256 4789f408ef6250e18f4bf6731d1e1710a60d207c88dfb94fe4591d8d48ad2809 size 4994
+AUX 3.5.2-gentoo.patch 4994 RMD160 57d945be8405f949f18c531d75542f894df82709 SHA1 8bb8ee62ee217581478fa8152801490462d9b3a5 SHA256 4789f408ef6250e18f4bf6731d1e1710a60d207c88dfb94fe4591d8d48ad2809
 MD5 bfcc907523913bfffcd2cf4f0cdb95e1 files/3.5.2-gentoo.patch 4994
 RMD160 57d945be8405f949f18c531d75542f894df82709 files/3.5.2-gentoo.patch 4994
 SHA256 4789f408ef6250e18f4bf6731d1e1710a60d207c88dfb94fe4591d8d48ad2809 files/3.5.2-gentoo.patch 4994
-AUX 3.5.5-gentoo.patch 4994 RMD160 174046f97e44f90c6d658c170c60e2e033c1c7ad SHA1 7bff6d130e5bd4e9f8b38de16294e412b6ef8799 SHA256 674d85100f82eace5b5fae15f0b8d180e4cca9513d1f8848b4dd1a6141fef2cf size 4994
+AUX 3.5.5-gentoo.patch 4994 RMD160 174046f97e44f90c6d658c170c60e2e033c1c7ad SHA1 7bff6d130e5bd4e9f8b38de16294e412b6ef8799 SHA256 674d85100f82eace5b5fae15f0b8d180e4cca9513d1f8848b4dd1a6141fef2cf
 MD5 5eb41d196dad1361f0af23e86554b673 files/3.5.5-gentoo.patch 4994
 RMD160 174046f97e44f90c6d658c170c60e2e033c1c7ad files/3.5.5-gentoo.patch 4994
 SHA256 674d85100f82eace5b5fae15f0b8d180e4cca9513d1f8848b4dd1a6141fef2cf files/3.5.5-gentoo.patch 4994
-AUX 3.5.6-gentoo.patch 4994 RMD160 3f2ce390674293ab236ce1c5f65f2d0098838129 SHA1 fe0d7c0e403b0b501ae427db27f852f790f21a7f SHA256 a87e18279c4480ca6d6516d853dd698f34f03691ad450c248854c20f18810084 size 4994
+AUX 3.5.6-gentoo.patch 4994 RMD160 3f2ce390674293ab236ce1c5f65f2d0098838129 SHA1 fe0d7c0e403b0b501ae427db27f852f790f21a7f SHA256 a87e18279c4480ca6d6516d853dd698f34f03691ad450c248854c20f18810084
 MD5 46a266aae3cebff99520ce78e9877ec7 files/3.5.6-gentoo.patch 4994
 RMD160 3f2ce390674293ab236ce1c5f65f2d0098838129 files/3.5.6-gentoo.patch 4994
 SHA256 a87e18279c4480ca6d6516d853dd698f34f03691ad450c248854c20f18810084 files/3.5.6-gentoo.patch 4994
-DIST clsql-3.2.1.tar.gz 726430 size 726430
-DIST clsql-3.5.2.tar.gz 704510 size 704510
-DIST clsql-3.5.5.tar.gz 704920 RMD160 e7bf9b380af5ebc8116b9c6b2e2b8ec30a6dd0bc SHA256 67ca8607e5804af8ed032de3d74f58d109f692e8cabbb7bb2fe18610665b02dd size 704920
-DIST clsql-3.5.6.tar.gz 704958 RMD160 4bb8e9378c0688a60183964dd971acd3f046ef2f SHA256 3b0278e19cd8e5deace131f621445eb638bcd9ee73f714468ceee83b890d18d3 size 704958
-EBUILD cl-sql-3.2.1.ebuild 3432 RMD160 74dc2f3d0b8e7657584d1d13b24864f6da7c9cfb SHA1 1ba468cfc95058addd382042e05dba649b0a0aa9 SHA256 bdd1f2253e06008dadf7c46a0fb15f53b378259b37b45df5f0c6a7ad34a1e76f size 3432
+AUX 3.6.3-gentoo.patch 5419 RMD160 3bce062ebced1ec60415335ffa7560aea098a50b SHA1 43949af7fff92b7fcce60ee83e4b06b63213c12f SHA256 3e95ca28173cd9605ce42b3cb57118de03e4229ee34cfaebe98ab82a946cb4ed
+MD5 00022542fd262e38091a76d33a2bcd7a files/3.6.3-gentoo.patch 5419
+RMD160 3bce062ebced1ec60415335ffa7560aea098a50b files/3.6.3-gentoo.patch 5419
+SHA256 3e95ca28173cd9605ce42b3cb57118de03e4229ee34cfaebe98ab82a946cb4ed files/3.6.3-gentoo.patch 5419
+DIST clsql-3.2.1.tar.gz 726430
+DIST clsql-3.5.2.tar.gz 704510
+DIST clsql-3.5.5.tar.gz 704920 RMD160 e7bf9b380af5ebc8116b9c6b2e2b8ec30a6dd0bc SHA256 67ca8607e5804af8ed032de3d74f58d109f692e8cabbb7bb2fe18610665b02dd
+DIST clsql-3.5.6.tar.gz 704958 RMD160 4bb8e9378c0688a60183964dd971acd3f046ef2f SHA256 3b0278e19cd8e5deace131f621445eb638bcd9ee73f714468ceee83b890d18d3
+DIST clsql-3.6.3.tar.gz 707376 RMD160 c3f00660793625e98b268dbe4d10b3a82492f8fc SHA1 ed4c1b489fc184efcfd14f0149d9efac78e3eb9a SHA256 e89038b5a7fae76959f61aea8fa8a64634a44b3589f38fdceaa548d379b289c3
+EBUILD cl-sql-3.2.1.ebuild 3432 RMD160 74dc2f3d0b8e7657584d1d13b24864f6da7c9cfb SHA1 1ba468cfc95058addd382042e05dba649b0a0aa9 SHA256 bdd1f2253e06008dadf7c46a0fb15f53b378259b37b45df5f0c6a7ad34a1e76f
 MD5 7fd94c2ad4c4d306b0983a349aeadd3d cl-sql-3.2.1.ebuild 3432
 RMD160 74dc2f3d0b8e7657584d1d13b24864f6da7c9cfb cl-sql-3.2.1.ebuild 3432
 SHA256 bdd1f2253e06008dadf7c46a0fb15f53b378259b37b45df5f0c6a7ad34a1e76f cl-sql-3.2.1.ebuild 3432
-EBUILD cl-sql-3.5.2.ebuild 3623 RMD160 8cca52246ccc0600a74be54bbd513e8c7d913958 SHA1 ff2600682a27c2cac75369735b1a7ba55ad09eab SHA256 f871acaaa831bbea2b1535ebe6186658e0f80a7e6d8074deca7c42fff9c46c11 size 3623
+EBUILD cl-sql-3.5.2.ebuild 3623 RMD160 8cca52246ccc0600a74be54bbd513e8c7d913958 SHA1 ff2600682a27c2cac75369735b1a7ba55ad09eab SHA256 f871acaaa831bbea2b1535ebe6186658e0f80a7e6d8074deca7c42fff9c46c11
 MD5 e3a1c06893a5c99d5eba302a883b288f cl-sql-3.5.2.ebuild 3623
 RMD160 8cca52246ccc0600a74be54bbd513e8c7d913958 cl-sql-3.5.2.ebuild 3623
 SHA256 f871acaaa831bbea2b1535ebe6186658e0f80a7e6d8074deca7c42fff9c46c11 cl-sql-3.5.2.ebuild 3623
-EBUILD cl-sql-3.5.5.ebuild 3623 RMD160 9a2d68ab31d1299b4cb6e5a8eb36aecbcc53c811 SHA1 c3ed417cd5f2665df0dad03c5f0db9d464d1729c SHA256 65e968bbca285e72e6563312ca4db7359925811b5b7ccc9515206e4608e8ee6d size 3623
+EBUILD cl-sql-3.5.5.ebuild 3623 RMD160 9a2d68ab31d1299b4cb6e5a8eb36aecbcc53c811 SHA1 c3ed417cd5f2665df0dad03c5f0db9d464d1729c SHA256 65e968bbca285e72e6563312ca4db7359925811b5b7ccc9515206e4608e8ee6d
 MD5 6cef92a0f801b04339f76d8816eea709 cl-sql-3.5.5.ebuild 3623
 RMD160 9a2d68ab31d1299b4cb6e5a8eb36aecbcc53c811 cl-sql-3.5.5.ebuild 3623
 SHA256 65e968bbca285e72e6563312ca4db7359925811b5b7ccc9515206e4608e8ee6d cl-sql-3.5.5.ebuild 3623
-EBUILD cl-sql-3.5.6.ebuild 3623 RMD160 dbb799b8f29f549d468ceb8ded43649a1834d86b SHA1 4f99b0e1edf0e4078d486a4d431560fd9e6fb56c SHA256 791587a8d0a849844ff3a345b6926830143f2f35249358582035feb2795e9364 size 3623
+EBUILD cl-sql-3.5.6.ebuild 3623 RMD160 dbb799b8f29f549d468ceb8ded43649a1834d86b SHA1 4f99b0e1edf0e4078d486a4d431560fd9e6fb56c SHA256 791587a8d0a849844ff3a345b6926830143f2f35249358582035feb2795e9364
 MD5 76da49223647f8978e56d089f5459ba6 cl-sql-3.5.6.ebuild 3623
 RMD160 dbb799b8f29f549d468ceb8ded43649a1834d86b cl-sql-3.5.6.ebuild 3623
 SHA256 791587a8d0a849844ff3a345b6926830143f2f35249358582035feb2795e9364 cl-sql-3.5.6.ebuild 3623
-MISC ChangeLog 4851 RMD160 ed4446d0a8db2c7ca3f34c2155e9cc3cb74ee7c7 SHA1 246e92aa85274a3519d6acd052a8b05fe3fe4ed4 SHA256 1c9c5efd11234f14bc282388ea53087e72d1558c11f069b88abf6016c70468ba size 4851
-MD5 c2ea6d28412481f027e2d0f2ca16f4ba ChangeLog 4851
-RMD160 ed4446d0a8db2c7ca3f34c2155e9cc3cb74ee7c7 ChangeLog 4851
-SHA256 1c9c5efd11234f14bc282388ea53087e72d1558c11f069b88abf6016c70468ba ChangeLog 4851
-MISC metadata.xml 431 RMD160 16820289e6c9c23574e24040b056fbf24c45a8fc SHA1 a5c9ee0519ce848158b6075659d3334ff3c842a7 SHA256 a136cab31b2b84259c0f30259808f20a82912b1cbbba6499d88f9b64f16bcf8e size 431
+EBUILD cl-sql-3.6.3.ebuild 3772 RMD160 264974f2ab7b0076fae1edf99eb254340c18163a SHA1 85f52b81cd39c13f4a86ba4ccb1f34a1d4b9703a SHA256 14919925993d63ea33413a0aadd68c829ec51cfecb8bf1845e419ad807af505f
+MD5 5136cc2e175e26fb0f58d719dcf09a9a cl-sql-3.6.3.ebuild 3772
+RMD160 264974f2ab7b0076fae1edf99eb254340c18163a cl-sql-3.6.3.ebuild 3772
+SHA256 14919925993d63ea33413a0aadd68c829ec51cfecb8bf1845e419ad807af505f cl-sql-3.6.3.ebuild 3772
+MISC ChangeLog 5095 RMD160 bcf7c905728ce48b375c071e1880c764e1210d9a SHA1 9709e32b9f0ec49d8e6e3d245954fcaf27a081fd SHA256 7395a124b5f1edacb392c34ed87e007a895be00d7e5c6599ef47eba3860ab443
+MD5 e87bc93c1ee15f6ac63c693c5e12ed89 ChangeLog 5095
+RMD160 bcf7c905728ce48b375c071e1880c764e1210d9a ChangeLog 5095
+SHA256 7395a124b5f1edacb392c34ed87e007a895be00d7e5c6599ef47eba3860ab443 ChangeLog 5095
+MISC metadata.xml 431 RMD160 16820289e6c9c23574e24040b056fbf24c45a8fc SHA1 a5c9ee0519ce848158b6075659d3334ff3c842a7 SHA256 a136cab31b2b84259c0f30259808f20a82912b1cbbba6499d88f9b64f16bcf8e
 MD5 25a7993f47b4e9b1261a9956a8d61d90 metadata.xml 431
 RMD160 16820289e6c9c23574e24040b056fbf24c45a8fc metadata.xml 431
 SHA256 a136cab31b2b84259c0f30259808f20a82912b1cbbba6499d88f9b64f16bcf8e metadata.xml 431
@@ -53,10 +59,6 @@ SHA256 702efd4549592f1289306e700bfc44240a116ba768bcedde9d757dbd0db924cd files/di
 MD5 c5a39def77f6aed8fa0125ba7ab01831 files/digest-cl-sql-3.5.6 235
 RMD160 953f230547d17de3b7efe921aff48fdb38bf2a92 files/digest-cl-sql-3.5.6 235
 SHA256 af9256e6c7268a7c6f8a7a805bf6f69770a13d58761feebca6544422f7039a73 files/digest-cl-sql-3.5.6 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEVFECyiNZaEAZA+ARAv3+AJwIIHMkhN6B0y3U6xdHFFP5dndwzACeOyBA
-nkjuS5jYzN8Ct+OqlWzLHVg=
-=s7EY
------END PGP SIGNATURE-----
+MD5 c4ae63f903e2a551bda855940f69d248 files/digest-cl-sql-3.6.3 235
+RMD160 3e542df961e5ce9fa36086a1c60b8692cdda900f files/digest-cl-sql-3.6.3 235
+SHA256 a6b850e87d461e68d46f2cea91e4a6a48ce9661f63f1f9254ba7e76753889061 files/digest-cl-sql-3.6.3 235
diff --git a/dev-lisp/cl-sql/cl-sql-3.6.3.ebuild b/dev-lisp/cl-sql/cl-sql-3.6.3.ebuild
new file mode 100644
index 000000000000..777bd3d34714
--- /dev/null
+++ b/dev-lisp/cl-sql/cl-sql-3.6.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cl-sql/cl-sql-3.6.3.ebuild,v 1.1 2006/07/10 17:18:27 mkennedy Exp $
+
+inherit common-lisp eutils multilib
+
+DESCRIPTION="A multi-platform SQL interface for Common Lisp"
+HOMEPAGE="http://clsql.b9.com/
+	http://packages.debian.org/unstable/devel/cl-sql.html
+	http://www.cliki.net/CLSQL"
+SRC_URI="http://files.b9.com/clsql/clsql-${PV}.tar.gz"
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="postgres mysql sqlite sqlite3 odbc"
+DEPEND="dev-lisp/common-lisp-controller
+	virtual/commonlisp
+	dev-lisp/cl-md5
+	>=dev-lisp/cl-uffi-1.5.7
+	postgres? ( dev-db/postgresql )
+	mysql? ( dev-db/mysql )
+	sqlite? ( =dev-db/sqlite-2* )
+	sqlite3? ( =dev-db/sqlite-3* )
+	odbc? ( dev-db/unixODBC )"
+
+S=${WORKDIR}/clsql-${PV}
+
+CLPACKAGE='clsql clsql-uffi clsql-postgresql clsql-postgresql-socket clsql-mysql clsql-odbc clsql-sqlite clsql-sqlite3'
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-gentoo.patch
+}
+
+src_compile() {
+	make -C uffi || die
+	if use mysql; then
+		make -C db-mysql || die
+	fi
+}
+
+src_install() {
+	dodir $CLSYSTEMROOT
+	dodir $CLSOURCEROOT
+
+	insinto $CLSOURCEROOT/clsql/sql; doins sql/*.lisp
+	insinto $CLSOURCEROOT/clsql; doins clsql.asd
+	dosym $CLSOURCEROOT/clsql/clsql.asd $CLSYSTEMROOT/clsql.asd
+
+	insinto $CLSOURCEROOT/clsql-uffi/uffi; doins uffi/*.lisp
+	insinto $CLSOURCEROOT/clsql-uffi; doins clsql-uffi.asd
+	dosym $CLSOURCEROOT/clsql-uffi/clsql-uffi.asd $CLSYSTEMROOT/clsql-uffi.asd
+	exeinto /usr/$(get_libdir)/clsql/; doexe uffi/clsql_uffi.so
+
+	if use postgres; then
+		insinto $CLSOURCEROOT/clsql-postgresql/db-postgresql; doins db-postgresql/*.lisp
+		insinto $CLSOURCEROOT/clsql-postgresql; doins clsql-postgresql.asd
+		dosym $CLSOURCEROOT/clsql-postgresql/clsql-postgresql.asd $CLSYSTEMROOT/clsql-postgresql.asd
+	fi
+
+	insinto $CLSOURCEROOT/clsql-postgresql-socket/db-postgresql-socket
+	doins db-postgresql-socket/*.lisp
+	insinto $CLSOURCEROOT/clsql-postgresql-socket
+	doins clsql-postgresql-socket.asd
+	dosym $CLSOURCEROOT/clsql-postgresql-socket/clsql-postgresql-socket.asd \
+		$CLSYSTEMROOT/clsql-postgresql-socket.asd
+
+	if use mysql; then
+		insinto $CLSOURCEROOT/clsql-mysql/db-mysql; doins db-mysql/*.lisp db-mysql/*.c
+		insinto $CLSOURCEROOT/clsql-mysql; doins clsql-mysql.asd
+		dosym $CLSOURCEROOT/clsql-mysql/clsql-mysql.asd $CLSYSTEMROOT/clsql-mysql.asd
+		exeinto /usr/$(get_libdir)/clsql/; doexe db-mysql/clsql_mysql.so
+	fi
+
+	if use odbc; then
+		insinto $CLSOURCEROOT/clsql-odbc/db-odbc; doins db-odbc/*.lisp
+		insinto $CLSOURCEROOT/clsql-odbc; doins clsql-odbc.asd
+		dosym $CLSOURCEROOT/clsql-odbc/clsql-odbc.asd $CLSYSTEMROOT/clsql-odbc.asd
+	fi
+
+	if use sqlite; then
+		insinto $CLSOURCEROOT/clsql-sqlite/db-sqlite; doins db-sqlite/*.lisp
+		insinto $CLSOURCEROOT/clsql-sqlite; doins clsql-sqlite.asd
+		dosym $CLSOURCEROOT/clsql-sqlite/clsql-sqlite.asd $CLSYSTEMROOT/clsql-sqlite.asd
+	fi
+
+	if use sqlite3; then
+		insinto $CLSOURCEROOT/clsql-sqlite3/db-sqlite3; doins db-sqlite3/*.lisp
+		insinto $CLSOURCEROOT/clsql-sqlite3; doins clsql-sqlite3.asd
+		dosym $CLSOURCEROOT/clsql-sqlite3/clsql-sqlite3.asd $CLSYSTEMROOT/clsql-sqlite3.asd
+	fi
+
+	dodoc BUGS CONTRIBUTORS COPYING* ChangeLog INSTALL LATEST-TEST-RESULTS NEWS README TODO
+	dodoc doc/clsql.pdf
+	tar xfz doc/html.tar.gz -C ${D}/usr/share/doc/${PF}/
+	do-debian-credits
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*
+
+	for src in clsql-uffi/uffi/clsql-uffi-loader.lisp \
+		clsql-mysql/db-mysql/mysql-loader.lisp \
+		clsql-postgresql/db-postgresql/postgresql-loader.lisp;
+	do
+		if [ -f $D/$CLSOURCEROOT/$src ]; then
+			einfo "Fixing LIBDIR for $src"
+			dosed "s,@LIBDIR@,$(get_libdir),g" $CLSOURCEROOT/$src
+		fi
+	done
+}
diff --git a/dev-lisp/cl-sql/files/3.6.3-gentoo.patch b/dev-lisp/cl-sql/files/3.6.3-gentoo.patch
new file mode 100644
index 000000000000..b9871fc90d88
--- /dev/null
+++ b/dev-lisp/cl-sql/files/3.6.3-gentoo.patch
@@ -0,0 +1,118 @@
+diff -ur clsql-3.6.3.orig/db-mysql/mysql-loader.lisp clsql-3.6.3/db-mysql/mysql-loader.lisp
+--- clsql-3.6.3.orig/db-mysql/mysql-loader.lisp	2005-07-05 19:51:52.000000000 -0500
++++ clsql-3.6.3/db-mysql/mysql-loader.lisp	2006-07-10 00:42:56.000000000 -0500
+@@ -18,17 +18,6 @@
+ 
+ (in-package #:mysql)
+ 
+-(defparameter *clsql-mysql-library-candidate-names* 
+-  (list #+(or 64bit x86-64) "clsql_mysql64"
+-        #+(or 64bit x86-64) (make-pathname :name "clsql_mysql64"
+-                                           :directory (pathname-directory *load-truename*))
+-        "clsql_mysql"
+-        (make-pathname :name "clsql_mysql"
+-                       :directory (pathname-directory *load-truename*))))
+-
+-(defvar *mysql-library-candidate-names*
+-  '("libmysqlclient" "libmysql"))
+-
+ (defvar *mysql-supporting-libraries* '("c")
+   "Used only by CMU. List of library flags needed to be passed to ld to
+ load the MySQL client library succesfully.  If this differs at your site,
+@@ -41,12 +30,16 @@
+   *mysql-library-loaded*)
+ 				      
+ (defmethod clsql-sys:database-type-load-foreign ((database-type (eql :mysql)))
+-  (clsql-uffi:find-and-load-foreign-library *mysql-library-candidate-names*
+-                                            :module "mysql" 
+-                                            :supporting-libraries *mysql-supporting-libraries*)
+-  (clsql-uffi:find-and-load-foreign-library *clsql-mysql-library-candidate-names*
+-                                            :module "clsql-mysql" 
+-                                            :supporting-libraries *mysql-supporting-libraries*)
++  (uffi:load-foreign-library (make-pathname :directory '(:absolute "usr" "@LIBDIR@")
++					    :name "libmysqlclient"
++					    :type "so")
++			     :module "mysql"
++			     :supporting-libraries *mysql-supporting-libraries*)
++  (uffi:load-foreign-library (make-pathname :directory '(:absolute "usr" "@LIBDIR@" "clsql")
++					    :name "clsql_mysql"
++					    :type "so")
++			     :module "clsql-mysql"
++			     :supporting-libraries *mysql-supporting-libraries*)
+   (setq *mysql-library-loaded* t))
+ 
+ 
+diff -ur clsql-3.6.3.orig/db-postgresql/postgresql-loader.lisp clsql-3.6.3/db-postgresql/postgresql-loader.lisp
+--- clsql-3.6.3.orig/db-postgresql/postgresql-loader.lisp	2005-06-08 14:25:33.000000000 -0500
++++ clsql-3.6.3/db-postgresql/postgresql-loader.lisp	2006-07-10 00:47:40.000000000 -0500
+@@ -33,9 +33,11 @@
+ 				      
+ (defmethod clsql-sys:database-type-load-foreign ((database-type
+ 						  (eql :postgresql)))
+-  (clsql-uffi:find-and-load-foreign-library "libpq"
+-                                            :module "postgresql"
+-                                            :supporting-libraries *postgresql-supporting-libraries*)
++  (uffi:load-foreign-library (make-pathname :directory '(:absolute "usr" "@LIBDIR@")
++					    :name "libpq"
++					    :type "so")
++			     :module "postgresql"
++			     :supporting-libraries *postgresql-supporting-libraries*)
+   (setq *postgresql-library-loaded* t))
+ 
+ (clsql-sys:database-type-load-foreign :postgresql)
+diff -ur clsql-3.6.3.orig/uffi/clsql-uffi-loader.lisp clsql-3.6.3/uffi/clsql-uffi-loader.lisp
+--- clsql-3.6.3.orig/uffi/clsql-uffi-loader.lisp	2006-05-03 09:39:11.000000000 -0500
++++ clsql-3.6.3/uffi/clsql-uffi-loader.lisp	2006-07-10 00:44:58.000000000 -0500
+@@ -18,35 +18,6 @@
+ 
+ (in-package #:clsql-uffi)
+ 
+-(defun find-and-load-foreign-library (filenames &key module supporting-libraries (errorp t))
+-  "Attempt to load a foreign library. This will search for any of the filenames, as
+-well as any of the filenames in any of the clsql:*foreign-library-search-paths*"
+-  (setq filenames (if (listp filenames) filenames (list filenames)))
+-
+-  (flet ((try-load (testpath)
+-	   (handler-case
+-	       (uffi:load-foreign-library testpath
+-					  :module module
+-					  :supporting-libraries supporting-libraries)
+-	     (error (c) (warn "~A" c) nil))))
+-    (or
+-     (loop for type in (uffi:foreign-library-types)
+-	   thereis
+-	   (loop for name in filenames
+-		 for pn = (make-pathname :name name :type type)
+-		 thereis (or
+-			  (loop for search-path in clsql:*foreign-library-search-paths*
+-				thereis (try-load (merge-pathnames pn search-path)))
+-			  (try-load pn))))
+-     (when errorp
+-       (error "Couldn't load foreign librar~@P ~{~S~^, ~}. (searched ~S)"
+-	      (length filenames) filenames
+-	      'clsql:*foreign-library-search-paths*)))))
+-
+-(defvar *clsql-uffi-library-filenames*
+-  (list #+(or 64bit x86-64) "clsql_uffi64"
+-	"clsql_uffi"))
+-
+ (defvar *clsql-uffi-supporting-libraries* '("c")
+   "Used only by CMU. List of library flags needed to be passed to ld to
+ load the MySQL client library succesfully.  If this differs at your site,
+@@ -57,10 +28,12 @@
+ 
+ (defun load-uffi-foreign-library ()
+   (clsql:push-library-path clsql-uffi-system::*clsql-uffi-library-dir*)
+-  (find-and-load-foreign-library *clsql-uffi-library-filenames*
+-                                 :module "clsql-uffi"
+-                                 :supporting-libraries
+-                                 *clsql-uffi-supporting-libraries*)
++  (uffi:load-foreign-library (make-pathname :directory '(:absolute "usr" "@LIBDIR@" "clsql")
++					    :name "clsql_uffi"
++					    :type "so")
++			     :module "clsql-uffi"
++			     :supporting-libraries
++			     *clsql-uffi-supporting-libraries*)
+   (setq *uffi-library-loaded* t))
+ 
+ (load-uffi-foreign-library)
diff --git a/dev-lisp/cl-sql/files/digest-cl-sql-3.6.3 b/dev-lisp/cl-sql/files/digest-cl-sql-3.6.3
new file mode 100644
index 000000000000..404176405bec
--- /dev/null
+++ b/dev-lisp/cl-sql/files/digest-cl-sql-3.6.3
@@ -0,0 +1,3 @@
+MD5 6a4f6b7b1c48fdefc731e7b6f8b00136 clsql-3.6.3.tar.gz 707376
+RMD160 c3f00660793625e98b268dbe4d10b3a82492f8fc clsql-3.6.3.tar.gz 707376
+SHA256 e89038b5a7fae76959f61aea8fa8a64634a44b3589f38fdceaa548d379b289c3 clsql-3.6.3.tar.gz 707376