From owner-svn-ports-head@FreeBSD.ORG  Wed Jun 19 21:44:37 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 876D86E;
 Wed, 19 Jun 2013 21:44:37 +0000 (UTC)
 (envelope-from ohauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7414810FB;
 Wed, 19 Jun 2013 21:44:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JLibNR055984;
 Wed, 19 Jun 2013 21:44:37 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5JLibeO055982;
 Wed, 19 Jun 2013 21:44:37 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201306192144.r5JLibeO055982@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Wed, 19 Jun 2013 21:44:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321336 - in head: . java/subversion-java
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jun 2013 21:44:37 -0000

Author: ohauer
Date: Wed Jun 19 21:44:36 2013
New Revision: 321336
URL: http://svnweb.freebsd.org/changeset/ports/321336

Log:
  - allow java/subversion-jave to stay on subversion17
  - update UPDATING with a hint how to keep subversion17

Modified:
  head/UPDATING
  head/java/subversion-java/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Jun 19 21:42:55 2013	(r321335)
+++ head/UPDATING	Wed Jun 19 21:44:36 2013	(r321336)
@@ -12,7 +12,9 @@ you update your ports collection, before
   devel/subversion has been upgraded from 1.7.10 to 1.8.0
   subversion-1.7.x is available as devel/subversion17
 
-  To stay on subversion-1.7.x use the following command
+  To stay on subversion-1.7.x set in /etc/make.conf 
+  WITH_SUBVERSION_VER=17
+  and use the following command
   
   # pkg set -o devel/subversion:devel/subversion17
 

Modified: head/java/subversion-java/Makefile
==============================================================================
--- head/java/subversion-java/Makefile	Wed Jun 19 21:42:55 2013	(r321335)
+++ head/java/subversion-java/Makefile	Wed Jun 19 21:44:36 2013	(r321336)
@@ -9,6 +9,8 @@ COMMENT=	Java bindings for Version contr
 
 .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
 MASTERDIR=	${.CURDIR}/../../devel/subversion16
+.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
+MASTERDIR=	${.CURDIR}/../../devel/subversion16
 .else
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 .endif