From owner-svn-ports-head@FreeBSD.ORG Tue Sep 23 11:01:25 2014 Return-Path: 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 5422D807; Tue, 23 Sep 2014 11:01:25 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3FE417FB; Tue, 23 Sep 2014 11:01:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8NB1PC9013824; Tue, 23 Sep 2014 11:01:25 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8NB1P2Z013823; Tue, 23 Sep 2014 11:01:25 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409231101.s8NB1P2Z013823@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 23 Sep 2014 11:01:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369030 - 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Sep 2014 11:01:25 -0000 Author: bapt Date: Tue Sep 23 11:01:24 2014 New Revision: 369030 URL: http://svnweb.freebsd.org/changeset/ports/369030 QAT: https://qat.redports.org/buildarchive/r369030/ Log: Simplify USES=webplugin Modified: head/Mk/Uses/webplugin.mk Modified: head/Mk/Uses/webplugin.mk ============================================================================== --- head/Mk/Uses/webplugin.mk Tue Sep 23 10:56:18 2014 (r369029) +++ head/Mk/Uses/webplugin.mk Tue Sep 23 11:01:24 2014 (r369030) @@ -165,18 +165,17 @@ _WEBPLUGIN_LINKFARMS= ${_WEBPLUGIN_APPS} WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME} PLIST_SUB+= WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}" +.for d in ${_WEBPLUGIN_LINKFARMS} +.for l in ${WEBPLUGIN_FILES} +PLIST_FILES+= ${d}/${l} +.endfor +.endfor webplugin-post-install: - @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} .for d in ${_WEBPLUGIN_LINKFARMS} - ${INSTALL} -d ${STAGEDIR}${d} + ${MKDIR} ${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} .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} - .endif