From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 5 04:20:52 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E983616A4CE for ; Thu, 5 May 2005 04:20:51 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAD5D43D6B for ; Thu, 5 May 2005 04:20:51 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j454K28X019549 for ; Thu, 5 May 2005 04:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j454K2Z7019548; Thu, 5 May 2005 04:20:02 GMT (envelope-from gnats) Resent-Date: Thu, 5 May 2005 04:20:02 GMT Resent-Message-Id: <200505050420.j454K2Z7019548@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rod Taylor Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF65116A4CE for ; Thu, 5 May 2005 04:17:28 +0000 (GMT) Received: from home.rbt.ca (216-154-17-12.dsl.look.ca [216.154.17.12]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64F1843D1D for ; Thu, 5 May 2005 04:17:28 +0000 (GMT) (envelope-from rbt@home.rbt.ca) Received: from home.rbt.ca (localhost [127.0.0.1]) by home.rbt.ca (8.13.1/8.13.1) with ESMTP id j454EUEh035273 for ; Thu, 5 May 2005 00:14:31 -0400 (EDT) (envelope-from rbt@home.rbt.ca) Received: (from rbt@localhost) by home.rbt.ca (8.13.1/8.13.1/Submit) id j454ETs0035272; Thu, 5 May 2005 00:14:29 -0400 (EDT) (envelope-from rbt) Message-Id: <200505050414.j454ETs0035272@home.rbt.ca> Date: Thu, 5 May 2005 00:14:29 -0400 (EDT) From: Rod Taylor To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/80636: MAINTAINER-UPDATE: www/bricolage X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rod Taylor List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2005 04:20:52 -0000 >Number: 80636 >Category: ports >Synopsis: MAINTAINER-UPDATE: www/bricolage >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu May 05 04:20:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Rod Taylor >Release: FreeBSD 5.3-RELEASE amd64 >Organization: >Environment: System: FreeBSD home 5.3-RELEASE FreeBSD 5.3-RELEASE #7: Tue Jan 25 02:28:10 EST 2005 root@home:/usr/obj/usr/src/sys/HOME amd64 >Description: Bump the upgrade file structure to deal with a nonexistant directory without complaining. Depends on ports/80625. >How-To-Repeat: >Fix: --- bric.patch2 begins here --- diff -crN bricolage.new/files/bric_upgrade.sh bricolage/files/bric_upgrade.sh *** bricolage.new/files/bric_upgrade.sh Wed May 4 23:51:08 2005 --- bricolage/files/bric_upgrade.sh Tue Jan 25 01:16:25 2005 *************** *** 12,18 **** # Ensure the old version exists at the end of the argument list OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"` ! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[01234]$/OKAY/"` if [ "${VTEST}" != "OKAY" ] then echo "The final argument should be the old version of the port, in the format." --- 12,18 ---- # Ensure the old version exists at the end of the argument list OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"` ! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[012]$/OKAY/"` if [ "${VTEST}" != "OKAY" ] then echo "The final argument should be the old version of the port, in the format." *************** *** 31,43 **** # Now try to upgrade it for ver in `grep -A 1000 ${OLDVERSION} ${BRICUPGRADE}/versions.txt | tail -n +2` do ! if [ -d ${BRICUPGRADE}/${ver} ] ! then ! for file in `ls ${BRICUPGRADE}/${ver}` ! do ! ${BRICUPGRADE}/${ver}/${file} $@ # Run with our args ! done ! fi done echo "Upgrade complete" --- 31,40 ---- # Now try to upgrade it for ver in `grep -A 1000 ${OLDVERSION} ${BRICUPGRADE}/versions.txt | tail -n +2` do ! for file in `ls ${BRICUPGRADE}/${ver}` ! do ! ${BRICUPGRADE}/${ver}/${file} $@ # Run with our args ! done done echo "Upgrade complete" --- bric.patch2 ends here --- >Release-Note: >Audit-Trail: >Unformatted: