Date: Mon, 28 Oct 2013 17:59:21 +0100 (CET) From: Mathieu Arnold <mat@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: joemann@beefree.free.de Subject: ports/183412: [PATCH] ports-mgmt/porttools: Allow using another ports tree Message-ID: <20131028165921.84AF014269C@aragorn.in.absolight.net> Resent-Message-ID: <201310281700.r9SH00I4034806@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183412
>Category: ports
>Synopsis: [PATCH] ports-mgmt/porttools: Allow using another ports tree
>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: Mon Oct 28 17:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
/usr/ports may not be the reference tree you want to use, allow users to
customize that.
Port maintainer (joemann@beefree.free.de) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- porttools-0.99_9.patch begins here ---
Index: files/patch-port.in
===================================================================
--- files/patch-port.in (revision 18768)
+++ files/patch-port.in (working copy)
@@ -1,6 +1,6 @@
--- port.in.orig 2009-09-10 04:59:59.000000000 +0900
-+++ port.in 2012-12-27 19:30:02.000000000 +0900
-@@ -19,7 +19,7 @@
++++ port.in 2013-10-28 17:50:13.000000000 +0100
+@@ -19,12 +19,15 @@
ORGANIZATION=""
BUILDROOT="/tmp"
ARCHIVE_DIR=""
@@ -8,4 +8,12 @@
+ DIFF_MODE="SVN"
DIFF_VIEWER="more"
PORTLINT_FLAGS="abct"
++ PORTSDIR="/usr/ports"
EOF
+ fi
+
++PORTSDIR="/usr/ports"
++
+ # Reading configuration file
+ . ${PORTTOOLS}
+
Index: files/patch-util_diff.in
===================================================================
--- files/patch-util_diff.in (revision 18768)
+++ files/patch-util_diff.in (working copy)
@@ -1,5 +1,5 @@
--- util_diff.in.orig 2009-09-10 04:59:59.000000000 +0900
-+++ util_diff.in 2012-12-31 21:44:44.000000000 +0900
++++ util_diff.in 2013-10-28 17:48:33.000000000 +0100
@@ -14,7 +14,8 @@
# Determine if this is a new port
if [ "${MODE}" = "" ]
@@ -24,24 +24,24 @@
+ if [ "${DIFF_MODE}" = "" ]
then
- DIFF_MODE="/usr/ports"
-+ if [ -d /usr/ports/.svn ]
++ if [ -d ${PORTSDIR}/.svn ]
+ then
+ DIFF_MODE="SVN"
+ else
-+ DIFF_MODE="/usr/ports"
++ DIFF_MODE="${PORTSDIR}"
+ fi
+ echo "Default diff mode is ${DIFF_MODE}"
+ elif [ "${DIFF_MODE}" = "SVN" ]
+ then
+ # If there is no .svn directory then
-+ # fallback to diffing against /usr/ports tree
-+ if [ ! -d /usr/ports/.svn ]
++ # fallback to diffing against ${PORTSDIR} tree
++ if [ ! -d ${PORTSDIR}/.svn ]
+ then
+ echo "Diff mode was set to ${DIFF_MODE}, but there's no .svn directory"
-+ echo -n "Trying /usr/ports ... "
-+ if [ -d /usr/ports ]
++ echo -n "Trying ${PORTSDIR} ... "
++ if [ -d ${PORTSDIR} ]
+ then
-+ DIFF_MODE="/usr/ports"
++ DIFF_MODE="${PORTSDIR}"
+ echo "found"
+ else
+ echo "not found - please choose an approriate diff mode"
--- porttools-0.99_9.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?20131028165921.84AF014269C>