From dc0fe177105116551119f6762145c947c6d577ee Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Wed, 13 Feb 2008 23:26:35 +0000
Subject: [PATCH] Changed download and freshmeat hives to simply return the
 urls, and changed sde-create-package to use url2d to convert them into good
 [D] tags

---
 bin/sde-create-package          | 2 +-
 lib/sde-package/hives/download  | 7 +++----
 lib/sde-package/hives/freshmeat | 5 +----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/bin/sde-create-package b/bin/sde-create-package
index 37cc4e9..35a7ed8 100755
--- a/bin/sde-create-package
+++ b/bin/sde-create-package
@@ -216,7 +216,7 @@ $( echo "$desc" | sed -e 's,^,[T] ,' )
 
 EOT
 echo "$download" | while read l; do
-	echo "[D] $l"
+	"$SDEROOT/lib/sde-package/url2d.sh" "$l"
 done
 ) | tee "$SDEROOT/package/$repo/$pkg/$pkg.desc"
 
diff --git a/lib/sde-package/hives/download b/lib/sde-package/hives/download
index e8af152..051b7c6 100755
--- a/lib/sde-package/hives/download
+++ b/lib/sde-package/hives/download
@@ -13,9 +13,8 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-[ -n "$SDEROOT" ] ||
-	export SDEROOT=$( cd "${0%/*}/../../../"; pwd -P )
-
 pkg="$1"; shift
 
-exec "$SDEROOT/lib/sde-package/url2d.sh" "$@"
+for dl; do
+	echo "[D] $dl"
+done
diff --git a/lib/sde-package/hives/freshmeat b/lib/sde-package/hives/freshmeat
index 96cb2cd..4415dce 100755
--- a/lib/sde-package/hives/freshmeat
+++ b/lib/sde-package/hives/freshmeat
@@ -24,12 +24,9 @@ extract_xml_name() {
 }
 
 get_download() {
-    local location
     for arg; do
 	if curl -s -I -f "$arg" -o "header.log"; then
 	    location="`sed -n 's/\r// ; s/Location: *//p' header.log`"
-	    download_file="`basename $location`"
-	    download_url="`dirname $location`/"
 	    rm -f header.log
 	    return
 	fi
@@ -169,5 +166,5 @@ fi
 # [V]
 [ -z "$version" ] || echo "[S] $version"
 # [D]
-[ -z "$download_file" ] || echo "[D] 0 $download_file $download_url"
+[ -z "$location" ] || echo "[D] $location"