Author: jbeich
Date: Sat Oct 11 14:31:52 2014
New Revision: 1722
Log:
sync with ports@369465 and ports@369730
Modified:
trunk/Mk/Uses/gecko.mk
trunk/Mk/Uses/webplugin.mk
trunk/mail/thunderbird/Makefile
trunk/www/firefox-esr/Makefile
trunk/www/firefox-nightly/Makefile
trunk/www/firefox/Makefile
trunk/www/libxul/Makefile
trunk/www/seamonkey/Makefile
Modified: trunk/Mk/Uses/gecko.mk
==============================================================================
--- trunk/Mk/Uses/gecko.mk Fri Oct 10 06:10:11 2014 (r1721)
+++ trunk/Mk/Uses/gecko.mk Sat Oct 11 14:31:52 2014 (r1722)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/Mk/Uses/gecko.mk 367722 2014-09-09 09:51:05Z bapt $
+# $FreeBSD: head/Mk/Uses/gecko.mk 369465 2014-09-28 16:36:31Z tijl $
#
# Handle dependency of different gecko based applications
#
@@ -18,15 +18,13 @@
.if !defined(_INCLUDE_USES_GECKO_MK)
_INCLUDE_USES_GECKO_MK= yes
-.if !defined(gecko_ARGS)
-_GECKO_ARGS= libxul
-.else
-_GECKO_ARGS= ${gecko_ARGS:S/,/ /g}
+.if empty(gecko_ARGS)
+gecko_ARGS= libxul
.endif
-_GECKO_VERSION= ${_GECKO_ARGS:M[0-9][0-9]*}
+_GECKO_VERSION= ${gecko_ARGS:M[0-9][0-9]*}
-.if ${_GECKO_ARGS:Mlibxul}
+.if ${gecko_ARGS:Mlibxul}
# Compat with older versions
GECKO= libxul
GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO}-config
@@ -36,7 +34,7 @@
BUILD_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul
RUN_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul
-.elif ${_GECKO_ARGS:Mfirefox}
+.elif ${gecko_ARGS:Mfirefox}
_GECKO_DEFAULT_VERSION= 31
_GECKO_VERSIONS= 31 33
@@ -51,7 +49,7 @@
_GECKO_INSTALLED_VER:=
${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g}
.endif
-.elif ${_GECKO_ARGS:Mseamonkey}
+.elif ${gecko_ARGS:Mseamonkey}
_GECKO_DEFAULT_VERSION= 30
_GECKO_VERSIONS= 30
@@ -65,7 +63,7 @@
# Dependence lines for different Seamonkey versions
30_DEPENDS=
${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
-.elif ${_GECKO_ARGS:Mthunderbird}
+.elif ${gecko_ARGS:Mthunderbird}
_GECKO_DEFAULT_VERSION= 31
_GECKO_VERSIONS= 31
@@ -119,7 +117,7 @@
.endif
-.if ${_GECKO_ARGS:Mbuild}
+.if ${gecko_ARGS:Mbuild}
BUILD_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS}
.endif
RUN_DEPENDS+= ${${_GECKO_WANTED_VERSION}_DEPENDS}
Modified: trunk/Mk/Uses/webplugin.mk
==============================================================================
--- trunk/Mk/Uses/webplugin.mk Fri Oct 10 06:10:11 2014 (r1721)
+++ trunk/Mk/Uses/webplugin.mk Sat Oct 11 14:31:52 2014 (r1722)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/Mk/Uses/webplugin.mk 369053 2014-09-23 12:46:38Z bapt $
+# $FreeBSD: head/Mk/Uses/webplugin.mk 369465 2014-09-28 16:36:31Z tijl $
#
# Documentation and examples:
#
@@ -113,19 +113,17 @@
_WEBPLUGIN_APPS_ALL= ${_WEBPLUGIN_APPS_ALL_LINUX} \
${_WEBPLUGIN_APPS_ALL_NATIVE}
-webplugin_ARGS?= all
-_WEBPLUGIN_ARGS= ${webplugin_ARGS:C/,/ /}
_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL}
-.if ${_WEBPLUGIN_ARGS} == all
+.if ${webplugin_ARGS} == all || empty(webplugin_ARGS)
_WEBPLUGIN_PATTERN= *
-.elif ${_WEBPLUGIN_ARGS} == native
+.elif ${webplugin_ARGS} == native
_WEBPLUGIN_PATTERN= *
_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_NATIVE}
-.elif ${_WEBPLUGIN_ARGS} == linux
+.elif ${webplugin_ARGS} == linux
_WEBPLUGIN_PATTERN= *
_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_LINUX}
.else
-_WEBPLUGIN_PATTERN= ${_WEBPLUGIN_ARGS}
+_WEBPLUGIN_PATTERN= ${webplugin_ARGS}
.endif
.if !defined(WEBPLUGIN_FILES)
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Fri Oct 10 06:10:11 2014 (r1721)
+++ trunk/mail/thunderbird/Makefile Sat Oct 11 14:31:52 2014 (r1722)
@@ -1,5 +1,5 @@
# Created by: Joe Marcus Clarke <[email protected]>
-# $FreeBSD: head/mail/thunderbird/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/mail/thunderbird/Makefile 369730 2014-10-01 15:07:31Z tijl $
PORTNAME= thunderbird
DISTVERSION= 31.2.0
@@ -25,6 +25,7 @@
sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
@@ -34,7 +35,6 @@
L_VERSION= 3.3.2
SSP_UNSAFE= yes
-USE_AUTOTOOLS= autoconf213:env
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
USE_MOZILLA= # empty
@@ -156,9 +156,9 @@
.endif
pre-configure:
- (cd ${WRKSRC} && ${AUTOCONF})
- (cd ${MOZSRC} && ${AUTOCONF})
- (cd ${MOZSRC}/js/src/ && ${AUTOCONF})
+ (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+ (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+ (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
.if ${PORT_OPTIONS:MENIGMAIL}
post-configure:
Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile Fri Oct 10 06:10:11 2014 (r1721)
+++ trunk/www/firefox-esr/Makefile Sat Oct 11 14:31:52 2014 (r1722)
@@ -1,5 +1,5 @@
# Created by: Alan Eldridge <[email protected]>
-# $FreeBSD: head/www/firefox-esr/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/firefox-esr/Makefile 369730 2014-10-01 15:07:31Z tijl $
PORTNAME= firefox
DISTVERSION= 31.2.0
@@ -25,12 +25,12 @@
sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
-USE_AUTOTOOLS= autoconf213:env
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
CPE_PRODUCT= ${PORTNAME}_esr
@@ -97,8 +97,8 @@
${WRKSRC}/browser/app/nsBrowserApp.cpp
pre-configure:
- (cd ${WRKSRC} && ${AUTOCONF})
- (cd ${WRKSRC}/js/src/ && ${AUTOCONF})
+ (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+ (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Fri Oct 10 06:10:11 2014 (r1721)
+++ trunk/www/firefox-nightly/Makefile Sat Oct 11 14:31:52 2014 (r1722)
@@ -19,6 +19,7 @@
sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \
nss>=3.17.1:${PORTSDIR}/security/nss \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
@@ -34,7 +35,6 @@
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
FETCH_ENV= SSL_CA_CERT_FILE=${LOCALBASE}/share/certs/ca-root-nss.crt
-USE_AUTOTOOLS= autoconf213:env
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
CPE_VERSION= ${PORTVERSION:R}
@@ -116,8 +116,8 @@
.if ! ${PORT_OPTIONS:MMACH}
pre-configure:
- (cd ${WRKSRC} && ${AUTOCONF})
- (cd ${WRKSRC}/js/src/ && ${AUTOCONF})
+ (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+ (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
.else
do-build:
cd ${WRKSRC} && MOZBUILD_STATE_PATH=${WRKDIR} \
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Fri Oct 10 06:10:11 2014 (r1721)
+++ trunk/www/firefox/Makefile Sat Oct 11 14:31:52 2014 (r1722)
@@ -1,5 +1,5 @@
# Created by: Alan Eldridge <[email protected]>
-# $FreeBSD: head/www/firefox/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/firefox/Makefile 369730 2014-10-01 15:07:31Z tijl $
PORTNAME= firefox
DISTVERSION= 33.0
@@ -25,12 +25,12 @@
sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
-USE_AUTOTOOLS= autoconf213:env
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
CONFLICTS= firefox-esr-31.* firefox-esr-24.* firefox-esr-17.*
@@ -96,8 +96,8 @@
${WRKSRC}/browser/app/nsBrowserApp.cpp
pre-configure:
- (cd ${WRKSRC} && ${AUTOCONF})
- (cd ${WRKSRC}/js/src/ && ${AUTOCONF})
+ (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+ (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Fri Oct 10 06:10:11 2014 (r1721)
+++ trunk/www/libxul/Makefile Sat Oct 11 14:31:52 2014 (r1722)
@@ -1,5 +1,5 @@
# Created by: Michael Johnson <[email protected]>
-# $FreeBSD: head/www/libxul/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/libxul/Makefile 369730 2014-10-01 15:07:31Z tijl $
PORTNAME= libxul
DISTVERSION= 31.2.0
@@ -23,6 +23,7 @@
sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
@@ -31,7 +32,6 @@
WRKSRC= ${WRKDIR}/mozilla-esr31
CONFLICTS= libxul-1.9.*
-USE_AUTOTOOLS= autoconf213:env
WANT_GNOME= yes
USE_QT5= # empty
QT_NONSTANDARD= yes
@@ -97,8 +97,8 @@
${WRKSRC}/xulrunner/stub/nsXULStub.cpp
pre-configure:
- (cd ${WRKSRC} && ${AUTOCONF})
- (cd ${WRKSRC}/js/src/ && ${AUTOCONF})
+ (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+ (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
post-build:
@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1
-Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2| ; \
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Fri Oct 10 06:10:11 2014 (r1721)
+++ trunk/www/seamonkey/Makefile Sat Oct 11 14:31:52 2014 (r1722)
@@ -1,5 +1,5 @@
# Created by: eivind/dima/jseger
-# $FreeBSD: head/www/seamonkey/Makefile 369237 2014-09-25 11:08:06Z beat $
+# $FreeBSD: head/www/seamonkey/Makefile 369730 2014-10-01 15:07:31Z tijl $
PORTNAME= seamonkey
DISTVERSION= 2.30b1
@@ -25,6 +25,7 @@
sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
+ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
@@ -34,7 +35,6 @@
L_VERSION= 3.5
SSP_UNSAFE= yes
-USE_AUTOTOOLS= autoconf213:env
OBJDIR_BUILD= # in-tree build broken after bug 789837
USE_GECKO= gecko
WANT_GNOME= yes
@@ -177,9 +177,9 @@
.endif
pre-configure:
- (cd ${WRKSRC} && ${AUTOCONF})
- (cd ${MOZSRC} && ${AUTOCONF})
- (cd ${MOZSRC}/js/src/ && ${AUTOCONF})
+ (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+ (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+ (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13)
.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL}
post-configure:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
