From owner-svn-ports-head@FreeBSD.ORG  Tue Nov 12 18:01:39 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 C3791DFC;
 Tue, 12 Nov 2013 18:01:39 +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 B214E29A4;
 Tue, 12 Nov 2013 18:01:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACI1ddT046495;
 Tue, 12 Nov 2013 18:01:39 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACI1dSn046494;
 Tue, 12 Nov 2013 18:01:39 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201311121801.rACI1dSn046494@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 12 Nov 2013 18:01:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333595 - 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: Tue, 12 Nov 2013 18:01:39 -0000

Author: bapt
Date: Tue Nov 12 18:01:39 2013
New Revision: 333595
URL: http://svnweb.freebsd.org/changeset/ports/333595

Log:
  Fix when PREFIX != LOCALBASE
  
  Reported by:	avilla

Modified:
  head/Mk/Uses/webplugin.mk

Modified: head/Mk/Uses/webplugin.mk
==============================================================================
--- head/Mk/Uses/webplugin.mk	Tue Nov 12 17:58:00 2013	(r333594)
+++ head/Mk/Uses/webplugin.mk	Tue Nov 12 18:01:39 2013	(r333595)
@@ -167,20 +167,19 @@ WEBPLUGIN_DIR?=		${_WEBPLUGIN_LIBDIR:S,^
 PLIST_SUB+=		WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}"
 
 _LNWF=		${WEBPLUGIN_FILES:S,^,${WEBPLUGIN_DIR}/,}
-.for f in ${WEBPLUGIN_FILES}
-PLIST_FILES+=	${_WEBPLUGIN_LINKFARMS:S,${LOCALBASE}/,,:C,(.*),\1/${f},}
-.endfor
-PLIST_DIRSTRY+=	${_WEBPLUGIN_SLDIRS:S,^${LOCALBASE}/,,} \
-		${_WEBPLUGIN_SLDIR:S,^${LOCALBASE}/,,} \
-		${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,,}
 
 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}/
+	@${ECHO_CMD} "${d:S,^${LOCALBASE}/,,}/${l:T}" >> ${TMPPLIST}
 .endfor
+	@${ECHO_CMD} "@unexec rmdir ${d:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
 .endfor
+	@${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_SLDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
 
 post-install: webplugin-post-install