Add a patch knicked from ports to allow sqsh to build on Gentoo/FreeBSD, and add ~x86-fbsd keywording.

Package-Manager: portage-2.1.2_pre1

5 files changed, 51 insertions, 19 deletions

diff --git a/dev-db/sqsh/ChangeLog b/dev-db/sqsh/ChangeLog
index 59f77d274a78..0aa948976070 100644
--- a/dev-db/sqsh/ChangeLog
+++ b/dev-db/sqsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/sqsh
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/ChangeLog,v 1.17 2006/03/16 13:51:28 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/ChangeLog,v 1.18 2006/09/18 17:02:33 steev Exp $
+
+  18 Sep 2006; Steev Klimaszewski <steev@gentoo.org>
+  +files/sqsh-2.1.3-fbsd-configure.patch, sqsh-2.1.3-r1.ebuild:
+  Add a small patch so that sqsh builds on Gentoo/FreeBSD, and add ~x86-fbsd
+  keywording.
 
   16 Mar 2006; Caleb Tennis <caleb@gentoo.org> sqsh-2.1-r1.ebuild,
   -sqsh-2.1.3.ebuild, sqsh-2.1.3-r1.ebuild:
diff --git a/dev-db/sqsh/Manifest b/dev-db/sqsh/Manifest
index f4a55ae6f1d6..4340346d98bc 100644
--- a/dev-db/sqsh/Manifest
+++ b/dev-db/sqsh/Manifest
@@ -1,18 +1,29 @@
-MD5 1223f4ffe4ba1d79e5d0054c2ecdc1d1 ChangeLog 2805
-RMD160 b4be32426a866c1af039faf6ff27bdda1513fe93 ChangeLog 2805
-SHA256 8a14bb1b419143c4ca3f009ce8d8c24a60f8a07cf7f0a857a4c7e496b679be97 ChangeLog 2805
-MD5 19272f9055a78c6035e2f605dad0268c files/digest-sqsh-2.1-r1 64
-RMD160 8cc7622661d23593b512564b32d8a187a97f2725 files/digest-sqsh-2.1-r1 64
-SHA256 5f725cbf41733d865fe85a6d01302336a5a735a8008ff00a576bfffff7c9e7dd files/digest-sqsh-2.1-r1 64
-MD5 9e1d41d12a21ceabb8123c86b4d83d1e files/digest-sqsh-2.1.3-r1 135
-RMD160 23ca4c0aabe5844a7905794526ab7622d52982fc files/digest-sqsh-2.1.3-r1 135
-SHA256 1e7cd9ef27c83efe0c92ade9e840c11ff971a2cc2ef0fc3eaab22929612d9570 files/digest-sqsh-2.1.3-r1 135
-MD5 848f7e962020305524f90eae3dff338c metadata.xml 586
-RMD160 fcc8bcc76e516b380dbe550f5381fe4157bf3fa6 metadata.xml 586
-SHA256 6cc20dd8a6d5f9283356ab35df60e15bd28e94c343c6173ba11b80838da9c83c metadata.xml 586
+AUX sqsh-2.1.3-fbsd-configure.patch 206 RMD160 ebe6cc948cae7698c5ca46d4f682bd09ee0642e5 SHA1 fcf9c51490bed13bc76a1819d2af0b26b675c54e SHA256 3f5ee0b9045996688018e8a8c51a25656c16f8c29faa1cb2d7fea44e37aa9339
+MD5 ab64ebc3a0d2266a7628f37248161ce2 files/sqsh-2.1.3-fbsd-configure.patch 206
+RMD160 ebe6cc948cae7698c5ca46d4f682bd09ee0642e5 files/sqsh-2.1.3-fbsd-configure.patch 206
+SHA256 3f5ee0b9045996688018e8a8c51a25656c16f8c29faa1cb2d7fea44e37aa9339 files/sqsh-2.1.3-fbsd-configure.patch 206
+DIST sqsh-2.1-src.tar.gz 358874
+DIST sqsh-2.1.3-autotools.patch.bz2 2240 RMD160 e2d09f18254410d1c8e080743e216cde4c274851 SHA1 728d8cd8ce5d2a69dbf4ecf4035dedce22c69d83 SHA256 d14a30979dbaaf21ed8f4661cb96e095ff5f624eec3c107b0c711042dab35a9d
+DIST sqsh-2.1.3.tar.gz 408940 RMD160 fa6eab6b7345415f5531ed28b24e247321c52086 SHA1 d0984b618430e4004ece93745a370bcaf7f39ae2 SHA256 33e55b17538a6f1ab23fb9ae567a9d1e3f3342b2ff9547f6e64fd62dc8e6aa6a
+EBUILD sqsh-2.1-r1.ebuild 1044 RMD160 b70769222ef8250f31e7e7ed2bce7fc6eb6c7fb7 SHA1 56bf216b9c57fee6694a22e856c6d96e549de293 SHA256 8ecccf4991f0085fd512dbe31caa815eb8a4e0b4f3dedc8724a94f53940d96bc
 MD5 5b7abfbb519c692b94d83d9d279178ae sqsh-2.1-r1.ebuild 1044
 RMD160 b70769222ef8250f31e7e7ed2bce7fc6eb6c7fb7 sqsh-2.1-r1.ebuild 1044
 SHA256 8ecccf4991f0085fd512dbe31caa815eb8a4e0b4f3dedc8724a94f53940d96bc sqsh-2.1-r1.ebuild 1044
