----Security_Multipart(Thu_Jan_18_01_42_45_2007_137)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

In the message on Tue, 16 Jan 2007 11:07:54 +0000,
Steve O'Hara-Smith <steve@sohara.org> wrote:

> 	The latest change to mk/fetch/fetch (adding a setting of fetchdir)
> seems to have broken fetch (perhaps only on DragonFly). An empty file gets
> generated (no ftp transfer occurs).

It's the same on i386 port.

The following patch fixes this.

Index: fetch
===================================================================
RCS file: /usr/cvsup/pkgsrc/mk/fetch/fetch,v
retrieving revision 1.7
diff -d -p -u -r1.7 fetch
--- fetch       10 Jan 2007 14:31:35 -0000      1.7
+++ fetch       17 Jan 2007 16:37:42 -0000
@@ -189,10 +189,7 @@ if ${TEST} -n "$distinfo"; then
                Size)   ;;      # only handle "Size" lines
                *)      continue ;;
                esac
-               case "$fetchdir" in
-               ".")    ${TEST} "$d_file" = "($file)" || continue ;;
-               *)      ${TEST} "$d_file" = "($path)" || continue ;;
-               esac
+               ${TEST} "$d_file" = "($file)" || continue
                distsize="$d_size"; distunits="$d_units"
                break
        done < $distinfo

--
Ryo HAYASAKA <ryoh@jaist.ac.jp>
Japan Advanced Institute of Science and Technology (JAIST)

----Security_Multipart(Thu_Jan_18_01_42_45_2007_137)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (NetBSD)

iD8DBQBFrlIH11up7NrSK2IRAvemAJ4i0IZBSsF3d/flWANt4m5lV7ec2wCfTLvM
c7/otkNk6lo81GHct8VMbkI=
=eUgC
-----END PGP SIGNATURE-----

----Security_Multipart(Thu_Jan_18_01_42_45_2007_137)----