From owner-freebsd-ports Fri Oct 20 10:40:12 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AB30637B4D7 for ; Fri, 20 Oct 2000 10:40:00 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA86750; Fri, 20 Oct 2000 10:40:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from thehousleys.net (frenchknot.ne.mediaone.net [24.147.224.201]) by hub.freebsd.org (Postfix) with ESMTP id 3EA0837B479 for ; Fri, 20 Oct 2000 10:33:25 -0700 (PDT) Received: from baby.int.thehousleys.net (baby.ipv6.thehousleys.net [3ffe:1ce3:6:0:260:8ff:fea3:7fb2]) by thehousleys.net (8.11.0/8.11.0) with ESMTP id e9KHXEQ64222 for ; Fri, 20 Oct 2000 13:33:14 -0400 (EDT) (envelope-from housley@thehousleys.net) Received: (from housley@localhost) by baby.int.thehousleys.net (8.11.0/8.11.0) id e9KHXE334890; Fri, 20 Oct 2000 13:33:14 -0400 (EDT) (envelope-from housley) Message-Id: <200010201733.e9KHXE334890@baby.int.thehousleys.net> Date: Fri, 20 Oct 2000 13:33:14 -0400 (EDT) From: jeh@freebsd.org Reply-To: jeh@freebsd.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/22154: bsd.port.mk minor corrections to match the new layout Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 22154 >Category: ports >Synopsis: bsd.port.mk minor corrections to match the new layout >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Oct 20 10:40:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: James E. Housley >Release: FreeBSD 4.1.1-STABLE i386 >Organization: The Housleys dot Net >Environment: >Description: Correct a few places that referenced files/md5 and md5 instead of distinfo >How-To-Repeat: >Fix: --- bsd.port.mk.orig Tue Oct 17 19:59:30 2000 +++ bsd.port.mk Fri Oct 20 13:30:56 2000 @@ -318,7 +318,7 @@ # checkpatch - Do a "patch -C" instead of a "patch". Note that it may # give incorrect results if multiple patches deal with # the same file. -# checksum - Use files/md5 to ensure that your distfiles are valid. +# checksum - Use distinfo to ensure that your distfiles are valid. # checksum-recursive - Run checksum in this port and all dependencies. # makesum - Generate distinfo (only do this for your own ports!). # clean - Remove ${WRKDIR} and other temporary files used for building. @@ -2384,7 +2384,7 @@ ${ECHO_MSG} ">> No checksum recorded for $$file."; \ OK="false"; \ elif [ "$$CKSUM2" = "IGNORE" ]; then \ - ${ECHO_MSG} ">> Checksum for $$file is set to IGNORE in md5 file even though"; \ + ${ECHO_MSG} ">> Checksum for $$file is set to IGNORE in distinfo file even though"; \ ${ECHO_MSG} " the file is not in the "'$$'"{IGNOREFILES} list."; \ OK="false"; \ elif ${EXPR} "$$CKSUM2" : ".*$$CKSUM" > /dev/null; then \ @@ -2400,13 +2400,13 @@ ${ECHO_MSG} ">> No checksum recorded for $$file, file is in "'$$'"{IGNOREFILES} list."; \ OK="false"; \ elif [ "$$CKSUM2" != "IGNORE" ]; then \ - ${ECHO_MSG} ">> Checksum for $$file is not set to IGNORE in md5 file even though"; \ + ${ECHO_MSG} ">> Checksum for $$file is not set to IGNORE in distinfo file even though"; \ ${ECHO_MSG} " the file is in the "'$$'"{IGNOREFILES} list."; \ OK="false"; \ fi; \ done; \ if [ "$$OK" != "true" ]; then \ - ${ECHO_MSG} "Make sure the Makefile and md5 file (${MD5_FILE})"; \ + ${ECHO_MSG} "Make sure the Makefile and distinfo file (${MD5_FILE})"; \ ${ECHO_MSG} "are up to date. If you are absolutely sure you want to override this"; \ ${ECHO_MSG} "check, type \"make NO_CHECKSUM=yes [other args]\"."; \ exit 1; \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message