-MD5 5bb977a9012f968c88bf2408ccfb8aaa sqsh-2.1.3-r1.ebuild 1070
-RMD160 a234e5f88b42df074694dc9aef14f97360eadf7a sqsh-2.1.3-r1.ebuild 1070
-SHA256 ca6d43ecf9dd32dc9317b85a8ce4f0060e10db62707236e375a94677a008008d sqsh-2.1.3-r1.ebuild 1070
+EBUILD sqsh-2.1.3-r1.ebuild 1202 RMD160 f987512c32ca8b6a4cfd9bc724a4f4de12d1dba1 SHA1 e58c311b8fcfda1cfe1e941611629aa24ec73c40 SHA256 6242879369043e94c247fce2d9efe0c7d12000180e6ea2b790204c98bed3e562
+MD5 3d5f597d64925698b32c1067d32e0172 sqsh-2.1.3-r1.ebuild 1202
+RMD160 f987512c32ca8b6a4cfd9bc724a4f4de12d1dba1 sqsh-2.1.3-r1.ebuild 1202
+SHA256 6242879369043e94c247fce2d9efe0c7d12000180e6ea2b790204c98bed3e562 sqsh-2.1.3-r1.ebuild 1202
+MISC ChangeLog 3014 RMD160 736a2855977f428cc4c0f288ac54ae260e7713ad SHA1 5d76ced57e5d692b037a430ab5e77bc7dd5cc01b SHA256 321e8e89260785eabf0ad8c62ea06e86333786ee0da74b06e7cbe18c9ed68ba8
+MD5 565160f24310d1d4f7a4b21b8e7699b8 ChangeLog 3014
+RMD160 736a2855977f428cc4c0f288ac54ae260e7713ad ChangeLog 3014
+SHA256 321e8e89260785eabf0ad8c62ea06e86333786ee0da74b06e7cbe18c9ed68ba8 ChangeLog 3014
+MISC metadata.xml 586 RMD160 fcc8bcc76e516b380dbe550f5381fe4157bf3fa6 SHA1 5fa5aa9054e7280ed1ad7e70d85b1ab97cb440bd SHA256 6cc20dd8a6d5f9283356ab35df60e15bd28e94c343c6173ba11b80838da9c83c
+MD5 848f7e962020305524f90eae3dff338c metadata.xml 586
+RMD160 fcc8bcc76e516b380dbe550f5381fe4157bf3fa6 metadata.xml 586
+SHA256 6cc20dd8a6d5f9283356ab35df60e15bd28e94c343c6173ba11b80838da9c83c metadata.xml 586
+MD5 19272f9055a78c6035e2f605dad0268c files/digest-sqsh-2.1-r1 64
+RMD160 8cc7622661d23593b512564b32d8a187a97f2725 files/digest-sqsh-2.1-r1 64
+SHA256 5f725cbf41733d865fe85a6d01302336a5a735a8008ff00a576bfffff7c9e7dd files/digest-sqsh-2.1-r1 64
+MD5 2ac35a3eaa48ffbee13107cbdf9fe34c files/digest-sqsh-2.1.3-r1 497
+RMD160 57205ed2dac358472c87267456d096864a405f3d files/digest-sqsh-2.1.3-r1 497
+SHA256 5dde395ee1c5a73e78b972b767fe37fda0030d936c638b3ca9e26c006e0885af files/digest-sqsh-2.1.3-r1 497
diff --git a/dev-db/sqsh/files/digest-sqsh-2.1.3-r1 b/dev-db/sqsh/files/digest-sqsh-2.1.3-r1
index 6167662b3301..0c17d379040e 100644
--- a/dev-db/sqsh/files/digest-sqsh-2.1.3-r1
+++ b/dev-db/sqsh/files/digest-sqsh-2.1.3-r1
@@ -1,2 +1,6 @@
-MD5 baa61acdfe04eebf1f2fc7ed27810218 sqsh-2.1.3.tar.gz 408940
 MD5 6e1a769c3d9ac9bdb0187161c87e4f1f sqsh-2.1.3-autotools.patch.bz2 2240
