aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.gecko.mk
diff options
context:
space:
mode:
authorBeat Gaetzi <beat@FreeBSD.org>2015-01-14 08:06:43 +0000
committerBeat Gaetzi <beat@FreeBSD.org>2015-01-14 08:06:43 +0000
commit7483da328d17b5d766e5b026b06266e1ac09a580 (patch)
tree765357df2fbaa48356ce21607d5cc39741229da2 /Mk/bsd.gecko.mk
parent6cbf8fb6e3a10b9c46c448ba239a71c682221ac7 (diff)
downloadports-7483da328d17b5d766e5b026b06266e1ac09a580.tar.gz
ports-7483da328d17b5d766e5b026b06266e1ac09a580.zip
- Update openh264 to 1.3.1
- Update Thunderbird to 31.4.0 - Update Firefox to 35.0 - Update Firefox ESR to 31.4.0 - Update libxul to 31.4.0 Submitted by: Jan Beich MFH: 2015Q1 Security: http://www.vuxml.org/freebsd/bd62c640-9bb9-11e4-a5ad-000c297fb80f.html
Notes
Notes: svn path=/head/; revision=376999
Diffstat (limited to 'Mk/bsd.gecko.mk')
-rw-r--r--Mk/bsd.gecko.mk20
1 files changed, 7 insertions, 13 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index c4fc4f09b811..863e4a5edb3f 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -91,6 +91,10 @@ CPE_VENDOR?=mozilla
USE_PERL5= build
USE_XORG= xext xrender xt
+.if ${MOZILLA} != "libxul"
+BUNDLE_LIBS= yes
+.endif
+
MOZILLA_SUFX?= none
MOZSRC?= ${WRKSRC}
WRKSRC?= ${WRKDIR}/mozilla
@@ -126,7 +130,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZILLA}
# use jemalloc 3.0.0 API for stats/tuning
MOZ_EXPORT+= MOZ_JEMALLOC3=1
-.if ${OSVERSION} < 1000012
+.if ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
MOZ_OPTIONS+= --enable-jemalloc
.endif
@@ -318,15 +322,6 @@ MOZ_OPTIONS+= --enable-gnomeui
MOZ_OPTIONS+= --disable-gnomeui
.endif
-.if ${PORT_OPTIONS:MGNOMEVFS2}
-BUILD_DEPENDS+= ${gnomevfs2_DETECT}:${gnomevfs2_LIB_DEPENDS:C/.*://}
-USE_GNOME+= gnomevfs2:build
-MOZ_OPTIONS+= --enable-gnomevfs
-MOZ_OPTIONS:= ${MOZ_OPTIONS:C/(extensions)=(.*)/\1=\2,gnomevfs/}
-.else
-MOZ_OPTIONS+= --disable-gnomevfs
-.endif
-
.if ${PORT_OPTIONS:MLIBPROXY}
LIB_DEPENDS+= libproxy.so:${PORTSDIR}/net/libproxy
MOZ_OPTIONS+= --enable-libproxy
@@ -534,10 +529,9 @@ gecko-post-patch:
@if [ -f ${WRKSRC}/config/baseconfig.mk ] ; then \
${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
${WRKSRC}/config/baseconfig.mk; \
- else \
- ${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
- ${WRKSRC}/config/autoconf.mk.in; \
fi
+ @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
+ ${MOZSRC}/config/baseconfig.mk
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
${MOZSRC}/build/unix/run-mozilla.sh