From mat@aragorn.in.absolight.net  Mon Oct 28 16:59:24 2013
Return-Path: <mat@aragorn.in.absolight.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id BB445133
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Oct 2013 16:59:24 +0000 (UTC)
	(envelope-from mat@aragorn.in.absolight.net)
Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 7FCA82D7D
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Oct 2013 16:59:24 +0000 (UTC)
Received: from prod2.absolight.net (localhost [127.0.0.1])
	by prod2.absolight.net (Postfix) with ESMTP id DAA9CBDC5D;
	Mon, 28 Oct 2013 17:59:22 +0100 (CET)
Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified))
	by prod2.absolight.net (Postfix) with ESMTPSA id B2E86BDC44;
	Mon, 28 Oct 2013 17:59:22 +0100 (CET)
Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225])
	by gw.in.absolight.net (Postfix) with ESMTP id 114656113;
	Mon, 28 Oct 2013 17:59:21 +0100 (CET)
Received: by aragorn.in.absolight.net (Postfix, from userid 1000)
	id 84AF014269C; Mon, 28 Oct 2013 17:59:21 +0100 (CET)
Message-Id: <20131028165921.84AF014269C@aragorn.in.absolight.net>
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: [PATCH] ports-mgmt/porttools: Allow using another ports tree
X-Send-Pr-Version: 3.113
X-GNATS-Notify: joemann@beefree.free.de

>Number:         183412
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/porttools: Allow using another ports tree
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 28 17:00:00 UTC 2013
>Closed-Date:    Tue Nov 12 13:30:26 UTC 2013
>Last-Modified:  Tue Nov 12 13:40:00 UTC 2013
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Mon Oct 28 17:00:08 UTC 2013 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183412 
Responsible-Changed-From-To: freebsd-ports-bugs->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Oct 28 17:00:14 UTC 2013 
Responsible-Changed-Why:  
Take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183412 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: joemann@beefree.free.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/183412: [PATCH] ports-mgmt/porttools: Allow using another ports tree
Date: Mon, 28 Oct 2013 17:00:07 UT

 Maintainer of ports-mgmt/porttools,
 
 Please note that PR ports/183412 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183412
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: mat 
State-Changed-When: Tue Nov 12 13:30:22 UTC 2013 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183412 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183412: commit references a PR
Date: Tue, 12 Nov 2013 13:30:29 +0000 (UTC)

 Author: mat
 Date: Tue Nov 12 13:30:22 2013
 New Revision: 333570
 URL: http://svnweb.freebsd.org/changeset/ports/333570
 
 Log:
   /usr/ports may not be the reference tree you want to use, allow users to
   customize that.
   
   maintainer timeout.
   
   PR:		ports/183412
   Submitted by:	mat
 
 Modified:
   head/ports-mgmt/porttools/Makefile
   head/ports-mgmt/porttools/files/patch-port.in
   head/ports-mgmt/porttools/files/patch-util_diff.in
 
 Modified: head/ports-mgmt/porttools/Makefile
 ==============================================================================
 --- head/ports-mgmt/porttools/Makefile	Tue Nov 12 13:24:45 2013	(r333569)
 +++ head/ports-mgmt/porttools/Makefile	Tue Nov 12 13:30:22 2013	(r333570)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	porttools
  PORTVERSION=	0.99
 -PORTREVISION=	9
 +PORTREVISION=	10
  CATEGORIES=	ports-mgmt
  MASTER_SITES=	SF
  
 
 Modified: head/ports-mgmt/porttools/files/patch-port.in
 ==============================================================================
 --- head/ports-mgmt/porttools/files/patch-port.in	Tue Nov 12 13:24:45 2013	(r333569)
 +++ head/ports-mgmt/porttools/files/patch-port.in	Tue Nov 12 13:30:22 2013	(r333570)
 @@ -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}
 + 
 
 Modified: head/ports-mgmt/porttools/files/patch-util_diff.in
 ==============================================================================
 --- head/ports-mgmt/porttools/files/patch-util_diff.in	Tue Nov 12 13:24:45 2013	(r333569)
 +++ head/ports-mgmt/porttools/files/patch-util_diff.in	Tue Nov 12 13:30:22 2013	(r333570)
 @@ -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"
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
