From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 23 07:50:23 2003 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 F383716A4BF for ; Sat, 23 Aug 2003 07:50:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D65543FDF for ; Sat, 23 Aug 2003 07:50:22 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h7NEoHUp036579 for ; Sat, 23 Aug 2003 07:50:17 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h7NEoH7p036578; Sat, 23 Aug 2003 07:50:17 -0700 (PDT) Resent-Date: Sat, 23 Aug 2003 07:50:17 -0700 (PDT) Resent-Message-Id: <200308231450.h7NEoH7p036578@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, Lars Thegler Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66DFB16A4BF for ; Sat, 23 Aug 2003 07:45:37 -0700 (PDT) Received: from dask.thegler.dk (dask.thegler.dk [212.242.93.12]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDB3943F3F for ; Sat, 23 Aug 2003 07:45:36 -0700 (PDT) (envelope-from lth@dask.thegler.dk) Received: by dask.thegler.dk (Postfix, from userid 1001) id EA5A13E04; Sat, 23 Aug 2003 16:45:34 +0200 (CEST) Message-Id: <20030823144534.EA5A13E04@dask.thegler.dk> Date: Sat, 23 Aug 2003 16:45:34 +0200 (CEST) From: Lars Thegler To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: sergei@kolobov.com Subject: ports/55893: [PATCH] devel/porttools: misc problems fixed X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2003 14:50:23 -0000 >Number: 55893 >Category: ports >Synopsis: [PATCH] devel/porttools: misc problems fixed >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 23 07:50:16 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Lars Thegler >Release: FreeBSD 4.8-STABLE i386 >Organization: >Environment: System: FreeBSD dask.thegler.dk 4.8-STABLE FreeBSD 4.8-STABLE #9: Tue Jul 29 01:39:22 CEST 2003 >Description: The attached patches fix the following problems: - pr-update: when ${ARCHIVE_DIR} is undefined, the script coughs 'unexpected operator' - pr-update: "-d " option does not work due to typo - testport: command-line argument list handling cannot handle more than one argument Port maintainer and original author (sergei@kolobov.com) is cc'd. Generated with FreeBSD Port Tools 0.25 >How-To-Repeat: >Fix: --- porttools-0.25_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports//devel/porttools/Makefile /usr/home/lth/ports/devel/porttools/Makefile --- /usr/ports//devel/porttools/Makefile Fri Aug 1 07:02:35 2003 +++ /usr/home/lth/ports/devel/porttools/Makefile Sat Aug 23 14:25:38 2003 @@ -7,6 +7,7 @@ PORTNAME= porttools PORTVERSION= 0.25 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff -ruN --exclude=CVS /usr/ports//devel/porttools/files/patch-pr-update /usr/home/lth/ports/devel/porttools/files/patch-pr-update --- /usr/ports//devel/porttools/files/patch-pr-update Thu Jan 1 01:00:00 1970 +++ /usr/home/lth/ports/devel/porttools/files/patch-pr-update Sat Aug 23 14:25:11 2003 @@ -0,0 +1,20 @@ +--- pr-update.orig Sat Aug 23 14:23:34 2003 ++++ pr-update Sat Aug 23 14:24:50 2003 +@@ -283,7 +283,7 @@ + # Check to see if the original version of port exist + if [ ! -d ${ORIG_DIR} ] + then +- echo "Original version does not exist at ${ORIG_PORT}" ++ echo "Original version does not exist at ${ORIG_DIR}" + rm -rf ${TEMPROOT} + exit 1 + fi +@@ -381,7 +381,7 @@ + + # Cleanup + ${MSG} "Saving submitted PR, cleaning up" +-if [ -n ${ARCHIVE_DIR} -a -d ${ARCHIVE_DIR} ] ++if [ -n "${ARCHIVE_DIR}" -a -d ${ARCHIVE_DIR} ] + then + mv ${PATCH} ${ARCHIVE_DIR} + fi diff -ruN --exclude=CVS /usr/ports//devel/porttools/files/patch-testport /usr/home/lth/ports/devel/porttools/files/patch-testport --- /usr/ports//devel/porttools/files/patch-testport Thu Jan 1 01:00:00 1970 +++ /usr/home/lth/ports/devel/porttools/files/patch-testport Sat Aug 23 14:23:08 2003 @@ -0,0 +1,34 @@ +--- testport.orig Sat Aug 23 14:21:10 2003 ++++ testport Sat Aug 23 14:21:45 2003 +@@ -81,24 +81,31 @@ + ;; + -l) # run portlint(1) only + STOP="lint" ++ shift + ;; + -L) # do NOT run portlint(1) + RUN_PORTLINT="no" ++ shift + ;; + -b) # stop after build phase + STOP="build" ++ shift + ;; + -i) # stop after install phase + STOP="install" ++ shift + ;; + -p) # stop after package phase + STOP="package" ++ shift + ;; + -c) # Do NOT clean before + CLEAN_BEFORE="no" ++ shift + ;; + -C) # Do NOT clean after + CLEAN_AFTER="no" ++ shift + ;; + --) # End of option list + shift --- porttools-0.25_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: