Date: Sun, 2 Oct 2016 14:29:29 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423124 - in head: Mk mail/thunderbird www/firefox www/firefox-esr www/libxul www/seamonkey Message-ID: <201610021429.u92ETTSd003781@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sun Oct 2 14:29:29 2016 New Revision: 423124 URL: https://svnweb.freebsd.org/changeset/ports/423124 Log: gecko: cleanup obsolete conditionals - Remove unused MOZILLA_VER checks - Drop unused GSTREAMER and LOGGING options - Drop unsupported USE_MOZILLA=opus (--with-system-opus) Modified: head/Mk/bsd.gecko.mk (contents, props changed) head/mail/thunderbird/Makefile (contents, props changed) head/www/firefox-esr/Makefile (contents, props changed) head/www/firefox/Makefile (contents, props changed) head/www/firefox/Makefile.options (contents, props changed) head/www/libxul/Makefile (contents, props changed) head/www/seamonkey/Makefile (contents, props changed) Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Sun Oct 2 14:29:03 2016 (r423123) +++ head/Mk/bsd.gecko.mk Sun Oct 2 14:29:29 2016 (r423124) @@ -137,12 +137,7 @@ LDFLAGS+= -L${LOCALBASE}/lib \ .if ${OPSYS} != DragonFly # XXX xpcshell crash during install # use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning MOZ_EXPORT+= MOZ_JEMALLOC3=1 MOZ_JEMALLOC4=1 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100079 -. if ${MOZILLA_VER:R:R} < 43 -# system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bug1125514 -. endif -.elif ${OPSYS} != FreeBSD || ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37 +.if ${OPSYS} != FreeBSD || ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37 . if ${MOZILLA_VER:R:R} >= 48 MOZ_OPTIONS+= --enable-jemalloc=4 .else @@ -152,7 +147,7 @@ MOZ_OPTIONS+= --enable-jemalloc .endif # !DragonFly # Standard depends -_ALL_DEPENDS= cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss opus png pixman soundtouch sqlite vpx +_ALL_DEPENDS= cairo event ffi graphite harfbuzz hunspell icu jpeg nspr nss png pixman soundtouch sqlite vpx .if ${PORT_OPTIONS:MINTEGER_SAMPLES} MOZ_EXPORT+= MOZ_INTEGER_SAMPLES=1 @@ -198,11 +193,6 @@ nspr_MOZ_OPTIONS= --with-system-nspr nss_LIB_DEPENDS= libnss3.so:security/nss nss_MOZ_OPTIONS= --with-system-nss -.if exists(${FILESDIR}/patch-z-bug517422) && ${MOZILLA_VER:R:R} < 45 -opus_LIB_DEPENDS= libopus.so:audio/opus -opus_MOZ_OPTIONS= --with-system-opus -.endif - pixman_LIB_DEPENDS= libpixman-1.so:x11/pixman pixman_MOZ_OPTIONS= --enable-system-pixman @@ -290,10 +280,7 @@ MOZ_TOOLKIT= cairo-gtk3 .if ${MOZ_TOOLKIT:Mcairo-gtk3} BUILD_DEPENDS+= gtk3>=3.14.6:x11-toolkits/gtk30 -USE_GNOME+= gdkpixbuf2 gtk30 -. if ${MOZILLA_VER:R:R} >= 32 -USE_GNOME+= gtk20 # bug 624422 -. endif +USE_GNOME+= gdkpixbuf2 gtk20 gtk30 .else # gtk2, cairo-gtk2 USE_GNOME+= gdkpixbuf2 gtk20 .endif @@ -325,11 +312,7 @@ MOZ_OPTIONS+= --disable-dbus RUN_DEPENDS+= ffmpeg>=0.8,1:multimedia/ffmpeg .endif -.if ${PORT_OPTIONS:MGSTREAMER} -RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:multimedia/gstreamer1-libav -USE_GSTREAMER1?=good libav -MOZ_OPTIONS+= --enable-gstreamer=1.0 -.elif ${MOZILLA_VER:R:R} < 46 +.if ${MOZILLA_VER:R:R} < 46 MOZ_OPTIONS+= --disable-gstreamer .endif @@ -383,7 +366,6 @@ MOZ_OPTIONS+= --enable-pulseaudio MOZ_OPTIONS+= --disable-pulseaudio .endif -.if ${MOZILLA_VER:R:R} >= 40 .if ${PORT_OPTIONS:MRUST} BUILD_DEPENDS+= rustc:${RUST_PORT} RUST_PORT?= lang/rust @@ -391,7 +373,6 @@ MOZ_OPTIONS+= --enable-rust .else MOZ_OPTIONS+= --disable-rust .endif -.endif .if ${PORT_OPTIONS:MDEBUG} MOZ_OPTIONS+= --enable-debug --disable-release @@ -411,14 +392,6 @@ STRIP= MOZ_OPTIONS+= --disable-dtrace .endif -.if ${MOZILLA_VER:R:R} < 40 -. if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG} -MOZ_OPTIONS+= --enable-logging -. else -MOZ_OPTIONS+= --disable-logging -. endif -.endif - .if ${PORT_OPTIONS:MPROFILE} MOZ_OPTIONS+= --enable-profiling STRIP= Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Sun Oct 2 14:29:03 2016 (r423123) +++ head/mail/thunderbird/Makefile Sun Oct 2 14:29:29 2016 (r423124) @@ -53,7 +53,6 @@ PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZIL SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome -OPTIONS_EXCLUDE=GSTREAMER LOGGING OPTIONS_DEFINE= ENIGMAIL LIGHTNING RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 Modified: head/www/firefox-esr/Makefile ============================================================================== --- head/www/firefox-esr/Makefile Sun Oct 2 14:29:03 2016 (r423123) +++ head/www/firefox-esr/Makefile Sun Oct 2 14:29:29 2016 (r423124) @@ -48,7 +48,6 @@ MOZ_OPTIONS= --program-transform-name='s --enable-application=browser \ --enable-official-branding -OPTIONS_EXCLUDE= GSTREAMER LOGGING OPTIONS_DEFINE= RUST OPTIONS_DEFAULT= BUNDLED_CAIRO GTK2 Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Sun Oct 2 14:29:03 2016 (r423123) +++ head/www/firefox/Makefile Sun Oct 2 14:29:29 2016 (r423124) @@ -45,7 +45,6 @@ FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILL MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding -OPTIONS_EXCLUDE= GSTREAMER LOGGING OPTIONS_DEFINE= RUST OPTIONS_DEFAULT= BUNDLED_CAIRO GTK3 ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}_${ARCH}} Modified: head/www/firefox/Makefile.options ============================================================================== --- head/www/firefox/Makefile.options Sun Oct 2 14:29:03 2016 (r423123) +++ head/www/firefox/Makefile.options Sun Oct 2 14:29:29 2016 (r423124) @@ -1,10 +1,10 @@ # -*- makefile-bsdmake -*- OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \ - GNOMEUI GSTREAMER INTEGER_SAMPLES LIBPROXY LOGGING \ + GNOMEUI INTEGER_SAMPLES LIBPROXY \ OPTIMIZED_CFLAGS PGO PROFILE TEST -OPTIONS_DEFAULT+= DBUS DTRACE FFMPEG GSTREAMER LOGGING OPTIMIZED_CFLAGS \ +OPTIONS_DEFAULT+= DBUS DTRACE FFMPEG OPTIMIZED_CFLAGS \ ${OPTIONS_MULTI_AUDIO} \ ${MACHINE_CPU:tu:MSOFTFP:S/SOFTFP/INTEGER_SAMPLES/} @@ -27,5 +27,4 @@ GNOMEUI_DESC?= libgnomeui support modul INTEGER_SAMPLES_DESC?= Integer audio sample format LIBPROXY_DESC?= Proxy support via libproxy LIGHTNING_DESC?= Calendar extension -LOGGING_DESC?= Additional log messages RUST_DESC?= Build with components written in Rust language Modified: head/www/libxul/Makefile ============================================================================== --- head/www/libxul/Makefile Sun Oct 2 14:29:03 2016 (r423123) +++ head/www/libxul/Makefile Sun Oct 2 14:29:29 2016 (r423124) @@ -48,7 +48,6 @@ MOZILLA_PLIST_DIRS= bin include lib shar MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \ mozilla-plugin -OPTIONS_EXCLUDE= GSTREAMER LOGGING OPTIONS_DEFINE= RUST OPTIONS_DEFAULT= BUNDLED_CAIRO GTK2 Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Sun Oct 2 14:29:03 2016 (r423123) +++ head/www/seamonkey/Makefile Sun Oct 2 14:29:29 2016 (r423124) @@ -27,7 +27,6 @@ BUILD_DEPENDS= nspr>=4.10.10:devel/nspr autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip -# opus>=1.1:audio/opus \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l @@ -44,12 +43,11 @@ MOZ_EXTENSIONS= default MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \ --enable-application=suite -USE_MOZILLA= -opus +USE_MOZILLA= # empty MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 -OPTIONS_EXCLUDE=GSTREAMER LOGGING OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610021429.u92ETTSd003781>