Date: Sun, 27 Apr 2014 16:35:58 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1579 - in trunk: Mk Mk/Uses mail/thunderbird-i18n www/firefox-esr-i18n www/firefox-i18n www/seamonkey www/seamonkey-i18n www/xpi-adblock Message-ID: <201404271635.s3RGZwhR043208@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Sun Apr 27 16:35:58 2014 New Revision: 1579 Log: Attempt to sync with ports tree in preparation of upcoming release Added: trunk/Mk/Uses/gecko.mk Modified: trunk/Mk/bsd.gecko.mk trunk/mail/thunderbird-i18n/Makefile trunk/www/firefox-esr-i18n/Makefile trunk/www/firefox-i18n/Makefile trunk/www/firefox-i18n/Makefile.lang trunk/www/firefox-i18n/Makefile.option trunk/www/seamonkey-i18n/Makefile trunk/www/seamonkey/Makefile trunk/www/xpi-adblock/Makefile.xpi Added: trunk/Mk/Uses/gecko.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/Mk/Uses/gecko.mk Sun Apr 27 16:35:58 2014 (r1579) @@ -0,0 +1,129 @@ +# $FreeBSD: head/Mk/Uses/gecko.mk 350689 2014-04-09 12:37:53Z bapt $ +# +# Handle dependency of different gecko based applications +# +# MAINTAINER: gecko@FreeBSD.org +# +# Feature: gecko +# Usage: USES=gecko or USES=gecko:ARGS +# Valid ARGS: libxul, firefox, seamonkey, thunderbird +# in case the first argument is not libxul +# The following arguments are available +# - build: also add the dependency as a build +# dependency +# - [0-9][0-9][+]?: a version optionnally +# followed by a + +# + +.if !defined(_INCLUDE_USES_GECKO_MK) +_INCLUDE_USES_GECKO_MK= yes + +.if !defined(gecko_ARGS) +_GECKO_ARGS= libxul +.else +_GECKO_ARGS= ${gecko_ARGS:S/,/ /g} +.endif + +_GECKO_VERSION= ${_GECKO_ARGS:M[0-9][0-9]*} + +.if ${_GECKO_ARGS:Mlibxul} +# Compat with older versions +GECKO= libxul +GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO}-config +XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl +XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` + +BUILD_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul +RUN_DEPENDS+= libxul>=24:${PORTSDIR}/www/libxul + +.elif ${_GECKO_ARGS:Mfirefox} + +_GECKO_DEFAULT_VERSION= 24 +_GECKO_VERSIONS= 24 29 +_GECKO_TYPE= firefox + +# Dependence lines for different Firefox versions +24_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr +29_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox + +.if exists(${LOCALBASE}/bin/firefox) +_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null +_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g} +.endif + +.elif ${_GECKO_ARGS:Mseamonkey} + +_GECKO_DEFAULT_VERSION= 26 +_GECKO_VERSIONS= 26 +_GECKO_TYPE= seamonkey + +.if exists(${LOCALBASE}/bin/seamonkey) +_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/seamonkey --version 2>/dev/null +_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g} +.endif + +# Dependence lines for different Seamonkey versions +26_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey + +.elif ${_GECKO_ARGS:Mthunderbird} + +_GECKO_DEFAULT_VERSION= 24 +_GECKO_VERSIONS= 24 +_GECKO_TYPE= thunderbird + +.if exists(${LOCALBASE}/bin/thunderbird) +_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/thunderbird --version 2>/dev/null +_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g} +.endif + +# Dependence lines for different Thunderbird versions +24_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird + +.else +IGNORE= Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird +.endif + +.if defined(_GECKO_TYPE) +.if ${_GECKO_VERSION:M*+} +_GECKO_MIN_VERSION:= ${_GECKO_VERSION:S/+//} +_GECKO_WANTED_VERSIONS:= ${_GECKO_DEFAULT_VERSION} +.endif + +.if ${_GECKO_VERSION:M[0-9][0-9]} +_GECKO_WANTED_VERSIONS:= ${_GECKO_VERSION:M[0-9][0-9]} +.endif + +_GECKO_WANTED_VERSIONS?= ${_GECKO_DEFAULT_VERSION} + +.if defined(_GECKO_MIN_VERSION) +. for _v in _GECKO_VERSIONS +. if ${_GECKO_MIN_VERSION} <= ${_v} +_GECKO_WANTED_VERSIONS+= ${_v} +. endif +. endfor +.endif + +.for _v in ${_GECKO_WANTED_VERSIONS:O:u} +_GECKO_HIGHEST_VERSION:= ${_v} +.if defined(_GECKO_INSTALLED_VER) && ${_GECKO_INSTALLED_VER} == ${_v} +_GECKO_WANTED_VERSION:= ${_v} +.endif +.endfor + +.if !defined(_GECKO_WANTED_VERSION) +.if defined(_GECKO_INSTALLED_VER) +IGNORE= cannot install: ${_GECKO_TYPE} versions mismatch: ${_GECKO_TYPE}-${_GECKO_INSTALLED_VER} is installed and wanted version is ${_GECKO_TYPE}-${_GECKO_VERSION:M[0-9][0-9]} +.else +_GECKO_WANTED_VERSION:= ${_GECKO_HIGHEST_VERSION} +.endif +.endif + + +.if ${_GECKO_ARGS:Mbuild} +BUILD_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS} +.endif +RUN_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS} + +.endif + +.endif Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/Mk/bsd.gecko.mk Sun Apr 27 16:35:58 2014 (r1579) @@ -8,17 +8,6 @@ # # 4 column tabs prevent hair loss and tooth decay! -# ======================= USERS ================================= -# To specify which gecko-based backend you prefer, use something like: -# -# WITH_GECKO= libxul -# -# The valid backends are: -# libxul -# -# See below for more details. -# ======================= /USERS ================================ - # bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users # and porters to support any available gecko backend without needing to build # many conditional tests. ${USE_GECKO} is the list of backends that your port @@ -26,403 +15,7 @@ # Users set ${WITH_GECKO} to the list of gecko backends they want on their # system. -.if defined(USE_GECKO) && ${USE_GECKO}!="gecko" - -.if !defined(Gecko_Pre_Include) -# Please make sure all changes to this file are passed through the maintainer. -# Do not commit them yourself (unless of course you're the Port's Wraith ;). -Gecko_Include_MAINTAINER= gecko@FreeBSD.org -Gecko_Pre_Include= bsd.gecko.mk - -# Users should use the following syntax: -# -# WITH_GECKO= libxul -# Use libxul whenever a port supports it -# WITH_GECKO= libxul -# Sets your preferred backend. With this example, libxul will always -# be chosen, unless the port doesn't support a libxul backend. In that -# case, you get whatever the porter chose as the default. Better to use -# the first example. -# -# -# Ports should use the following: -# -# USE_GECKO= libxul -# The list of gecko backends that the port supports. Unless the user -# overrides it with WITH_GECKO, the first gecko listed in USE_GECKO -# will be the default. -# -# USE_GECKO= libxul19<->libxul -# This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure -# if ${GECKO}=="libxul19" -# -# Example: -# USE_GECKO= libxul -# -# post-patch: -# @${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|' \ -# ${MOZSRC}/configure -# -# If you want your port to check the ${GECKO} variable to see which backend -# has been chosen. -# -# Example: -# USE_GECKO= libxul -# -# post-patch: -# .if ${GECKO}=="libxul19" -# @${REINPLACE_CMD} -e 's|mozilla-|libxul-|' \ -# ${MOZSRC}/configure -# .endif - -_GECKO_ALL= libxul - -libxul_PLIST= libxul>=24 - -.for gecko in ${_GECKO_ALL} -${gecko}_PORTSDIR?= www -${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} -${gecko}_PLIST?= ${LOCALBASE}/lib/${gecko}/libgtkembedmoz.so -.endfor - -# Figure out which mozilla to use -# Weed out bad options in USE_GECKO -.for badgecko in ${USE_GECKO} -. if ${_GECKO_ALL:M${badgecko:C/^([^<->]+).*/\1/}}!="" -GOOD_USE_GECKO+= ${badgecko:C/^([^<->]+).*/\1/} -. endif -. if ${_GECKO_ALL:M${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}}!="${badgecko:C/^([^<->]+).*/\1/}" -${badgecko:C/^([^<->]+).*/\1/}_HACK= s:${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}:${badgecko:C/^([^<->]+).*/\1/}:g -. endif -.endfor - -.undef GECKO_FALLTHROUGH -.undef _FOUND_WITH_GECKO -# Figure out which gecko to use and weed out the bad ones -.if defined(WITH_GECKO) && defined(GOOD_USE_GECKO) -. for badgecko in ${WITH_GECKO} -. if ${GOOD_USE_GECKO:M${badgecko}}!="" -GOOD_WITH_GECKO+= ${badgecko} -. endif -. endfor -. if defined(GOOD_WITH_GECKO) -. for gecko in ${GOOD_WITH_GECKO} -. if !defined(GECKO_FALLTHROUGH) -GECKO= ${gecko} -GECKO_FALLTHROUGH= ${TRUE} -_FOUND_WITH_GECKO= ${TRUE} -. endif -. endfor -. endif -.endif - -.if !defined(GECKO) && defined(GOOD_USE_GECKO) -. for gecko in ${GOOD_USE_GECKO} -. if !defined(GECKO_FALLTRHOUGH) -GECKO= ${gecko} -GECKO_FALLTRHOUGH= ${TRUE} -. endif -. endfor -.endif - -# Generic defines -GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config -XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl -XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` - -.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!="" -BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} -RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} -.else -IGNORE= Unable to find a supported gecko, please check USE_GECKO -.endif - -pre-everything:: _gecko-pre-everything - -_gecko-pre-everything:: - @${ECHO_CMD} "" -.if !defined(_FOUND_WITH_GECKO) && defined(WITH_GECKO) - @${ECHO_CMD} " Warning: ${PORTNAME} does not support any gecko you" - @${ECHO_CMD} " listed in WITH_GECKO=${WITH_GECKO}." - @${ECHO_CMD} " \"${GECKO}\" will be used" - @${ECHO_CMD} "" - @${ECHO_CMD} " for gecko support, but you can change that by using one of" - @${ECHO_CMD} " the following values:" -.else - @${ECHO_CMD} " ${PORTNAME} is using ${GECKO} for gecko support, but you can" - @${ECHO_CMD} " change that by defining WITH_GECKO to the following values:" -.endif - @${ECHO_CMD} "" -.for gecko in ${GOOD_USE_GECKO} - @${ECHO_CMD} " ${gecko} " -.endfor - @${ECHO_CMD} "" - -post-patch: gecko-post-patch - -gecko-post-patch: -.if defined(${GECKO}_HACK) - ${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \ - ${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK} -.endif -.endif - -.elif !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) && (defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD) || defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD) || defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD)) -Gecko_Pre_Include= bsd.gecko.mk - -# Ports can use the following: -# -# USE_FIREFOX Add runtime dependency on Firefox. If no version -# is given by the maintainer via the port or by the -# user via defined variable try to find the highest -# stable installed version. -# Available values: yes 24+ 29+ 24 29 -# NOTE: -# default value 24 is used in case of USE_FIREFOX=yes -# -# USE_FIREFOX_BUILD Add buildtime dependency on Firefox. -# Available values: see USE_FIREFOX -# -# USE_SEAMONKEY Add runtime dependency on SeaMonkey. If no -# version is given by the maintainer via the port -# or by the user via defined variable try to find -# the highest stable installed version. -# Available values: yes 26+ 26 -# NOTE: -# default value 26 is used in case of USE_SEAMONKEY=yes -# -# USE_SEAMONKEY_BUILD Add buildtime dependency on SeaMonkey. -# Available values: see USE_SEAMONKEY -# -# USE_THUNDERBIRD Add runtime dependency on Thunderbird. If no -# version is given by the maintainer via the port -# or by the user via defined variable try to find -# the highest stable installed version. -# Available values: yes 24+ 24 -# NOTE: -# default value 24 is used in case of USE_THUNDERBIRD=yes -# -# USE_THUNDERBIRD_BUILD Add buildtime dependency on Thunderbird. -# Available values: see USE_THUNDERBIRD -# - -# -# Firefox part -# -.if defined(USE_FIREFOX) || defined(USE_FIREFOX_BUILD) - -# Process USE_FIREFOX_BUILD -.if defined(USE_FIREFOX_BUILD) -USE_FIREFOX:= ${USE_FIREFOX_BUILD} -_FIREFOX_BUILD_DEPENDS= yes -.endif - -_FIREFOX_DEFAULT_VERSION= 24 -_FIREFOX_VERSIONS= 24 29 -_FIREFOX_RANGE_VERSIONS= 24+ 29+ - -# For specifying [24, ..]+ -_FIREFOX_29P= 29 ${_FIREFOX_24P} -_FIREFOX_24P= 24 - -# Set the default Firefox version and check if USE_FIREFOX=yes was given -.if ${USE_FIREFOX} == "yes" -USE_FIREFOX= ${_FIREFOX_DEFAULT_VERSION} -.endif - -# Setting/finding Firefox version we want. -.if exists(${LOCALBASE}/bin/firefox) -_FIREFOX_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/Mozilla Firefox \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1/' -.endif - -# Check if installed Firefox version matches the wanted one -.if defined(_FIREFOX_VER) -_SUPFIREFOX= no -.if ${USE_FIREFOX:C/[0-9][0-9]//} == "+" -.for ver in ${_FIREFOX_RANGE_VERSIONS} -.if ${USE_FIREFOX} == "${ver}" -_MATCHED_FIREFOX_VER:= ${ver:S/+//} -.for firefox in ${_FIREFOX_${_MATCHED_FIREFOX_VER}P} -.if ${_FIREFOX_VER} == ${firefox} -_SUPFIREFOX= yes -USE_FIREFOX= ${_FIREFOX_VER} -.endif -.endfor -.endif -.endfor -.else -.if ${_FIREFOX_VER} == ${USE_FIREFOX} -_SUPFIREFOX= yes -.endif -.endif -.if ${_SUPFIREFOX} == no -_DISPLAY_VERSION_HAVE= ${_FIREFOX_VER} -_DISPLAY_VERSION_WANT= ${USE_FIREFOX} - -IGNORE= cannot install: Firefox versions mismatch: firefox-${_DISPLAY_VERSION_HAVE} is installed and wanted version is firefox-${_DISPLAY_VERSION_WANT} -.endif -.endif - -.if !defined(_FIREFOX_${USE_FIREFOX:S/+//}P) -IGNORE= cannot install: unknown Firefox version: firefox-${USE_FIREFOX:C/([0-9])([0-9])/\1.\2/} -.endif - -# Dependence lines for different Firefox versions -24_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -29_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox - -# Add dependencies -.if defined(USE_FIREFOX) -.if defined(_FIREFOX_BUILD_DEPENDS) -BUILD_DEPENDS+= ${${USE_FIREFOX}_DEPENDS} -.endif -RUN_DEPENDS+= ${${USE_FIREFOX}_DEPENDS} -.endif - -.endif # defined(USE_FIREFOX) -# -# SeaMonkey part -# -.if defined(USE_SEAMONKEY) || defined(USE_SEAMONKEY_BUILD) - -# Process USE_SEAMONKEY_BUILD -.if defined(USE_SEAMONKEY_BUILD) -USE_SEAMONKEY:= ${USE_SEAMONKEY_BUILD} -_SEAMONKEY_BUILD_DEPENDS= yes -.endif - -_SEAMONKEY_DEFAULT_VERSION= 26 -_SEAMONKEY_VERSIONS= 26 -_SEAMONKEY_RANGE_VERSIONS= 26+ - -# For specifying [26, ..]+ -_SEAMONKEY_26P= 26 - -# Set the default SeaMonkey version and check if USE_SEAMONKEY=yes was given -.if ${USE_SEAMONKEY} == "yes" -USE_SEAMONKEY= ${_SEAMONKEY_DEFAULT_VERSION} -.endif - -# Setting/finding SeaMonkey version we want. -.if exists(${LOCALBASE}/bin/seamonkey) -_SEAMONKEY_VER!= ${LOCALBASE}/bin/seamonkey --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/Mozilla SeaMonkey \([0-9]\{1,2\}\)\.\([0-9]*\).*/\2/' -.endif - -# Check if installed SeaMonkey version matches the wanted one -.if defined(_SEAMONKEY_VER) -_SUPSEAMONKEY= no -.if ${USE_SEAMONKEY:C/[0-9][0-9]//} == "+" -.for ver in ${_SEAMONKEY_RANGE_VERSIONS} -.if ${USE_SEAMONKEY} == "${ver}" -_MATCHED_SEAMONKEY_VER:= ${ver:S/+//} -.for seamonkey in ${_SEAMONKEY_${_MATCHED_SEAMONKEY_VER}P} -.if ${_SEAMONKEY_VER} == ${seamonkey} -_SUPSEAMONKEY= yes -USE_SEAMONKEY= ${_SEAMONKEY_VER} -.endif -.endfor -.endif -.endfor -.else -.if ${_SEAMONKEY_VER} == ${USE_SEAMONKEY} -_SUPSEAMONKEY= yes -.endif -.endif -.if ${_SUPSEAMONKEY} == no -IGNORE= cannot install: SeaMonkey versions mismatch: seamonkey-2.${_SEAMONKEY_VER} is installed and wanted version is seamonkey-2.${USE_SEAMONKEY} -.endif -.endif - -.if !defined(_SEAMONKEY_${USE_SEAMONKEY:S/+//}P) -IGNORE= cannot install: unknown SeaMonkey version: seamonkey-2.${USE_SEAMONKEY} -.endif - -# Dependence lines for different SeaMonkey versions -26_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey - -# Add dependencies -.if defined(USE_SEAMONKEY) -.if defined(_SEAMONKEY_BUILD_DEPENDS) -BUILD_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS} -.endif -RUN_DEPENDS+= ${${USE_SEAMONKEY}_DEPENDS} -.endif - -.endif # defined(USE_SEAMONKEY) -# -# Thunderbird part -# -.if defined(USE_THUNDERBIRD) || defined(USE_THUNDERBIRD_BUILD) - -# Process USE_THUNDERBIRD_BUILD -.if defined(USE_THUNDERBIRD_BUILD) -USE_THUNDERBIRD:= ${USE_THUNDERBIRD_BUILD} -_THUNDERBIRD_BUILD_DEPENDS= yes -.endif - -_THUNDERBIRD_DEFAULT_VERSION= 24 -_THUNDERBIRD_VERSIONS= 24 -_THUNDERBIRD_RANGE_VERSIONS= 24+ - -# For specifying [24, ..]+ -_THUNDERBIRD_24P= 24 - -# Set the default Thunderbird version and check if USE_THUNDERBIRD=yes was given -.if ${USE_THUNDERBIRD} == "yes" -USE_THUNDERBIRD= ${_THUNDERBIRD_DEFAULT_VERSION} -.endif - -# Setting/finding Thunderbird version we want. -.if exists(${LOCALBASE}/bin/thunderbird) -_THUNDERBIRD_VER!= ${LOCALBASE}/bin/thunderbird --version 2>/dev/null | ${HEAD} -1 | ${SED} -e 's/ Thunderbird \([0-9]\{1,2\}\)\.\([0-9]*\).*/\1/' -.endif - -# Check if installed Thunderbird version matches the wanted one -.if defined(_THUNDERBIRD_VER) -_SUPTHUNDERBIRD= no -.if ${USE_THUNDERBIRD:C/[0-9][0-9]//} == "+" -.for ver in ${_THUNDERBIRD_RANGE_VERSIONS} -.if ${USE_THUNDERBIRD} == "${ver}" -_MATCHED_THUNDERBIRD_VER:= ${ver:S/+//} -.for thunderbird in ${_THUNDERBIRD_${_MATCHED_THUNDERBIRD_VER}P} -.if ${_THUNDERBIRD_VER} == ${thunderbird} -_SUPTHUNDERBIRD= yes -USE_THUNDERBIRD= ${_THUNDERBIRD_VER} -.endif -.endfor -.endif -.endfor -.else -.if ${_THUNDERBIRD_VER} == ${USE_THUNDERBIRD} -_SUPTHUNDERBIRD= yes -.endif -.endif -.if ${_SUPTHUNDERBIRD} != yes -_DISPLAY_VERSION_HAVE= ${_THUNDERBIRD_VER} -_DISPLAY_VERSION_WANT= ${USE_THUNDERBIRD} -IGNORE= cannot install: Thunderbird versions mismatch: thunderbird-${_DISPLAY_VERSION_HAVE} is installed and wanted version is thunderbird-${_DISPLAY_VERSION_WANT} -.endif -.endif - -.if !defined(_THUNDERBIRD_${USE_THUNDERBIRD:S/+//}P) -IGNORE= cannot install: unknown Thunderbird version: thunderbird-${USE_THUNDERBIRD:C/([0-9])([0-9])/\1.\2/} -.endif - -# Dependence lines for different Thunderbird versions -24_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird - -# Add dependencies -.if defined(USE_THUNDERBIRD) -.if defined(_THUNDERBIRD_BUILD_DEPENDS) -BUILD_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS} -.endif -RUN_DEPENDS+= ${${USE_THUNDERBIRD}_DEPENDS} -.endif - -.endif # defined(USE_THUNDERBIRD) - -.else # split - +.if defined(USE_GECKO) .if !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) Gecko_Pre_Include= bsd.gecko.mk Modified: trunk/mail/thunderbird-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird-i18n/Makefile Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/mail/thunderbird-i18n/Makefile Sun Apr 27 16:35:58 2014 (r1579) @@ -14,17 +14,21 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -PLIST?= ${WRKDIR}/plist -PLISTD?= ${WRKDIR}/plist_dirs -PLISTF?= ${WRKDIR}/plist_files +USES= zip:infozip gecko:thunderbird +USE_XPI= thunderbird NO_BUILD= yes NO_ARCH= yes -USE_THUNDERBIRD= yes -USE_XPI= thunderbird linux-thunderbird USE_SUBMAKE= yes -NO_STAGE= yes +WDIR= langpack-*@thunderbird.mozilla.org + +XPI_DISTNAMES= ${THUNDERBIRD_I18N_} + +PLIST?= ${WRKDIR}/plist +PLISTD?= ${WRKDIR}/plist_dirs +PLISTF?= ${WRKDIR}/plist_files + .include "${.CURDIR}/Makefile.option" .include <bsd.port.pre.mk> @@ -36,9 +40,6 @@ THUNDERBIRD_I18N_?= ${THUNDERBIRD_I18N} -WDIR= langpack-*@thunderbird.mozilla.org - -XPI_DISTNAMES= ${THUNDERBIRD_I18N_} .for dist in ${XPI_DISTNAMES} XPI_ID_${dist}= langpack-${dist}@thunderbird.mozilla.org .endfor @@ -60,21 +61,24 @@ ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} + do-install: - @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} - @${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/ - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ - @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL} + cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${XPI_LIBDIR} + ${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${WDIR}/ + @for e in ${STAGEDIR}${XPI_LIBDIR}/${WDIR}; do \ + for _dir in ${XPI_LINKFARMS} ; do \ + ${LN} -sf $${_e##*/} ${STAGEDIR}$$_dir/ ${_Q} ; \ + done \ + done @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ - ${XARGS} -0L1 ${REINPLACE_CMD} -i '' '/<?xml/,$$!d' + ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' list-langs: @fetch -qo- "https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi"|\ @@ -82,4 +86,5 @@ ${AWK} 'BEGIN{ORS=" "}{print $$1}END{printf "\nNumber of languages: %d\n",NR}' .include "${.CURDIR}/../../www/xpi-adblock/Makefile.xpi" + .include <bsd.port.post.mk> Modified: trunk/www/firefox-esr-i18n/Makefile ============================================================================== --- trunk/www/firefox-esr-i18n/Makefile Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/www/firefox-esr-i18n/Makefile Sun Apr 27 16:35:58 2014 (r1579) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/www/firefox-esr-i18n/Makefile 336446 2013-12-14 13:42:06Z flo $ +# $FreeBSD: head/www/firefox-esr-i18n/Makefile 350695 2014-04-09 12:46:48Z bapt $ PORTNAME= firefox PORTVERSION= 24.5.0 @@ -15,7 +15,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_FIREFOX= 24 +USES= zip:infozip gecko:firefox USE_XPI= firefox NO_ARCH= yes @@ -29,7 +29,6 @@ PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files -NO_STAGE= yes .include "${.CURDIR}/Makefile.option" .include <bsd.port.pre.mk> @@ -66,20 +65,19 @@ ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} -.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING) -pre-configure: config -.endif - do-install: - @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} - @${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/ - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ - @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL} + cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${XPI_LIBDIR} + ${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${WDIR}/ + @for e in ${STAGEDIR}${XPI_LIBDIR}/${WDIR}; do \ + for _dir in ${XPI_LINKFARMS} ; do \ + ${LN} -sf $${_e##*/} ${STAGEDIR}$$_dir/ ${_Q} ; \ + done \ + done @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ Modified: trunk/www/firefox-i18n/Makefile ============================================================================== --- trunk/www/firefox-i18n/Makefile Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/www/firefox-i18n/Makefile Sun Apr 27 16:35:58 2014 (r1579) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/www/firefox-i18n/Makefile 336446 2013-12-14 13:42:06Z flo $ +# $FreeBSD: head/www/firefox-i18n/Makefile 350687 2014-04-09 12:35:01Z bapt $ PORTNAME= firefox-i18n PORTVERSION= 29.0 @@ -14,7 +14,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -USE_FIREFOX= 29 +USES= zip:infozip gecko:firefox,29 USE_XPI= firefox linux-firefox NO_ARCH= yes @@ -28,7 +28,6 @@ PLISTD?= ${WRKDIR}/plist_dirs PLISTF?= ${WRKDIR}/plist_files -NO_STAGE= yes .include "${.CURDIR}/Makefile.option" .include <bsd.port.pre.mk> @@ -65,16 +64,15 @@ ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} -.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING) -pre-configure: config -.endif - do-install: - @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} - @${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/ - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ - @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL} + cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${XPI_LIBDIR} + ${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${WDIR}/ + @for e in ${STAGEDIR}${XPI_LIBDIR}/${WDIR}; do \ + for _dir in ${XPI_LINKFARMS} ; do \ + ${LN} -sf $${_e##*/} ${STAGEDIR}$$_dir/ ${_Q} ; \ + done \ + done @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} Modified: trunk/www/firefox-i18n/Makefile.lang ============================================================================== --- trunk/www/firefox-i18n/Makefile.lang Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/www/firefox-i18n/Makefile.lang Sun Apr 27 16:35:58 2014 (r1579) @@ -1,13 +1,13 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> -# $FreeBSD: head/www/firefox-i18n/Makefile.lang 315079 2013-03-23 20:20:22Z flo $ +# $FreeBSD: head/www/firefox-i18n/Makefile.lang 342632 2014-02-05 05:23:30Z beat $ -FIREFOX_I18N_ALL_= ach af an ar as ast be bg bn-BD bn-IN br bs ca cs csb \ - cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES \ - es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he \ - hi-IN hr hu hy-AM id is it ja kk km kn ko ku lij lt \ - lv mai mk ml mr ms nb-NO nl nn-NO or pa-IN pl pt-BR \ - pt-PT rm ro ru si sk sl son sq sr sv-SE sw ta te th \ - tr uk vi xh zh-CN zh-TW zu +FIREFOX_I18N_ALL_= ach af ar as ast be bg bn-BD bn-IN br bs ca cs csb \ + cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES \ + es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he \ + hi-IN hr hu hy-AM id is it ja kk km kn ko ku lij lt \ + lv mai mk ml mr nb-NO nl nn-NO or pa-IN pl pt-BR \ + pt-PT rm ro ru si sk sl son sq sr sv-SE ta te th \ + tr uk vi zh-CN zh-TW zu .if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package) FIREFOX_I18N= ${FIREFOX_I18N_ALL_} @@ -18,9 +18,6 @@ .if ${PORT_OPTIONS:MLANG_AF} FIREFOX_I18N+= af .endif -.if ${PORT_OPTIONS:MLANG_AN} -FIREFOX_I18N+= an -.endif .if ${PORT_OPTIONS:MLANG_AR} FIREFOX_I18N+= ar .endif @@ -36,7 +33,7 @@ .if ${PORT_OPTIONS:MLANG_BG} FIREFOX_I18N+= bg .endif -.if ${PORT_OPTIONS:MLANG_BD} +.if ${PORT_OPTIONS:MLANG_BB} FIREFOX_I18N+= bn-BD .endif .if ${PORT_OPTIONS:MLANG_BN} @@ -189,9 +186,6 @@ .if ${PORT_OPTIONS:MLANG_MR} FIREFOX_I18N+= mr .endif -.if ${PORT_OPTIONS:MLANG_MS} -FIREFOX_I18N+= ms -.endif .if ${PORT_OPTIONS:MLANG_NB} FIREFOX_I18N+= nb-NO .endif @@ -246,9 +240,6 @@ .if ${PORT_OPTIONS:MLANG_SV} FIREFOX_I18N+= sv-SE .endif -.if ${PORT_OPTIONS:MLANG_SW} -FIREFOX_I18N+= sw -.endif .if ${PORT_OPTIONS:MLANG_TA} FIREFOX_I18N+= ta .endif @@ -267,9 +258,6 @@ .if ${PORT_OPTIONS:MLANG_VI} FIREFOX_I18N+= vi .endif -.if ${PORT_OPTIONS:MLANG_XH} -FIREFOX_I18N+= xh -.endif .if ${PORT_OPTIONS:MLANG_CN} FIREFOX_I18N+= zh-CN .endif Modified: trunk/www/firefox-i18n/Makefile.option ============================================================================== --- trunk/www/firefox-i18n/Makefile.option Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/www/firefox-i18n/Makefile.option Sun Apr 27 16:35:58 2014 (r1579) @@ -1,9 +1,8 @@ # Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp> -# $FreeBSD: head/www/firefox-i18n/Makefile.option 315079 2013-03-23 20:20:22Z flo $ +# $FreeBSD: head/www/firefox-i18n/Makefile.option 342632 2014-02-05 05:23:30Z beat $ OPTIONS_DEFINE= LANG_ACH \ LANG_AF \ - LANG_AN \ LANG_SQ \ LANG_AR \ LANG_AS \ @@ -11,7 +10,7 @@ LANG_AST \ LANG_EU \ LANG_BN \ - LANG_BD \ + LANG_BB \ LANG_BS \ LANG_BR \ LANG_BG \ @@ -57,7 +56,6 @@ LANG_ML \ LANG_MR \ LANG_MN \ - LANG_MS \ LANG_NB \ LANG_NN \ LANG_OR \ @@ -79,7 +77,6 @@ LANG_SK \ LANG_SL \ LANG_SV \ - LANG_SW \ LANG_TW \ LANG_TA \ LANG_TE \ @@ -88,7 +85,6 @@ LANG_UK \ LANG_VI \ LANG_CY \ - LANG_XH \ LANG_ZA \ LANG_ZU @@ -97,12 +93,8 @@ LANG_MN LANG_PBR LANG_PA LANG_RU LANG_ES LANG_SON LANG_TE LANG_ACH_DESC?= Acholi language support -LANG_AN_DESC?= Aragonese language support LANG_AS_DESC?= Assamese language support LANG_CSB_DESC?= Kashubian language support LANG_FF_DESC?= Pulaar Fulfulde language support LANG_KM_DESC?= Khmer language support LANG_LIJ_DESC?= Ligurian (Genoa) language support -LANG_MS_DESC?= Bahasa Melayu (MS) language support -LANG_SW_DESC?= Kiingereza (US) language support -LANG_XH_DESC?= Xhosa language support Modified: trunk/www/seamonkey-i18n/Makefile ============================================================================== --- trunk/www/seamonkey-i18n/Makefile Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/www/seamonkey-i18n/Makefile Sun Apr 27 16:35:58 2014 (r1579) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# $FreeBSD: head/www/seamonkey-i18n/Makefile 336446 2013-12-14 13:42:06Z flo $ +# $FreeBSD: head/www/seamonkey-i18n/Makefile 350690 2014-04-09 12:38:45Z bapt $ PORTNAME= seamonkey-i18n PORTVERSION= 2.26b1 @@ -14,11 +14,7 @@ EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip -PLIST?= ${WRKDIR}/plist -PLISTD?= ${WRKDIR}/plist_dirs -PLISTF?= ${WRKDIR}/plist_files - -USE_SEAMONKEY= yes +USES= zip:infozip gecko:seamonkey USE_XPI= seamonkey linux-seamonkey NO_ARCH= yes @@ -28,13 +24,17 @@ XPI_DISTNAMES= ${SEAMONKEY_I18N_} +PLIST?= ${WRKDIR}/plist +PLISTD?= ${WRKDIR}/plist_dirs +PLISTF?= ${WRKDIR}/plist_files + +.include "${.CURDIR}/Makefile.option" +.include <bsd.port.pre.mk> + .ifndef WITHOUT_SWITCHER RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif -NO_STAGE= yes -.include "${.CURDIR}/Makefile.option" -.include <bsd.port.options.mk> .include "${.CURDIR}/Makefile.lang" SEAMONKEY_I18N_?= ${SEAMONKEY_I18N} @@ -65,15 +65,18 @@ ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} do-install: - @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} - @${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/ - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ - @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } + @${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL} + cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${XPI_LIBDIR} + ${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${WDIR}/ + @for e in ${STAGEDIR}${XPI_LIBDIR}/${WDIR}; do \ + for _dir in ${XPI_LINKFARMS} ; do \ + ${LN} -sf $${_e##*/} ${STAGEDIR}$$_dir/ ${_Q} ; \ + done \ + done @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ @@ -86,4 +89,4 @@ .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/www/seamonkey/Makefile Sun Apr 27 16:35:58 2014 (r1579) @@ -87,6 +87,7 @@ # avoid clang 3.2/3.3 crash in js/src/jsgc.cpp on refillFreeList<(js::AllowGC)1> # http://svnweb.freebsd.org/changeset/base/255804 +.if ${OPSYS} == FreeBSD .if ${CHOSEN_COMPILER_TYPE} == clang && ${ARCH} == i386 && ${OSVERSION} < 1000056 . if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} BROKEN= Cannot build with OPTIMIZED_CFLAGS option due to \ @@ -101,6 +102,7 @@ . endif . endif .endif +.endif .if ${PORT_OPTIONS:MALSA} BUILD_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib Modified: trunk/www/xpi-adblock/Makefile.xpi ============================================================================== --- trunk/www/xpi-adblock/Makefile.xpi Tue Apr 22 19:05:03 2014 (r1578) +++ trunk/www/xpi-adblock/Makefile.xpi Sun Apr 27 16:35:58 2014 (r1579) @@ -1,12 +1,5 @@ -#-*- mode: makefile; tab-width: 4; -* -# ex:ts=4 -# -# New ports collection makefile for: xpi infrastructure -# Date created: 28 March 2006 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# -# $FreeBSD: ports/www/xpi-adblock/Makefile.xpi,v 1.25 2011/08/18 09:51:58 ale Exp $ -# +# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> +# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 352071 2014-04-24 21:49:07Z antoine $ # XPI_ID - Extension id, might be in {12345-...} or dev@org format # XPI_NUM - Extension number, as in addons.mozilla.org URL @@ -81,15 +74,14 @@ LATEST_LINK?= ${PKGBASE:S/_//g} NO_BUILD= yes -USE_ZIP= yes +USES+= zip:infozip EXTRACT_AFTER_ARGS= -d ${WRKSRC} XPI_DISTNAME?= ${PORTNAME} XPI_APPS_ALL_WC= *firefox* *thunderbird* *seamonkey* -XPI_APPS_ALL= firefox firefox3 linux-firefox linux-firefox-devel \ - thunderbird thunderbird3 linux-thunderbird \ - seamonkey seamonkey2 linux-seamonkey +XPI_APPS_ALL= firefox linux-firefox thunderbird linux-thunderbird \ + seamonkey linux-seamonkey # kompozer linux-kompozer # Other apps: mango @@ -131,22 +123,32 @@ USE_XPI= ${XPI_APPS_ALL_WC} .endif -XPI_APPS?= ${USE_XPI:S.^.${LOCALBASE}/lib/.:S.$./extensions.} +.if !defined(XPI_APPS) +.for xpi in ${USE_XPI} +_xpi:= ${xpi} +.if ${_xpi:M*firefox*} +XPI_APPS+= ${LOCALBASE}/lib/${xpi}/browser/extensions +.else +XPI_APPS+= ${LOCALBASE}/lib/${xpi}/extensions +.endif +.endfor +.endif + XPI_SLDIRS_ALL= ${XPI_APPS_ALL:S.^.${XPI_SLDIR}/.} XPI_SLDIRS= ${USE_XPI:S.^.${XPI_SLDIR}/.} XPI_LINKFARMS= ${XPI_APPS} ${XPI_SLDIRS} XPI_LIBDIR?= ${PREFIX}/lib/xpi -XPI_SLDIR?= ${XPI_LIBDIR}/symlinks +XPI_SLDIR?= ${XPI_LIBDIR}/symlinks .ifndef XPI_DISTNAMES XPI_XPIDIR?= ${XPI_LIBDIR}/${XPI_ID} .endif XPI_DIRS_TRY= ${XPI_SLDIRS_ALL:S,^${PREFIX}/,,} \ - ${XPI_SLDIR:S,^${PREFIX}/,,} \ - ${XPI_LIBDIR:S,^${PREFIX}/,,} + ${XPI_SLDIR:S,^${PREFIX}/,,} \ + ${XPI_LIBDIR:S,^${PREFIX}/,,} -PLIST_SUB+= XPI_LIBDIR="${XPI_LIBDIR:S,^${PREFIX}/,,}" \ - XPI_XPIDIR="${XPI_XPIDIR:S,^${PREFIX}/,,}" +PLIST_SUB+= XPI_LIBDIR="${XPI_LIBDIR:S,^${PREFIX}/,,}" \ + XPI_XPIDIR="${XPI_XPIDIR:S,^${PREFIX}/,,}" _TD= ${XPI_XPIDIR:S,^${PREFIX}/,,} _TD_FULL= ${XPI_XPIDIR} @@ -164,17 +166,15 @@ .if !target(do-install) do-install: - @${INSTALL} -d ${_TD_FULL} ${XPI_SLDIRS_ALL} - @${CP} -R ${WRKSRC}/ ${_TD_FULL}/ + @${MKDIR} ${STAGEDIR}${_TD_FULL} ${XPI_SLDIRS_ALL:S/^/${STAGEDIR}/} + @cd ${WRKSRC}; ${PAX} -rw . ${STAGEDIR}${_TD_FULL}/ @if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \ - then ${CP} ${FILESDIR}/chrome.manifest ${_TD_FULL}/ ; fi - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${_TD_FULL}/ - @${CHMOD} -R a+rX,go-w ${_TD_FULL}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q} ; } - @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} + then ${INSTALL_DATA} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi + @${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/ + @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A} @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @for _dir in ${XPI_DIRS_TRY} ; { ${ECHO_CMD} "@unexec rmdir %D/$$_dir ${_Q}" ${_A} ; } .endif .if !target(relink)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404271635.s3RGZwhR043208>