From 9f4511a59cc42b0d32cd1e6633feb1a97b5cc83c Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Thu, 22 Feb 2007 19:11:25 +0000
Subject: Fixed patch-ad (unportable usage of test(1)).

---
 audio/flac/distinfo         |  4 ++--
 audio/flac/patches/patch-af | 32 +++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 11 deletions(-)

(limited to 'audio/flac')

diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 176e29dd40c..169baa15f2c 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2007/01/07 15:01:52 wiz Exp $
+$NetBSD: distinfo,v 1.16 2007/02/22 19:11:25 rillig Exp $
 
 SHA1 (flac-1.1.3.tar.gz) = e19c92bebe536b69dd14d54de76c1f626b83b295
 RMD160 (flac-1.1.3.tar.gz) = 3bb360940775b6b2a5127accfb12d29c04da1132
@@ -8,6 +8,6 @@ SHA1 (patch-ab) = d7b48e37ca81450d0ffc4a97914d06c1464daf7b
 SHA1 (patch-ac) = 647657a3af2db35dbce6fcef2f238c543b55573e
 SHA1 (patch-ad) = 9df5668bb5ffc0850be0a3b34ada825642752874
 SHA1 (patch-ae) = b73e4b160c9435525e96213d6c77e743947746d3
-SHA1 (patch-af) = 945fd4fa294f84ebbbeeb561bf7ce0885261539c
+SHA1 (patch-af) = a91054ce5d37ac2dc88725fa68c59413b5f52067
 SHA1 (patch-ag) = ec37d2e4ce9c0a8d4d638fe08d1f38914029a205
 SHA1 (patch-ah) = 90452d2983aed07a8a0c14926772610ef3799099
diff --git a/audio/flac/patches/patch-af b/audio/flac/patches/patch-af
index 3e957e20df7..8da936f7186 100644
--- a/audio/flac/patches/patch-af
+++ b/audio/flac/patches/patch-af
@@ -1,13 +1,27 @@
-$NetBSD: patch-af,v 1.3 2006/07/06 12:39:10 markd Exp $
+$NetBSD: patch-af,v 1.4 2007/02/22 19:11:26 rillig Exp $
 
---- strip_non_asm_libtool_args.sh.orig	2004-07-29 18:52:52.000000000 +1200
-+++ strip_non_asm_libtool_args.sh
-@@ -6,7 +6,7 @@
+--- strip_non_asm_libtool_args.sh.orig	2004-07-29 08:43:23.000000000 +0200
++++ strip_non_asm_libtool_args.sh	2007-02-22 20:11:41.000000000 +0100
+@@ -5,15 +5,12 @@
+ # Also, on some versions of OS X it tries to pass -fno-common
  # to 'as' which causes problems.
  command=""
- while [ $1 ]; do
+-while [ $1 ]; do
 -	if [ "$1" != "-fPIC" ]; then
-+	if [ "$1" != "-fPIC" -a "$1" != "-KPIC" ]; then
- 		if [ "$1" != "-DPIC" ]; then
- 			if [ "$1" != "-fno-common" ]; then
- 				command="$command $1"
+-		if [ "$1" != "-DPIC" ]; then
+-			if [ "$1" != "-fno-common" ]; then
+-				command="$command $1"
+-			fi
+-		fi
+-	fi
+-	shift
++for arg; do
++	case "$arg" in
++	-[DfK]PIC |\
++	-fno-common)	continue;;
++	esac
++	command="$command $arg"
+ done
+-echo $command
++echo "$command"
+ exec $command
-- 
cgit v1.2.3