Date: Thu, 19 Sep 2013 05:15:51 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1367 - in trunk: Mk mail/thunderbird www/firefox www/firefox-esr www/firefox-nightly www/libxul www/seamonkey Message-ID: <201309190515.r8J5FpCO045840@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Sep 19 05:15:51 2013
New Revision: 1367
Log:
prune obsolete checks after r1357 and r1363
Modified:
trunk/Mk/bsd.gecko.mk
trunk/mail/thunderbird/Makefile
trunk/www/firefox-esr/Makefile
trunk/www/firefox-nightly/Makefile
trunk/www/firefox/Makefile
trunk/www/firefox/Makefile.options
trunk/www/libxul/Makefile
trunk/www/seamonkey/Makefile
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Thu Sep 19 05:15:42 2013 (r1366)
+++ trunk/Mk/bsd.gecko.mk Thu Sep 19 05:15:51 2013 (r1367)
@@ -540,27 +540,24 @@
CPPFLAGS+= -isystem${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN
-.if ${MOZILLA_VER:R:R} >= 19 || ${MOZILLA:Mseamonkey*}
# prefer base clang, for lang/clang{,-devel} see ports/177224
-. if ${CC} == "cc" && (exists(/usr/bin/clang) && ${OSVERSION} >= 900014)
+.if ${CC} == "cc" && (exists(/usr/bin/clang) && ${OSVERSION} >= 900014)
CC= /usr/bin/clang
-. endif
-. if ${CXX} == "c++" && (exists(/usr/bin/clang++) && ${OSVERSION} >= 900014)
+.endif
+.if ${CXX} == "c++" && (exists(/usr/bin/clang++) && ${OSVERSION} >= 900014)
CXX= /usr/bin/clang++
-. endif
-. if ${CPP} == "cpp" && (exists(/usr/bin/clang-cpp) && ${OSVERSION} >= 900045)
+.endif
+.if ${CPP} == "cpp" && (exists(/usr/bin/clang-cpp) && ${OSVERSION} >= 900045)
CPP= /usr/bin/clang-cpp
-. endif
-. if ${CC} != "cc" && ${CPP} == "cpp"
+.endif
+.if ${CC} != "cc" && ${CPP} == "cpp"
CPP= ${CC} -E
-. endif
+.endif
# fallback to gcc otherwise
-. if ${CC} == "cc" || ${CXX} == "c++"
+.if ${CC} == "cc" || ${CXX} == "c++"
USE_GCC?= yes
-. endif
.endif
-.if ${MOZILLA_VER:R:R} >= 19 || ${MOZILLA:Mseamonkey*} || exists(${.CURDIR}/files/patch-bug788955)
.if ${OSVERSION} > 1000011
# use jemalloc 3.0.0 API in libc
MOZ_EXPORT+= MOZ_JEMALLOC=1 MOZ_JEMALLOC3=1
@@ -568,10 +565,9 @@
MOZ_OPTIONS+= --enable-jemalloc
MOZ_EXPORT+= MOZ_JEMALLOC=1 MOZ_JEMALLOC3=1
.endif
-.endif
# Standard depends
-_ALL_DEPENDS= cairo event ffi hunspell jpeg nspr nss png sqlite vpx zip
+_ALL_DEPENDS= cairo event ffi hunspell icu jpeg nspr nss png sqlite vpx zip
cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo
cairo_MOZ_OPTIONS= --enable-system-cairo --enable-system-pixman
@@ -588,10 +584,6 @@
hunspell_LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell
hunspell_MOZ_OPTIONS= --enable-system-hunspell
-.if ${MOZILLA_VER:R:R} >= 23 || ${MOZILLA:Mseamonkey*}
-_ALL_DEPENDS+= icu
-.endif
-
icu_LIB_DEPENDS= icui18n:${PORTSDIR}/devel/icu
icu_MOZ_OPTIONS= --with-system-icu --with-intl-api --enable-intl-api
@@ -616,9 +608,7 @@
sqlite_LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3
sqlite_MOZ_OPTIONS= --enable-system-sqlite
-.if ${MOZILLA_VER:R:R} >= 20 || ${MOZILLA:Mseamonkey*}
sqlite_EXTRACT_AFTER_ARGS= --exclude mozilla*/db/sqlite3
-.endif
vpx_LIB_DEPENDS= vpx:${PORTSDIR}/multimedia/libvpx
vpx_MOZ_OPTIONS= --with-system-libvpx
@@ -761,10 +751,6 @@
.undef GNU_CONFIGURE
MAKEFILE= ${WRKSRC}/client.mk
ALL_TARGET= profiledbuild
-. if ${MOZILLA_VER:R:R} < 22 && ! ${MOZILLA:Mseamonkey*}
-MOZ_MK_OPTIONS+=PROFILE_GEN_SCRIPT="${PYTHON_CMD} \
- @MOZ_OBJDIR@/_profile/pgo/profileserver.py"
-. endif
.endif
.if ${PORT_OPTIONS:MALSA}
@@ -834,7 +820,7 @@
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-unknown-${OPSYS:L}${OSREL}
-. if ${USE_MOZILLA:M-nss} && (${MOZILLA_VER:R:R} >= 20 || ${MOZILLA:Mseamonkey*} )
+. if ${USE_MOZILLA:M-nss}
USE_BINUTILS= # intel-gcm.s
CFLAGS+= -B${LOCALBASE}/bin
LDFLAGS+= -B${LOCALBASE}/bin
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Thu Sep 19 05:15:42 2013 (r1366)
+++ trunk/mail/thunderbird/Makefile Thu Sep 19 05:15:51 2013 (r1367)
@@ -62,8 +62,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-# OSS is gone after bug 852401
-OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
+OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/GSTREAMER//}
.include <bsd.port.pre.mk>
Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile Thu Sep 19 05:15:42 2013 (r1366)
+++ trunk/www/firefox-esr/Makefile Thu Sep 19 05:15:51 2013 (r1367)
@@ -46,13 +46,7 @@
--enable-application=browser \
--enable-official-branding
-OPTIONS_DEFAULT=GSTREAMER
-
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-# OSS is gone after bug 852401
-OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
-
.include <bsd.port.pre.mk>
WRKSRC:= ${WRKDIR}/mozilla-esr24
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Thu Sep 19 05:15:42 2013 (r1366)
+++ trunk/www/firefox-nightly/Makefile Thu Sep 19 05:15:51 2013 (r1367)
@@ -52,16 +52,12 @@
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
--enable-application=browser
-OPTIONS_DEFAULT=GSTREAMER GTK2
+OPTIONS_DEFAULT= GTK2
OPTIONS_SINGLE+= TOOLKIT
OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-# OSS is gone after bug 852401
-OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
-
.include <bsd.port.pre.mk>
WRKSRC:= ${WRKDIR}/${MASTER_SITES:M*hg*:S,/archive/,,:T}-${HGREV:C/.*://}
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Thu Sep 19 05:15:42 2013 (r1366)
+++ trunk/www/firefox/Makefile Thu Sep 19 05:15:51 2013 (r1367)
@@ -47,13 +47,7 @@
--enable-application=browser \
--enable-official-branding
-OPTIONS_DEFAULT=GSTREAMER
-
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-# OSS is gone after bug 852401
-OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
-
.include <bsd.port.pre.mk>
WRKSRC:= ${WRKDIR}/mozilla-beta
Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options Thu Sep 19 05:15:42 2013 (r1366)
+++ trunk/www/firefox/Makefile.options Thu Sep 19 05:15:51 2013 (r1367)
@@ -2,10 +2,10 @@
OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 GSTREAMER \
LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST
-OPTIONS_DEFAULT+= ALSA DBUS GIO LOGGING
+OPTIONS_DEFAULT+= ALSA DBUS GIO GSTREAMER LOGGING
OPTIONS_SINGLE+= AUDIO
-OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO
+OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO
ENIGMAIL_DESC?= Enigmail extension
GIO_DESC?= GIO for file I/O # move to bsd.options.desc.mk
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Thu Sep 19 05:15:42 2013 (r1366)
+++ trunk/www/libxul/Makefile Thu Sep 19 05:15:51 2013 (r1367)
@@ -49,13 +49,7 @@
MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \
mozilla-plugin
-OPTIONS_DEFAULT=GSTREAMER
-
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-# OSS is gone after bug 852401
-OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
-
.include <bsd.port.pre.mk>
.if ${USE_MOZILLA:M-nss}
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Thu Sep 19 05:15:42 2013 (r1366)
+++ trunk/www/seamonkey/Makefile Thu Sep 19 05:15:51 2013 (r1367)
@@ -47,7 +47,7 @@
NOT_FOR_ARCHS= ia64
OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
CHATZILLA_DESC?=Chatzilla IRC module
COMPOSER_DESC?= HTML Composer module
@@ -60,10 +60,6 @@
MAKEFILE= ${WRKSRC}/client.mk
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-# OSS is gone after bug 852401
-OPTIONS_SINGLE_AUDIO:=${OPTIONS_SINGLE_AUDIO:S/OSS//}
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCHATZILLA}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309190515.r8J5FpCO045840>