patch for *bsd people

(Portage version: 2.0.51.22-r1)

4 files changed, 43 insertions, 13 deletions

diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog
index dfddd49d71c9..b07586f5778c 100644
--- a/app-crypt/qca/ChangeLog
+++ b/app-crypt/qca/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.19 2005/07/02 02:10:41 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.20 2005/07/09 21:20:12 humpback Exp $
+
+  09 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/qca-1.0-fbsd.patch, qca-1.0-r2.ebuild:
+  Patch to solve problems on bsd. Thaks to Diego Petteno in bug #93817.
 
   02 Jul 2005; Hardave Riar <hardave@gentoo.org> qca-1.0-r2.ebuild:
   Stable on mips
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 89efcd8a9447..738e8559a6f2 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 646dbb8b398cf6d23341be2ffb7aa8bb qca-1.0-r1.ebuild 980
-MD5 20e24e05587d22301a7254d161383d6a qca-1.0-r2.ebuild 1004
+MD5 857067239dade8951702b464855c69d4 qca-1.0-r2.ebuild 1078
 MD5 c449341b02cb289bfbcc43436f1f2149 ChangeLog 2201
 MD5 ccc1d8642da78631eda5aecfb399cc13 qca-1.0.ebuild 980
 MD5 b5393a27b5b3d74649028c3befaf49fe metadata.xml 226
@@ -10,10 +7,4 @@ MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0 59
 MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0-r1 59
 MD5 79ff5b8052703491612213e47cdb6947 files/digest-qca-1.0-r2 59
 MD5 ee5764e49e4425fb387e29a7d8e2fec0 files/qca-pathfix.patch 267
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzHQiBXaUFmZvwyMRAoXWAKCsiHZCcq8M5WABCho7U/owRiV+bACcDbzQ
-bIKGoW6ZvQ4OLgmE+nQwkUA=
-=uO0B
------END PGP SIGNATURE-----
+MD5 2efadaf203fdd3186a7e909c0d02c425 files/qca-1.0-fbsd.patch 753
diff --git a/app-crypt/qca/files/qca-1.0-fbsd.patch b/app-crypt/qca/files/qca-1.0-fbsd.patch
new file mode 100644
index 000000000000..ce541a2196c7
--- /dev/null
+++ b/app-crypt/qca/files/qca-1.0-fbsd.patch
@@ -0,0 +1,33 @@
+diff -x '*~' -ur qca-1.0/configure qca-1.0-fixed/configure
+--- qca-1.0/configure	2003-12-10 01:06:43.000000000 +0100
++++ qca-1.0-fixed/configure	2005-05-24 18:03:08.912751344 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ show_usage() {
+ cat <<EOT
+@@ -17,12 +17,12 @@
+ while [ $# -gt 0 ]; do
+ 	case "$1" in
+ 		--prefix=*)
+-			PREFIX=`expr "${1}" : "--prefix=\(.*\)"`
++			PREFIX="${1/--prefix=/}"
+ 			shift
+ 			;;
+ 
+ 		--qtdir=*)
+-			QTDIR=`expr "${1}" : "--qtdir=\(.*\)"`
++			QTDIR="${1/--qtdir=/}"
+ 			shift
+ 			;;
+ 
+@@ -76,7 +76,7 @@
+ 		echo Warning: qmake not in \$QTDIR/bin/qmake
+ 		echo trying to find it in \$PATH
+ 	fi
+-	qm=`type -p qmake`
++	qm=`which qmake`
+ 	if [ -x "$qm" ]; then
+ 		if [ "$QC_DEBUG" = "Y" ]; then
+ 			echo qmake found in $qm
diff --git a/app-crypt/qca/qca-1.0-r2.ebuild b/app-crypt/qca/qca-1.0-r2.ebuild
index 1aa19c0c9ca7..423aac3ea355 100644
--- a/app-crypt/qca/qca-1.0-r2.ebuild
+++ b/app-crypt/qca/qca-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-1.0-r2.ebuild,v 1.9 2005/07/07 00:15:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-1.0-r2.ebuild,v 1.10 2005/07/09 21:20:12 humpback Exp $
 
 inherit eutils
 
@@ -20,6 +20,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/qca-pathfix.patch || die "bad patch"
+	#This is needed just in bsd, but make no harm in linux
+	epatch ${FILESDIR}/qca-1.0-fbsd.patch
 }
 
 src_compile() {