From owner-svn-ports-head@FreeBSD.ORG  Thu Nov 14 18:43:26 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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 08C20D4;
 Thu, 14 Nov 2013 18:43:26 +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 E9E74246A;
 Thu, 14 Nov 2013 18:43:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAEIhPpH040851;
 Thu, 14 Nov 2013 18:43:25 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAEIhP9F040850;
 Thu, 14 Nov 2013 18:43:25 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201311141843.rAEIhP9F040850@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 14 Nov 2013 18:43:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333783 - head/Mk/Uses
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.16
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: Thu, 14 Nov 2013 18:43:26 -0000

Author: jkim
Date: Thu Nov 14 18:43:25 2013
New Revision: 333783
URL: http://svnweb.freebsd.org/changeset/ports/333783

Log:
  Fix symlink when PKGBASE, WEBPLUGIN_DIR, and WEBPLUGIN_NAME are not defined.
  The deeply nested expression for .for loop cannot be completely evaluated at
  the time of loop expansion because PKGBASE will be assigned much later.
  
  Approved by:	bapt

Modified:
  head/Mk/Uses/webplugin.mk

Modified: head/Mk/Uses/webplugin.mk
==============================================================================
--- head/Mk/Uses/webplugin.mk	Thu Nov 14 18:30:39 2013	(r333782)
+++ head/Mk/Uses/webplugin.mk	Thu Nov 14 18:43:25 2013	(r333783)
@@ -166,14 +166,12 @@ WEBPLUGIN_DIR?=		${_WEBPLUGIN_LIBDIR:S,^
 
 PLIST_SUB+=		WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}"
 
-_LNWF=		${WEBPLUGIN_FILES:S,^,${WEBPLUGIN_DIR}/,}
-
 webplugin-post-install:
 	@${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}
 .for d in ${_WEBPLUGIN_LINKFARMS}
 	${INSTALL} -d ${STAGEDIR}${d}
-.for l in ${_LNWF}
-	${LN} -sf ${l} ${STAGEDIR}${d}/
+.for l in ${WEBPLUGIN_FILES}
+	${LN} -sf ${l:S,^,${WEBPLUGIN_DIR}/,} ${STAGEDIR}${d}/
 	@${ECHO_CMD} "${d:S,^${LOCALBASE}/,,}/${l:T}" >> ${TMPPLIST}
 .endfor
 	@${ECHO_CMD} "@unexec rmdir ${d:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}