Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 May 2001 20:16:33 +0400 (MSD)
From:      .@babolo.ru
To:        atsang@hk.linkage.net (Alan Tsang)
Cc:        msmith@FreeBSD.ORG, ports@FreeBSD.ORG
Subject:   Re: FreeBSD Port: pib-1.2
Message-ID:  <200105101616.UAA28111@aaz.links.ru>
In-Reply-To: <01051018385100.97632@vulpecula.universe> from "Alan Tsang" at "May 10, 1 06:38:51 pm"

next in thread | previous in thread | raw e-mail | index | archive | help
Alan Tsang writes:
> The "Distfiles" function of pib does not work, since the location of the md5 
> files of the ports have been changed from $PATH/files/md5 to $PATH/distinfo.
> 
> Change the following line will re-enable the function.
> 
> pib.tcl:1934:   if {[catch {set fh [open "$path/files/md5" "r"]}]} {
> 
> if {[catch {set fh [open "$path/distinfo" "r"]}]} {       #New Code
more complete patch:

--- pib.tcl	Sat Oct 28 13:01:12 2000
+++ pib.tcl	Sat Apr 28 04:05:37 2001
@@ -1931,36 +1920,19 @@
 	update_pwin df_getdinfo [format "%d/%d ports, %dK/sec" $pports $Status(nports) $rate];
 
 	# Find the md5 file.
-	if {[catch {set fh [open "$path/files/md5" "r"]}]} {
+	if {[catch {set fh [open "$path/distinfo" "r"]}]} {
 
-	    # Nope.  Perhaps we're dealing with US ITAR braindamage
-	    if {[op_elookup USA_RESIDENT]} {
-		set aname "$path/files.usa/md5";
+	    # Can't find an distinfo file; give up
+	    if {[file isdirectory "$path"]} {
+		if {$Options(warn_no_md5)} {
+		    lappend errs "$pname: '$path/distinfo' not found";
+		}
 	    } else {
-		set aname "$path/files.non_usa/md5";
-	    }
-
-	    # try again with a new name
-	    if {[catch {set fh [open $aname "r"]}]} {
-
-		# Can't find an md5 file; give up
-		if {[file isdirectory "$path/files"]} {
-		    if {$Options(warn_no_md5)} {
-			lappend errs "$pname: '$path/files/md5' not found";
-		    }
-		} else {
-		    if {[file isdirectory $path]} {
-			if {$Options(warn_no_fdir)} {
-			    lappend errs "$pname: '$path/files' not found";
-			}
-		    } else {
-			if {$Options(warn_no_port)} {
-			    lappend errs "$pname: directory missing.";
-			}
-		    }
+		if {$Options(warn_no_port)} {
+		    lappend errs "$pname: directory missing.";
 		}
-		continue ;			# if no port info, assume it's not wanted
 	    }
+	    continue ;				# if no port info, assume it's not wanted
 	}
 
 	# initialise state for this port
> 
> 
> Regards
> 
> Alan Tsang

-- 
@BABOLO      http://links.ru/

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105101616.UAA28111>