From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 19 04:02:18 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 ESMTP id ED5B5907 for ; Thu, 19 Sep 2013 04:02:17 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) 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 65E932DDA for ; Thu, 19 Sep 2013 04:02:16 +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 r8J42F6o066407 for ; Thu, 19 Sep 2013 04:02:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r8J42AIO065242 for freebsd-gecko@freebsd.org; Thu, 19 Sep 2013 04:02:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 19 Sep 2013 04:02:10 GMT Message-Id: <201309190402.r8J42AIO065242@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] r1363 - in trunk/www/firefox-esr: . files 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.14 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, 19 Sep 2013 04:02:18 -0000 Author: jbeich Date: Thu Sep 19 04:02:10 2013 New Revision: 1363 Log: switch firefox-esr to esr24 Replaced: trunk/www/firefox-esr/ - copied from r1362, trunk/www/firefox/ Deleted: trunk/www/firefox-esr/Makefile.options trunk/www/firefox-esr/Makefile.webplugins trunk/www/firefox-esr/files/pkg-deinstall.in trunk/www/firefox-esr/files/pkg-install.in Modified: trunk/www/firefox-esr/Makefile Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Sep 19 03:52:23 2013 (r1362) +++ trunk/www/firefox-esr/Makefile Thu Sep 19 04:02:10 2013 (r1363) @@ -1,12 +1,12 @@ # Created by: Alan Eldridge -# $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ +# $FreeBSD: head/www/firefox-esr/Makefile 310207 2013-01-10 22:29:23Z flo $ PORTNAME= firefox DISTVERSION= 24.0 PORTEPOCH= 1 CATEGORIES= www ipv6 -MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source/ +MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source +PKGNAMESUFFIX= -esr DISTNAME= ${PORTNAME}-${DISTVERSION}esr.source MAINTAINER= gecko@FreeBSD.org @@ -25,7 +25,7 @@ USE_PYTHON_BUILD=-2.7 OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko -CONFLICTS= firefox-esr-24.* firefox-esr-17.* firefox-1[07].* +CONFLICTS= firefox-2[0-35-9].* firefox-1[1-689].* MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= # empty MOZILLA_NAME= Firefox Deleted: trunk/www/firefox/Makefile.options ============================================================================== --- trunk/www/firefox/Makefile.options Thu Sep 19 04:02:10 2013 (r1362) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ -# -*- makefile-bsdmake -*- - -OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \ - LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST -OPTIONS_DEFAULT+= ALSA DBUS GIO LOGGING - -OPTIONS_SINGLE+= AUDIO -OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO - -ENIGMAIL_DESC?= Enigmail extension -GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk -GNOMEUI_DESC?= libgnomeui support module -LIBPROXY_DESC?= Proxy support via libproxy -LIGHTNING_DESC?= Calendar extension -LOGGING_DESC?= Additional log messages Deleted: trunk/www/firefox/Makefile.webplugins ============================================================================== --- trunk/www/firefox/Makefile.webplugins Thu Sep 19 04:02:10 2013 (r1362) +++ /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 Deleted: trunk/www/firefox/files/pkg-deinstall.in ============================================================================== --- trunk/www/firefox/files/pkg-deinstall.in Thu Sep 19 04:02:10 2013 (r1362) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,28 +0,0 @@ -#!/bin/sh -# -# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.25 2008/07/26 19:07:07 ahze Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas () -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xDEINSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components/*.dat -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini -rm -f ${MOZDIR}/chrome/app-chrome.manifest -rm -rf ${MOZDIR}/updates -find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1 -find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1 - -exit 0 Deleted: trunk/www/firefox/files/pkg-install.in ============================================================================== --- trunk/www/firefox/files/pkg-install.in Thu Sep 19 04:02:10 2013 (r1362) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,37 +0,0 @@ -#!/bin/sh -# -# $MCom: ports/www/mozilla/pkg-install.in,v 1.26 2008/08/04 16:58:03 mezz Exp $ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas () -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -MOZBIN=${MOZDIR}/%%MOZILLA_BIN%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -mkdir -p ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/component.reg - -cd ${MOZDIR} || exit 1 -if [ -f ${REGXPCOM} ]; then - ./run-mozilla.sh ${REGXPCOM} || true -fi -if [ -f ${REGCHROME} ]; then - ./run-mozilla.sh ${REGCHROME} || true -fi -if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then - ./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1 -fi -cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1 - -exit 0