Author: jbeich Date: Tue Dec 30 22:45:12 2014 New Revision: 1799 Log: sync with ports
Modified: trunk/Mk/Uses/gecko.mk trunk/Mk/bsd.gecko.mk trunk/mail/linux-thunderbird/Makefile trunk/mail/thunderbird-i18n/Makefile trunk/mail/thunderbird/Makefile trunk/multimedia/gmp-api/Makefile trunk/multimedia/openh264/Makefile trunk/security/ca_root_nss/Makefile trunk/security/ca_root_nss/pkg-plist trunk/security/nss/Makefile trunk/www/firefox-esr-i18n/Makefile trunk/www/firefox-esr/Makefile trunk/www/firefox-i18n/Makefile trunk/www/firefox-i18n/Makefile.lang trunk/www/firefox-i18n/Makefile.option trunk/www/firefox-nightly/Makefile trunk/www/firefox/Makefile trunk/www/libxul/Makefile trunk/www/linux-firefox/Makefile trunk/www/linux-seamonkey/Makefile trunk/www/linux-seamonkey/Makefile.common trunk/www/seamonkey-i18n/Makefile trunk/www/seamonkey/Makefile trunk/www/xpi-adblock/Makefile.xpi Modified: trunk/Mk/Uses/gecko.mk ============================================================================== --- trunk/Mk/Uses/gecko.mk Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/Mk/Uses/gecko.mk Tue Dec 30 22:45:12 2014 (r1799) @@ -1,4 +1,4 @@ -# $FreeBSD: head/Mk/Uses/gecko.mk 371110 2014-10-18 10:23:53Z antoine $ +# $FreeBSD: head/Mk/Uses/gecko.mk 373997 2014-12-05 08:36:29Z beat $ # # Handle dependency of different gecko based applications # Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/Mk/bsd.gecko.mk Tue Dec 30 22:45:12 2014 (r1799) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson <[email protected]> # -# $FreeBSD: head/Mk/bsd.gecko.mk 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/Mk/bsd.gecko.mk 375594 2014-12-25 19:04:25Z antoine $ # # 4 column tabs prevent hair loss and tooth decay! @@ -180,7 +180,7 @@ pixman_LIB_DEPENDS= libpixman-1.so:${PORTSDIR}/x11/pixman pixman_MOZ_OPTIONS= --enable-system-pixman -png_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +png_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} .if exists(${FILESDIR}/patch-z-bug517422) || exists(${FILESDIR}/patch-zz-bug517422) Modified: trunk/mail/linux-thunderbird/Makefile ============================================================================== --- trunk/mail/linux-thunderbird/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/mail/linux-thunderbird/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/mail/linux-thunderbird/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/mail/linux-thunderbird/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= thunderbird DISTVERSION= 31.3.0 Modified: trunk/mail/thunderbird-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird-i18n/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/mail/thunderbird-i18n/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/mail/thunderbird-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/mail/thunderbird-i18n/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= thunderbird-i18n PORTVERSION= 31.3.0 Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/mail/thunderbird/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Joe Marcus Clarke <[email protected]> -# $FreeBSD: head/mail/thunderbird/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/mail/thunderbird/Makefile 375599 2014-12-25 20:55:54Z bapt $ PORTNAME= thunderbird DISTVERSION= 31.3.0 Modified: trunk/multimedia/gmp-api/Makefile ============================================================================== --- trunk/multimedia/gmp-api/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/multimedia/gmp-api/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,4 +1,4 @@ -# $FreeBSD: head/multimedia/gmp-api/Makefile 370909 2014-10-15 11:56:06Z beat $ +# $FreeBSD: head/multimedia/gmp-api/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= gmp-api PORTVERSION= 35.0 Modified: trunk/multimedia/openh264/Makefile ============================================================================== --- trunk/multimedia/openh264/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/multimedia/openh264/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,4 +1,4 @@ -# $FreeBSD: head/multimedia/openh264/Makefile 370910 2014-10-15 12:01:03Z beat $ +# $FreeBSD: head/multimedia/openh264/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= openh264 PORTVERSION= 1.3 Modified: trunk/security/ca_root_nss/Makefile ============================================================================== --- trunk/security/ca_root_nss/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/security/ca_root_nss/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,4 +1,4 @@ -# $FreeBSD: head/security/ca_root_nss/Makefile 372630 2014-11-16 10:15:20Z bapt $ +# $FreeBSD: head/security/ca_root_nss/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= ca_root_nss PORTVERSION= ${VERSION_NSS} Modified: trunk/security/ca_root_nss/pkg-plist ============================================================================== --- trunk/security/ca_root_nss/pkg-plist Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/security/ca_root_nss/pkg-plist Tue Dec 30 22:45:12 2014 (r1799) @@ -1,4 +1,3 @@ %%CERTDIR%%/ca-root-nss.crt etc/ssl/cert.pem -%%ETCSYMLINK%%@cwd / -%%ETCSYMLINK%%etc/ssl/cert.pem +%%ETCSYMLINK%%/etc/ssl/cert.pem Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/security/nss/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Maxim Sobolev <[email protected]> -# $FreeBSD: head/security/nss/Makefile 371936 2014-10-31 21:34:25Z rodrigo $ +# $FreeBSD: head/security/nss/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= nss PORTVERSION= 3.17.3 Modified: trunk/www/firefox-esr-i18n/Makefile ============================================================================== --- trunk/www/firefox-esr-i18n/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/firefox-esr-i18n/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/firefox-esr-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/firefox-esr-i18n/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= firefox PORTVERSION= 31.3.0 Modified: trunk/www/firefox-esr/Makefile ============================================================================== --- trunk/www/firefox-esr/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/firefox-esr/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Alan Eldridge <[email protected]> -# $FreeBSD: head/www/firefox-esr/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/firefox-esr/Makefile 375599 2014-12-25 20:55:54Z bapt $ PORTNAME= firefox DISTVERSION= 31.3.0 Modified: trunk/www/firefox-i18n/Makefile ============================================================================== --- trunk/www/firefox-i18n/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/firefox-i18n/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/firefox-i18n/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/firefox-i18n/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= firefox-i18n PORTVERSION= 35.0b6 Modified: trunk/www/firefox-i18n/Makefile.lang ============================================================================== --- trunk/www/firefox-i18n/Makefile.lang Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/firefox-i18n/Makefile.lang Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Koji Yokota <[email protected]> -# $FreeBSD: head/www/firefox-i18n/Makefile.lang 363978 2014-08-04 09:11:25Z bapt $ +# $FreeBSD: head/www/firefox-i18n/Makefile.lang 373830 2014-12-03 14:55:25Z beat $ FIREFOX_I18N_ALL_= ach af an ar as ast az be bg bn-BD bn-IN br bs ca cs \ cy da de dsb el en-GB en-US en-ZA eo es-AR es-CL \ Modified: trunk/www/firefox-i18n/Makefile.option ============================================================================== --- trunk/www/firefox-i18n/Makefile.option Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/firefox-i18n/Makefile.option Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Koji Yokota <[email protected]> -# $FreeBSD: head/www/firefox-i18n/Makefile.option 363978 2014-08-04 09:11:25Z bapt $ +# $FreeBSD: head/www/firefox-i18n/Makefile.option 373830 2014-12-03 14:55:25Z beat $ OPTIONS_DEFINE= LANG_ACH \ LANG_AF \ Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/firefox-nightly/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -79,9 +79,7 @@ .endif .if ${PORT_OPTIONS:MGTK3} -BUILD_DEPENDS+= gtk3>=3.14.3:${PORTSDIR}/x11-toolkits/gtk30 -# XXX ports/195455 -RUN_DEPENDS+= adwaita-icon-theme>=3.14:${PORTSDIR}/x11-themes/adwaita-icon-theme +BUILD_DEPENDS+= gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30 .endif .if ${PORT_OPTIONS:MMACH} && ${PORT_OPTIONS:MPGO} Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/firefox/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Alan Eldridge <[email protected]> -# $FreeBSD: head/www/firefox/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/firefox/Makefile 375599 2014-12-25 20:55:54Z bapt $ PORTNAME= firefox DISTVERSION= 35.0b6 @@ -68,9 +68,7 @@ .endif .if ${PORT_OPTIONS:MGTK3} -BUILD_DEPENDS+= gtk3>=3.14.3:${PORTSDIR}/x11-toolkits/gtk30 -# XXX ports/195455 -RUN_DEPENDS+= adwaita-icon-theme>=3.14:${PORTSDIR}/x11-themes/adwaita-icon-theme +BUILD_DEPENDS+= gtk3>=3.14.6:${PORTSDIR}/x11-toolkits/gtk30 .endif post-extract: Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/libxul/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Michael Johnson <[email protected]> -# $FreeBSD: head/www/libxul/Makefile 371388 2014-10-23 11:43:23Z beat $ +# $FreeBSD: head/www/libxul/Makefile 375599 2014-12-25 20:55:54Z bapt $ PORTNAME= libxul DISTVERSION= 31.3.0 Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/linux-firefox/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: voisine -# $FreeBSD: head/www/linux-firefox/Makefile 370932 2014-10-15 15:48:16Z beat $ +# $FreeBSD: head/www/linux-firefox/Makefile 373830 2014-12-03 14:55:25Z beat $ PORTNAME= firefox DISTVERSION= 35.0b6 Modified: trunk/www/linux-seamonkey/Makefile ============================================================================== --- trunk/www/linux-seamonkey/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/linux-seamonkey/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/linux-seamonkey/Makefile 370991 2014-10-16 10:25:47Z beat $ +# $FreeBSD: head/www/linux-seamonkey/Makefile 373997 2014-12-05 08:36:29Z beat $ PORTNAME= seamonkey DISTVERSION= 2.32b2 Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/linux-seamonkey/Makefile.common Tue Dec 30 22:45:12 2014 (r1799) @@ -1,6 +1,6 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/linux-seamonkey/Makefile.common 370932 2014-10-15 15:48:16Z beat $ -.if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \ +# $FreeBSD: head/www/linux-seamonkey/Makefile.common 374417 2014-12-09 18:05:30Z xmj $ +.if !defined(OVERRIDE_LINUX_NONBASE_PORTS) || \ ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10" .undef WANT_GTK218 .endif Modified: trunk/www/seamonkey-i18n/Makefile ============================================================================== --- trunk/www/seamonkey-i18n/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/seamonkey-i18n/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/seamonkey-i18n/Makefile 370991 2014-10-16 10:25:47Z beat $ +# $FreeBSD: head/www/seamonkey-i18n/Makefile 373997 2014-12-05 08:36:29Z beat $ PORTNAME= seamonkey-i18n PORTVERSION= 2.32b2 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/seamonkey/Makefile Tue Dec 30 22:45:12 2014 (r1799) @@ -1,5 +1,5 @@ # Created by: eivind/dima/jseger -# $FreeBSD: head/www/seamonkey/Makefile 370991 2014-10-16 10:25:47Z beat $ +# $FreeBSD: head/www/seamonkey/Makefile 375599 2014-12-25 20:55:54Z bapt $ PORTNAME= seamonkey DISTVERSION= 2.32b2 Modified: trunk/www/xpi-adblock/Makefile.xpi ============================================================================== --- trunk/www/xpi-adblock/Makefile.xpi Sat Dec 27 00:06:53 2014 (r1798) +++ trunk/www/xpi-adblock/Makefile.xpi Tue Dec 30 22:45:12 2014 (r1799) @@ -1,8 +1,8 @@ # Created by: Andrew Pantyukhin <[email protected]> -# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 372585 2014-11-15 08:59:40Z antoine $ +# $FreeBSD: head/www/xpi-adblock/Makefile.xpi 374228 2014-12-08 00:12:07Z bar $ # XPI_ID - Extension id, might be in {12345-...} or dev@org format -# XPI_NUM - Extension number, as in addons.mozilla.org URL +# XPI_NUM - Extension number, as in addons.cdn.mozilla.net URL # XPI_FILES - List of files in xpi archive. This is used to produce # PLIST_FILES. XPI_FILES can be generated by xpi-gen, but be # sure to put chrome.manifest in ${FILESDIR} before that if you @@ -13,7 +13,7 @@ # - These should all be set manually for port to be functional. See # ${PORTSDIR}/Mk/bsd.port.mk for details. # MASTER_SITES - This should be set if port is unavailable at the default site. -# Default: ${MASTER_SITE_MOZILLA} +# Default (defined below): ${MASTER_SITE_MOZILLA_ADDONS} # MASTER_SITE_SUBDIR # - Default: extensions/${PORTNAME} # LATEST_LINK - Default: ${PKGBASE:S/_//g} @@ -58,8 +58,10 @@ # xpi ports do not depend on their master applications. You can install an # extension before the app and run relink when the app is present. +MASTER_SITE_MOZILLA_ADDONS= http://addons.cdn.mozilla.net/user-media/%SUBDIR%/ + .ifndef MASTER_SITES -MASTER_SITES?= MOZILLA_EXTENDED +MASTER_SITES?= MOZILLA_ADDONS .ifdef XPI_NUM MASTER_SITE_SUBDIR?= addons/${XPI_NUM} .endif _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
