diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-20 14:45:31 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-20 14:45:31 +0000 |
| commit | 315d90b640fa33d297f314f931953d223bbc6875 (patch) | |
| tree | 74513ba86aeff923ad10d870acf51feb77669502 /net-fs/netatalk | |
| parent | Add ~x86-fbsd to 4.4 version. (diff) | |
| download | gentoo-2-315d90b640fa33d297f314f931953d223bbc6875.tar.gz gentoo-2-315d90b640fa33d297f314f931953d223bbc6875.tar.bz2 gentoo-2-315d90b640fa33d297f314f931953d223bbc6875.zip | |
Fix db detection with 4.3 and 4.4 versions.
(Portage version: 2.1_rc1-r3)
Diffstat (limited to 'net-fs/netatalk')
| -rw-r--r-- | net-fs/netatalk/ChangeLog | 6 | ||||
| -rw-r--r-- | net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch | 28 | ||||
| -rw-r--r-- | net-fs/netatalk/netatalk-2.0.3-r2.ebuild | 3 |
3 files changed, 35 insertions, 2 deletions
diff --git a/net-fs/netatalk/ChangeLog b/net-fs/netatalk/ChangeLog index 954300983eca..98143bf7a1d4 100644 --- a/net-fs/netatalk/ChangeLog +++ b/net-fs/netatalk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/netatalk # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.43 2006/05/19 22:58:12 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/ChangeLog,v 1.44 2006/05/20 14:45:31 flameeyes Exp $ + + 20 May 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/netatalk-2.0.3-newerdb.patch, netatalk-2.0.3-r2.ebuild: + Fix db detection with 4.3 and 4.4 versions. 19 May 2006; Diego Pettenò <flameeyes@gentoo.org> +files/netatalk-2.0.3-db43.patch, netatalk-2.0.3-r2.ebuild: diff --git a/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch b/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch new file mode 100644 index 000000000000..f64c8cf5eb45 --- /dev/null +++ b/net-fs/netatalk/files/netatalk-2.0.3-newerdb.patch @@ -0,0 +1,28 @@ +Index: netatalk-2.0.3/macros/db3-check.m4 +=================================================================== +--- netatalk-2.0.3.orig/macros/db3-check.m4 ++++ netatalk-2.0.3/macros/db3-check.m4 +@@ -115,6 +115,14 @@ int main(void) { + AC_DEFUN([NETATALK_BERKELEY_LINK], + [ + atalk_cv_lib_db=no ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_4,[-ldb-4.4]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db44,[-ldb44]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_44,[-ldb-44]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_4,[-ldb-4-4]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_3,[-ldb-4.3]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db43,[-ldb43]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_43,[-ldb-43]) ++NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_3,[-ldb-4-3]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42]) + NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42]) +@@ -134,7 +142,7 @@ AC_DEFUN([AC_PATH_BDB], + trybdbdir="" + dobdbsearch=yes + bdb_search_dirs="/usr/local/include /usr/include" +- search_subdirs="/db4.2 /db42 /db4.1 /db41 /db4 /" ++ search_subdirs="/db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 /db4 /" + + dnl required BDB version + DB_MAJOR_REQ=4 diff --git a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild index d5bf152fb466..7fb9f1e2731f 100644 --- a/net-fs/netatalk/netatalk-2.0.3-r2.ebuild +++ b/net-fs/netatalk/netatalk-2.0.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.9 2006/05/19 22:58:12 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/netatalk/netatalk-2.0.3-r2.ebuild,v 1.10 2006/05/20 14:45:31 flameeyes Exp $ inherit eutils pam flag-o-matic autotools IUSE="ssl pam tcpd slp cups kerberos krb4 debug cracklib" @@ -39,6 +39,7 @@ src_unpack() { epatch "${FILESDIR}/${P}-setXid.patch" epatch "${FILESDIR}/${P}-db43.patch" + epatch "${FILESDIR}/${P}-newerdb.patch" AT_M4DIR="macros" eautoreconf } |