From owner-svn-ports-all@FreeBSD.ORG Tue Nov 12 13:30:23 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46F6FE9D; Tue, 12 Nov 2013 13:30:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 27CCE2C0A; Tue, 12 Nov 2013 13:30:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACDUNi3050633; Tue, 12 Nov 2013 13:30:23 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACDUM7E050630; Tue, 12 Nov 2013 13:30:22 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201311121330.rACDUM7E050630@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 12 Nov 2013 13:30:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333570 - in head/ports-mgmt/porttools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Nov 2013 13:30:23 -0000 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"