From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Aug 22 13:20:26 2004 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 74EDA16A4CF for ; Sun, 22 Aug 2004 13:20:26 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43C0243D46 for ; Sun, 22 Aug 2004 13:20:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7MDKQLT043830 for ; Sun, 22 Aug 2004 13:20:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7MDKQsD043829; Sun, 22 Aug 2004 13:20:26 GMT (envelope-from gnats) Resent-Date: Sun, 22 Aug 2004 13:20:26 GMT Resent-Message-Id: <200408221320.i7MDKQsD043829@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 349EF16A4CE for ; Sun, 22 Aug 2004 13:16:04 +0000 (GMT) Received: from home.rbt.ca (dyn-71-23.tor.dsl.tht.net [134.22.71.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCB8C43D48 for ; Sun, 22 Aug 2004 13:16:03 +0000 (GMT) (envelope-from rbt@home.rbt.ca) Received: from home.rbt.ca (localhost [127.0.0.1]) by home.rbt.ca (8.12.10/8.12.10) with ESMTP id i7MDFkXt061658 for ; Sun, 22 Aug 2004 09:15:46 -0400 (EDT) (envelope-from rbt@home.rbt.ca) Received: (from rbt@localhost) by home.rbt.ca (8.12.10/8.12.10/Submit) id i7MDFjiW061580; Sun, 22 Aug 2004 09:15:45 -0400 (EDT) (envelope-from rbt) Message-Id: <200408221315.i7MDFjiW061580@home.rbt.ca> Date: Sun, 22 Aug 2004 09:15:45 -0400 (EDT) From: Rod Taylor To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/70819: UPDATE - www/bricolage - Minor brig_upgrade corrections 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: Sun, 22 Aug 2004 13:20:26 -0000 >Number: 70819 >Category: ports >Synopsis: UPDATE - www/bricolage - Minor brig_upgrade corrections >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: Sun Aug 22 13:20:25 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Rod Taylor >Release: FreeBSD 5.2.1-RELEASE i386 >Organization: >Environment: System: FreeBSD home 5.2.1-RELEASE FreeBSD 5.2.1-RELEASE #1: Sun Feb 29 13:14:24 EST 2004 root@home:/usr/obj/usr/src/sys/HOME i386 >Description: The -d database option doesn't actually exist -- database is pulled from the bricolage.conf file. Remove it. Change the path to upgrade code (oops). >How-To-Repeat: >Fix: --- bricolage.patch begins here --- diff -ruN bricolage.orig/files/bric_upgrade.sh bricolage/files/bric_upgrade.sh --- bricolage.orig/files/bric_upgrade.sh Fri Aug 20 19:33:39 2004 +++ bricolage/files/bric_upgrade.sh Sun Aug 22 09:07:19 2004 @@ -1,6 +1,6 @@ #!/bin/sh -BRICUPGRADE=%%PREFIX%% +BRICUPGRADE=%%PREFIX%%/bricolage/upgrade NEWVERSION=%%PORTVERSION%% # Ensure the version exists diff -ruN bricolage.orig/pkg-message bricolage/pkg-message --- bricolage.orig/pkg-message Sat Aug 21 23:26:17 2004 +++ bricolage/pkg-message Sun Aug 22 09:07:43 2004 @@ -62,10 +62,9 @@ Common Supported Options: -u Database user login. -p Database user password. - -d Database name. Example: - %%PREFIX%%/bin/bric_upgrade -u pgsql -d bric 1.8.0 + %%PREFIX%%/bin/bric_upgrade -u pgsql 1.8.0 ************************************************************ --- bricolage.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: