From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 14 10:24:16 2013 Return-Path: Delivered-To: freebsd-gecko@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 90A3A785 for ; Thu, 14 Nov 2013 10:24:16 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 259032DB4 for ; Thu, 14 Nov 2013 10:24:15 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id rAEAODqB079019 for ; Thu, 14 Nov 2013 10:24:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id rAEAO8qE078457 for freebsd-gecko@freebsd.org; Thu, 14 Nov 2013 10:24:08 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 14 Nov 2013 10:24:08 GMT Message-Id: <201311141024.rAEAO8qE078457@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1381 - in trunk: Mk/Uses www/firefox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Nov 2013 10:24:16 -0000 Author: jbeich Date: Thu Nov 14 10:24:08 2013 New Revision: 1381 Log: chase rename and sync Makefile.webplugins Added: trunk/Mk/Uses/ trunk/Mk/Uses/webplugin.mk Deleted: trunk/www/firefox/Makefile.webplugins Added: trunk/Mk/Uses/webplugin.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/Mk/Uses/webplugin.mk Thu Nov 14 10:24:08 2013 (r1381) @@ -0,0 +1,186 @@ +# $FreeBSD: head/Mk/Uses/webplugin.mk 333595 2013-11-12 18:01:39Z bapt $ +# +# MAINTAINER= gecko@FreeBSD.org +# +# Documentation and examples: +# +# Feature: webplugin +# Usage: USES=webplugin or USES=webplugin:ARGS +# Valid ARGS: gecko: Support geko based plugings +# native: Support gecko, opera, webkit-gtk* +# linux: Support linux plugins +# [list of indivudual engines]: specify browsers to use +# all: All browser (implicit, default) +# +# USES=webplugin will create symlinks automatically for each supported +# application that supports the webplugin framework. Also, it will remove +# these symlinks when the plug-in port is uninstalled. +# +# WEBPLUGIN_NAME - If your port installs files in ${WEBPLUGIN_DIR}, +# then you can tweak WEBPLUGIN_NAME to change the +# name of the directory +# (lib/browser_plugins/symlinks/WEBPLUGIN_NAME). +# Default: WEBPLUGIN_NAME=${PKGBASE} +# +# WEBPLUGIN_FILES - The plug-in files that are going to be linked +# in lib/browser_plugins/symlinks/*/. It cannot +# be empty or the port will set IGNORE. +# +# WEBPLUGIN_DIR - The directory where the plug-in file(s) can be +# found. Each plug-in file in WEBPLUGIN_FILES +# must be found in WEBPLUGIN_DIR. If your port +# does not install in WEBPLUGIN_DIR, but in its own +# path, you will need to specify that here or +# symlinks will be created to non-existent files. +# Default: WEBPLUGIN_DIR=${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME} +# +# Makefile: +# ------------------------------------------------------ +# USES= webplugin:gecko +# [...] +# WEBPLUGIN_FILES=fooplugin.so fooplugin.xpi +# +# post-install: +# ${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} +# ${INSTALL_DATA} ${WEBPLUGIN_FILES:S,^,${WRKSRC}/plugins/,} \ +# ${STAGEDIR}${WEBPLUGIN_DIR} +# +# .include +# ------------------------------------------------------ +# +# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks +# in pkg-plist, because they will be removed automatically. +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# %%WEBPLUGIN_DIR%%/fooplugin.so +# %%WEBPLUGIN_DIR%%/fooplugin.xpi +# @dirrmtry %%WEBPLUGIN_DIR%% +# ------------------------------------------------------ +# +# Here is what it will look like when it creates the symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi +# ------------------------------------------------------ +# +# If your port uses libtool, and installs any *.a and *.la files, do not add +# these files to WEBPLUGIN_FILES. WEBPLUGIN_FILES should be *.so or/and +# *.xpi ONLY. +# +# Example to add in Makefile and pkg-plist if your port installs plug-ins in +# its own directory, and you need to set WEBPLUGIN_DIR. +# +# Makefile: +# ------------------------------------------------------ +# [...] +# USES= webplugin:gecko +# WEBPLUGIN_DIR=${PREFIX}/lib/application +# WEBPLUGIN_FILES=fooplugin.so fooplugin.xpi +# +# [...] +# +# .include +# ------------------------------------------------------ +# +# As for the pkg-plist, it should only include the actual files your +# port installs: +# +# pkg-plist: +# ------------------------------------------------------ +# [...] +# lib/application/fooplugin.a +# lib/application/fooplugin.la +# lib/application/fooplugin.so +# lib/application/fooplugin.xpi +# @dirrm lib/application +# ------------------------------------------------------ +# +# Here is what it will look like when it creates symlinks: +# +# ------------------------------------------------------ +# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/application/fooplugin.so +# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi +# ------------------------------------------------------ + +.if !defined(_INCLUDE_USES_WEBPLUGIN_MK) +_INCLUDE_USES_WEBPLUGIN_MK= yes + +WEBPLUGIN_NAME?= ${PKGBASE} +_WEBPLUGIN_APPS_ALL_LINUX= linux-firefox linux-opera linux-opera-devel \ + linux-seamonkey +_WEBPLUGIN_APPS_ALL_NATIVE= gecko opera opera-devel webkit-gtk2 +_WEBPLUGIN_APPS_ALL= ${_WEBPLUGIN_APPS_ALL_LINUX} \ + ${_WEBPLUGIN_APPS_ALL_NATIVE} + +webplugin_ARGS?= all +_WEBPLUGIN_ARGS= ${webplugin_ARGS:C/,/ /} +_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL} +.if ${_WEBPLUGIN_ARGS} == all +_WEBPLUGIN_PATTERN= * +.elif ${_WEBPLUGIN_ARGS} == native +_WEBPLUGIN_PATTERN= * +_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_NATIVE} +.elif ${_WEBPLUGIN_ARGS} == linux +_WEBPLUGIN_PATTERN= * +_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_LINUX} +.else +_WEBPLUGIN_PATTERN= ${_WEBPLUGIN_ARGS} +.endif + +.if !defined(WEBPLUGIN_FILES) +IGNORE= Cannot be installed: WEBPLUGIN_FILES is empty. Please, add plug-in files to it +.endif + +.for _TEMP_APP__ in ${_WEBPLUGIN_APPS_ALL} +_TEMP_APP_=${_TEMP_APP__} +_TEMP_FLAG_=0 +. for _TEMP_USE__ in ${USE_webplugin} +_TEMP_USE_=${_TEMP_USE__} +. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ + ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ + ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) +_TEMP_FLAG_=1 +. endif +. endfor +. if ${_TEMP_FLAG_} +USE_WEBPLUGIN_EXP+= ${_TEMP_APP__} +. endif +.endfor + +.for p in ${_WEBPLUGIN_PATTERN} +_WEBPLUGIN_MATCHED+= ${_WEBPLUGIN_TEST:M${p}} +.endfor + +_WEBPLUGIN_LIBDIR= ${LOCALBASE}/lib/browser_plugins +_WEBPLUGIN_SLDIR= ${_WEBPLUGIN_LIBDIR}/symlinks + +_WEBPLUGIN_SLDIRS= ${_WEBPLUGIN_MATCHED:S.^.${_WEBPLUGIN_SLDIR}/.} + +_WEBPLUGIN_APPS= ${USE_WEBPLUGIN_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} +_WEBPLUGIN_LINKFARMS= ${_WEBPLUGIN_APPS} ${_WEBPLUGIN_SLDIRS} + +WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME} + +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}/ + @${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 + +.endif Deleted: trunk/www/firefox/Makefile.webplugins ============================================================================== --- trunk/www/firefox/Makefile.webplugins Thu Nov 14 10:24:08 2013 (r1380) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,222 +0,0 @@ -# Created by: Andrew Pantyukhin -# $FreeBSD: head/www/firefox/Makefile.webplugins 310207 2013-01-10 22:29:23Z flo $ - -# MAINTAINER= gecko@FreeBSD.org -# -# Documentation and examples: -# -# Makefile.webplugins will create symlinks automatically for each supported -# application that supports the webplugins framework. Also, it will remove -# these symlinks when the plug-in port is uninstalled. -# -# USE_WEBPLUGINS - Specify a list of applications that this plug-in -# port supports. For each of these applications, a -# symlink will be created in -# lib/browser_plugins/symlinks. See -# WEBPLUGINS_APPS_ALL_* below for the list of -# supported applications. -# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all -# applications) -# -# WEBPLUGINS_NAME - If your port installs files in ${WEBPLUGINS_DIR}, -# then you can tweak WEBPLUGINS_NAME to change the -# name of the directory -# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). -# Default: WEBPLUGINS_NAME=${PKGBASE} -# -# WEBPLUGINS_FILES - The plug-in files that are going to be linked -# in lib/browser_plugins/symlinks/*/. It cannot -# be empty or the port will set IGNORE. -# -# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be -# found. Each plug-in file in WEBPLUGINS_FILES -# must be found in WEBPLUGINS_DIR. If your port -# does not install in WEBPLUGINS_DIR, but in its own -# path, you will need to specify that here or -# symlinks will be created to non-existent files. -# Default: WEBPLUGINS_DIR=${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} -# -# -# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any -# of the following: -# -# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) -# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) -# USE_WEBPLUGINS=linux (Supports linux-*) -# USE_WEBPLUGINS=opera webkit-gtk2 -# -# Example to add in Makefile and pkg-plist if the plug-in files are installled -# to WEBPLUGINS_DIR, and if your port does this manually: -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# post-install: -# ${MKDIR} ${WEBPLUGINS_DIR} -# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ -# ${WEBPLUGINS_DIR} -# -# .include -# ------------------------------------------------------ -# -# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks -# in pkg-plist, because they will be removed automatically. -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# %%WEBPLUGINS_DIR%%/fooplugin.so -# %%WEBPLUGINS_DIR%%/fooplugin.xpi -# @dirrmtry %%WEBPLUGINS_DIR%% -# ------------------------------------------------------ -# -# Here is what it will look like when it creates the symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# ------------------------------------------------------ -# -# If your port uses libtool, and installs any *.a and *.la files, do not add -# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and -# *.xpi ONLY. -# -# Example to add in Makefile and pkg-plist if your port installs plug-ins in -# its own directory, and you need to set WEBPLUGINS_DIR. -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_DIR=${PREFIX}/lib/application -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# [...] -# -# .include -# ------------------------------------------------------ -# -# As for the pkg-plist, it should only include the actual files your -# port installs: -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# lib/application/fooplugin.a -# lib/application/fooplugin.la -# lib/application/fooplugin.so -# lib/application/fooplugin.xpi -# @dirrm lib/application -# ------------------------------------------------------ -# -# Here is what it will look like when it creates symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# ------------------------------------------------------ - -WEBPLUGINS_NAME?= ${PKGBASE} -WEBPLUGINS_FILES?= empty -WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ - linux-flock-devel linux-mozilla \ - linux-nvu linux-opera linux-opera-devel \ - linux-seamonkey linux-seamonkey-devel \ - linux-sunbird linux-sunbird-devel -WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 -WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ - ${WEBPLUGINS_APPS_ALL_NATIVE} - -.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ - ${USE_WEBPLUGINS} == "*" -USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} -.endif - -.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ - ${WEBPLUGINS_FILES} == "" -IGNORE= can't be installed: WEBPLUGINS_FILES is empty. Please, add plug-in files to it and check www/firefox/Makefile.webplugins for documentation -.endif - -.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} -_TEMP_APP_=${_TEMP_APP__} -_TEMP_FLAG_=0 -. for _TEMP_USE__ in ${USE_WEBPLUGINS} -_TEMP_USE_=${_TEMP_USE__} -. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ - ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ - ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) -_TEMP_FLAG_=1 -. endif -. endfor -. if ${_TEMP_FLAG_} -USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} -. endif -.endfor - -WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} -WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} -WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} - -WEBPLUGINS_LIBDIR= ${LOCALBASE}/lib/browser_plugins -WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks -WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME} - -PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" - -_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} -_Q= 2>/dev/null || true -_WLD= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE},%D,} -_WLF= ${WEBPLUGINS_LINKFARMS:S,${LOCALBASE},%D,} -_WSD= ${WEBPLUGINS_SLDIR:S,^${LOCALBASE},%D,} - -webplugins-post-install: - @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - else \ - for _f in ${WEBPLUGINS_FILES}; do \ - if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - fi; \ - done; \ - fi; \ - for _d in ${WEBPLUGINS_LINKFARMS}; do \ - ${INSTALL} -d $${_d}; \ - for _l in ${_LNWF}; do \ - ${LN} -sf $${_l} $${_d}/ ${_Q}; \ - done; \ - done; \ - if [ "${PREFIX}" != "${LOCALBASE}" ]; then \ - ${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST}; \ - fi; \ - ${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}; \ - for _d in ${_WLF}; do \ - ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ - for _l in ${_LNWF}; do \ - ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ - done; \ - for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ - ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ - done; \ - ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} - -post-install: webplugins-post-install