svn commit: r369030 - head/Mk/Uses

Baptiste Daroussin bapt at FreeBSD.org
Tue Sep 23 11:01:25 UTC 2014


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


More information about the svn-ports-head mailing list