From owner-svn-ports-all@FreeBSD.ORG  Fri Dec  6 18:45:13 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
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 ESMTPS id 91D4AC06;
 Fri,  6 Dec 2013 18:45:13 +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 7E756164A;
 Fri,  6 Dec 2013 18:45:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB6IjDbH080572;
 Fri, 6 Dec 2013 18:45:13 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB6IjDjM080571;
 Fri, 6 Dec 2013 18:45:13 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201312061845.rB6IjDjM080571@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 6 Dec 2013 18:45:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r335781 - head
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Dec 2013 18:45:13 -0000

Author: bdrewery
Date: Fri Dec  6 18:45:13 2013
New Revision: 335781
URL: http://svnweb.freebsd.org/changeset/ports/335781

Log:
  - Fix 'make index' not working when PORTSDIR is a symlink to another directory
  
  PR:		ports/183431
  Submitted by:	Yasuhiro KIMURA <yasu@utahime.org> (based on)

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Fri Dec  6 17:43:18 2013	(r335780)
+++ head/Makefile	Fri Dec  6 18:45:13 2013	(r335781)
@@ -141,10 +141,13 @@ ${INDEXDIR}/${INDEXFILE}:
 			echo; \
 		fi; \
 		exit 1); \
-	cat $${tmpdir}/${INDEXFILE}.desc.* | (cd ${.CURDIR} ; ${MAKE_INDEX}) | \
+	cat $${tmpdir}/${INDEXFILE}.desc.* | \
+		sed -e 's|${.CURDIR}|${PORTSDIR}|g' | \
+		(cd ${.CURDIR} ; ${MAKE_INDEX}) | \
 		sed -e 's/  */ /g' -e 's/|  */|/g' -e 's/  *|/|/g' -e 's./.
.g' | \
 		sort -t '|' +1 -2 | \
 		sed -Ee 's.
./.g' -e ':a' -e 's|/[^/]+/\.\.||; ta' \
+		-e 's|${PORTSDIR}|/usr/ports|g' \
 		-e 's|${.CURDIR}|/usr/ports|g' > ${INDEXDIR}/${INDEXFILE}.tmp; \
 	if [ "${INDEX_PRISTINE}" != "" ]; then \
 		sed -e "s,$${LOCALBASE},/usr/local," ${INDEXDIR}/${INDEXFILE}.tmp > ${INDEXDIR}/${INDEXFILE}; \