+RMD160 e2d09f18254410d1c8e080743e216cde4c274851 sqsh-2.1.3-autotools.patch.bz2 2240
+SHA256 d14a30979dbaaf21ed8f4661cb96e095ff5f624eec3c107b0c711042dab35a9d sqsh-2.1.3-autotools.patch.bz2 2240
+MD5 baa61acdfe04eebf1f2fc7ed27810218 sqsh-2.1.3.tar.gz 408940
+RMD160 fa6eab6b7345415f5531ed28b24e247321c52086 sqsh-2.1.3.tar.gz 408940
+SHA256 33e55b17538a6f1ab23fb9ae567a9d1e3f3342b2ff9547f6e64fd62dc8e6aa6a sqsh-2.1.3.tar.gz 408940
diff --git a/dev-db/sqsh/files/sqsh-2.1.3-fbsd-configure.patch b/dev-db/sqsh/files/sqsh-2.1.3-fbsd-configure.patch
new file mode 100644
index 000000000000..e5cc0cf0f566
--- /dev/null
+++ b/dev-db/sqsh/files/sqsh-2.1.3-fbsd-configure.patch
@@ -0,0 +1,10 @@
+--- configure	Fri Nov  9 14:58:04 2001
++++ configure	Tue Oct 15 13:51:29 2002
+@@ -1196,5 +1195,5 @@
+ 			ncr*)
+ 				SYBASE_OS="-ldl -lm";;
+-			sunos*)
++			sunos*|*bsd*)
+ 				SYBASE_OS="-lm";;
+ 			solaris*)
+
diff --git a/dev-db/sqsh/sqsh-2.1.3-r1.ebuild b/dev-db/sqsh/sqsh-2.1.3-r1.ebuild
index 450eb771c48d..556ec2ce737d 100644
--- a/dev-db/sqsh/sqsh-2.1.3-r1.ebuild
+++ b/dev-db/sqsh/sqsh-2.1.3-r1.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/dev-db/sqsh/sqsh-2.1.3-r1.ebuild,v 1.2 2006/03/16 13:51:28 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1.3-r1.ebuild,v 1.3 2006/09/18 17:02:33 steev Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="readline X motif"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~x86-fbsd"
 
 DEPEND="dev-db/freetds
 	readline? ( sys-libs/readline )
@@ -29,6 +29,8 @@ DEPEND="dev-db/freetds
 src_unpack() {
 	unpack ${A}; cd ${S}
 	epatch ${WORKDIR}/${P}-autotools.patch
+	# Patch knicked from ports so that we don't pass -ldb when in a BSD
+	epatch ${FILESDIR}/${PN}-2.1.3-fbsd-configure.patch
 }
 
 src_compile() {