Date: Wed, 24 Jul 2013 09:30:22 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323582 - head/www/linux-firefox Message-ID: <201307240930.r6O9UMBn098087@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Wed Jul 24 09:30:21 2013 New Revision: 323582 URL: http://svnweb.freebsd.org/changeset/ports/323582 Log: Update to 22.0 Modified: head/www/linux-firefox/Makefile head/www/linux-firefox/distinfo head/www/linux-firefox/pkg-plist Modified: head/www/linux-firefox/Makefile ============================================================================== --- head/www/linux-firefox/Makefile Wed Jul 24 09:29:58 2013 (r323581) +++ head/www/linux-firefox/Makefile Wed Jul 24 09:30:21 2013 (r323582) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= firefox -PORTVERSION= 21.0 +PORTVERSION= 22.0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US @@ -10,7 +10,6 @@ MASTER_SITES= MOZILLA/${PORTNAME}/releas MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -# gecko version must be exactly same EXTRACT_DEPENDS=${NONEXISTENT}:${PORTSDIR}/www/linux-seamonkey:extract CONFLICTS= linux-firefox-24.* linux-firefox-1[07].* @@ -19,12 +18,27 @@ USE_BZIP2= yes USE_LINUX_APPS= dbusglib dbuslibs alsalib alsa-plugins-oss +APP_SUBDIR= browser/ # plugins, extensions + .include "${.CURDIR}/../linux-seamonkey/Makefile.common" +# XXX remove after linux_base-c6 and linux-c6-gtk2 become default +# using seamonkey gre for linux_base-f10 compat post-extract: replace-gre -replace-gre: - # using seamonkey gre for linux_base-f10 compat +replace-gre: version-compat-check + @${ECHO_MSG} "===> GRE versions are compatible, replacing with" \ + "$$(${MAKE} -V PKGNAME -C ${PORTSDIR}/www/linux-seamonkey)" cd $$(${MAKE} -V WRKSRC -C ${PORTSDIR}/www/linux-seamonkey); \ ${CP} lib* dependentlibs.list ${WRKSRC} +version-compat-check: + @${ECHO_MSG} "===> Checking GRE version is compatible with" \ + "$$(${MAKE} -V PKGNAME -C ${PORTSDIR}/www/linux-seamonkey)" + @ff_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' ${WRKSRC}/platform.ini); \ + sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${PORTSDIR}/www/linux-seamonkey)/platform.ini); \ + if [ $$ff_gre_version != $$sm_gre_version ]; then \ + ${ECHO_MSG} "===> GRE versions aren't compatible, aborting"; \ + exit 1; \ + fi + .include <bsd.port.mk> Modified: head/www/linux-firefox/distinfo ============================================================================== --- head/www/linux-firefox/distinfo Wed Jul 24 09:29:58 2013 (r323581) +++ head/www/linux-firefox/distinfo Wed Jul 24 09:30:21 2013 (r323582) @@ -1,2 +1,2 @@ -SHA256 (firefox-21.0.tar.bz2) = 1151e4998badcfd984624ee42fea572c7da64112d631901652fd558f5640fffe -SIZE (firefox-21.0.tar.bz2) = 24410321 +SHA256 (firefox-22.0.tar.bz2) = 3253966e8ca81b872d8fb03fefdd574c1d1bc7555b9aecfa6f354161f676370b +SIZE (firefox-22.0.tar.bz2) = 25314325 Modified: head/www/linux-firefox/pkg-plist ============================================================================== --- head/www/linux-firefox/pkg-plist Wed Jul 24 09:29:58 2013 (r323581) +++ head/www/linux-firefox/pkg-plist Wed Jul 24 09:30:21 2013 (r323582) @@ -54,7 +54,6 @@ lib/%%APP_NAME%%/libsmime3.so lib/%%APP_NAME%%/libsoftokn3.chk lib/%%APP_NAME%%/libsoftokn3.so lib/%%APP_NAME%%/libssl3.so -lib/%%APP_NAME%%/libxpcom.so lib/%%APP_NAME%%/libxul.so lib/%%APP_NAME%%/mozilla-xremote-client lib/%%APP_NAME%%/omni.ja @@ -69,26 +68,25 @@ lib/%%APP_NAME%%/updater.ini lib/%%APP_NAME%%/webapprt-stub lib/%%APP_NAME%%/webapprt/omni.ja lib/%%APP_NAME%%/webapprt/webapprt.ini -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true -@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true -@dirrm lib/%%APP_NAME%%/webapprt -@dirrm lib/%%APP_NAME%%/plugins -@dirrm lib/%%APP_NAME%%/icons -@dirrm lib/%%APP_NAME%%/extensions -@dirrm lib/%%APP_NAME%%/dictionaries -@dirrm lib/%%APP_NAME%%/defaults/pref -@dirrm lib/%%APP_NAME%%/defaults -@dirrm lib/%%APP_NAME%%/components -@dirrm lib/%%APP_NAME%%/browser/searchplugins -@dirrm lib/%%APP_NAME%%/browser/icons -@dirrm lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -@dirrm lib/%%APP_NAME%%/browser/extensions -@dirrm lib/%%APP_NAME%%/browser/components +@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/plugins/ 2>/dev/null || true +@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/browser/extensions/ 2>/dev/null || true +@unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/plugins/ -depth 1 -type l -delete 2>/dev/null || true +@unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/extensions/ -depth 1 -type l -delete 2>/dev/null || true @dirrm lib/%%APP_NAME%%/browser/chrome/icons/default @dirrm lib/%%APP_NAME%%/browser/chrome/icons @dirrm lib/%%APP_NAME%%/browser/chrome +@dirrm lib/%%APP_NAME%%/browser/components +@dirrm lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +@dirrm lib/%%APP_NAME%%/browser/extensions +@dirrm lib/%%APP_NAME%%/browser/icons +@dirrm lib/%%APP_NAME%%/browser/plugins +@dirrm lib/%%APP_NAME%%/browser/searchplugins @dirrm lib/%%APP_NAME%%/browser +@dirrm lib/%%APP_NAME%%/components +@dirrm lib/%%APP_NAME%%/defaults/pref +@dirrm lib/%%APP_NAME%%/defaults +@dirrm lib/%%APP_NAME%%/dictionaries +@dirrm lib/%%APP_NAME%%/icons +@dirrm lib/%%APP_NAME%%/webapprt @dirrm lib/%%APP_NAME%% @dirrmtry share/applications
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307240930.r6O9UMBn098087>