Bug 183412

Summary: [PATCH] ports-mgmt/porttools: Allow using another ports tree
Product: Ports & Packages Reporter: Mathieu Arnold <mat>
Component: Individual Port(s)Assignee: Mathieu Arnold <mat>
Status: Closed FIXED    
Severity: Affects Only Me CC: joemann
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
porttools-0.99_9.patch none

Description Mathieu Arnold freebsd_committer freebsd_triage 2013-10-28 17:00:00 UTC 
/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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-28 17:00:07 UTC 
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
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-28 17:00:08 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Mathieu Arnold freebsd_committer freebsd_triage 2013-10-28 17:00:14 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->mat

Take
Comment 4 Mathieu Arnold freebsd_committer freebsd_triage 2013-11-12 13:30:22 UTC 
State Changed
From-To: feedback->closed

Committed, thanks!
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-11-12 13:30:29 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"