From b2448ca22c88730707dffb85bce24a600d7ced7b Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Mon, 15 Sep 2008 23:45:31 +0200
Subject: [PATCH] include/sourceforge.sh: use new style up2date again

---
 source/include/sourceforge.sh |   24 +++++++++++++++---------
 t/up2date                     |    8 ++------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/source/include/sourceforge.sh b/source/include/sourceforge.sh
index 15f8d9e..41d326a 100644
--- a/source/include/sourceforge.sh
+++ b/source/include/sourceforge.sh
@@ -91,6 +91,18 @@ if [ -n "$_F_sourceforge_sep" ] && [ "$_F_sourceforge_sep" = "None" ]; then
         _F_sourceforge_sep=""
 fi
 
+_F_sourceforge_up2date()
+{
+	local auto_realname=""
+	if [ -z "$_F_sourceforge_realname" ]; then
+		## Since the realname may differ on each new release of an package
+		## we try to set it automatically but only if _F_sourceforge_realname is
+		## is not used.
+		auto_realname=$(lynx -dump http://sourceforge.net/project/showfiles.php?group_id=$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;s/#downloads$//;q')|grep -v '+' | grep -i -m1 "   \(\[[0-9][0-9]\]\)${_F_sourceforge_name} "|sed 's/^[ \t]*//;s/ \[.*//;s/.*]//;s/ _.*//g;s/ \(.*\).*//g')
+		_F_sourceforge_realname="$auto_realname"
+	fi
+	lynx -dump http://sourceforge.net/project/showfiles.php?group_id=$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;s/#downloads$//;q')|grep -v '+' | grep -m1 "   \(\[[0-9][0-9]\]\)${_F_sourceforge_realname} "| sed "s/\(\[[0-9][0-9]\]\)Release.*//g;s/.*]//g;s/$_F_sourceforge_prefix\(.*\) \([a-zA-Z]\).*/\1/;s/${_F_sourceforge_realname}${_F_sourceforge_sep}//g;s/${_F_sourceforge_realname} //;s/-/_/g;s/ _.*//g;s/ \(.*\).*//g"
+}
 
 ###
 # == OVERWRITTEN VARIABLES
@@ -99,13 +111,7 @@ fi
 # * source()
 ###
 url="http://sourceforge.net/projects/$_F_sourceforge_dirname"
-if [ -z "$_F_sourceforge_realname" ]; then
-	## Since the realname may differ on each new release of an package
-	## we try to set it automatically but only if _F_sourceforge_realname is
-	## is not used.
-	## DO NOT USE THIS HACK IN ANY OTHER SCHEMA FILE
-	_F_sourceforge_auto_realname=`lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;s/#downloads$//;q')|grep -v '+' | grep -i -m1 "   \(\[[0-9][0-9]\]\)${_F_sourceforge_name} "|sed 's/^[ \t]*//;s/ \[.*//;s/.*]//;s/ _.*//g;s/ \(.*\).*//g'`
-	_F_sourceforge_realname="$_F_sourceforge_auto_realname"
-fi
-up2date="lynx -dump http://sourceforge.net/project/showfiles.php?group_id=\$(lynx -dump $url|grep showfiles|sed 's/.*=\(.*\)/\1/;s/#downloads$//;q')|grep -v '+' | grep -m1 '   \(\[[0-9][0-9]\]\)${_F_sourceforge_realname} '| sed 's/\(\[[0-9][0-9]\]\)Release.*//g;s/.*]//g;s/$_F_sourceforge_prefix\(.*\) \([a-zA-Z]\).*/\1/;s/${_F_sourceforge_realname}${_F_sourceforge_sep}//g;s/${_F_sourceforge_realname} //;s/-/_/g;s/ _.*//g;s/ \(.*\).*//g'"
+# this is needed because without the param tools assume we are using the
+# old-style up2dates
+up2date="_F_sourceforge_up2date fake_param"
 source=(http://${_F_sourceforge_mirror}.dl.sourceforge.net/sourceforge/${_F_sourceforge_dirname}/${_F_sourceforge_name}${_F_sourceforge_sep}${_F_sourceforge_pkgver}${_F_sourceforge_ext})
diff --git a/t/up2date b/t/up2date
index 6e16f9a..7aa4f03 100755
--- a/t/up2date
+++ b/t/up2date
@@ -8,10 +8,6 @@ fi
 for fb in $(find ../source -name FrugalBuild)
 do
 		dir=$(echo $fb|sed 's/\/\F.*//;s/.*\///')
-		## allow for now sourceforge.sh to use the buggy up2date until we
-		## figure an better way to handle the up2date - crazy -
-		if ! grep -q 'sourceforge' $fb; then
-			sh -x -c "source /usr/lib/frugalware/fwmakepkg; source $fb" 2>&1|grep -q '+ lynx' && \
-				echo "$dir is buggy (`grep Maintainer $fb |sed 's/.*: //'`)"
-		fi
+		sh -x -c "source /usr/lib/frugalware/fwmakepkg; source $fb" 2>&1|grep -q '+ lynx' && \
+			echo "$dir is buggy (`grep Maintainer $fb |sed 's/.*: //'`)"
 done
-- 
1.5.4.3