Date: Sat, 23 Aug 2003 16:45:34 +0200 (CEST) From: Lars Thegler <lars@thegler.dk> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sergei@kolobov.com Subject: ports/55893: [PATCH] devel/porttools: misc problems fixed Message-ID: <20030823144534.EA5A13E04@dask.thegler.dk> Resent-Message-ID: <200308231450.h7NEoH7p036578@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <dir>" 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030823144534.EA5A13E04>