Hi,

i had quite some issues working on those lately (usual build boxes are
crashed with dead disks since a month), so no time to actually test betas.
I now need to build gecko 33 against systemwide icu to workaround
https://bugzilla.mozilla.org/show_bug.cgi?id=1064665, but at least that
shrinks the libraries/packages by some megs. While here, build seamonkey
against gstreamer1 instead of 0.10.

As usual, grab the port from here:
http://cgit.rhaalovely.net/mozilla-firefox/?h=release
git clone -b release http://git.rhaalovely.net/git/mozilla-firefox

http://cgit.rhaalovely.net/mozilla-thunderbird/?h=release
git clone -b release http://git.rhaalovely.net/git/mozilla-thunderbird

http://cgit.rhaalovely.net/seamonkey/?h=release
git clone -b release http://git.rhaalovely.net/git/seamonkey

If you already have a clone, update its url to use git.rhaalovely.net
instead of rhaalovely.net.

You'll also need the mozilla.port.mk diff attached, to properly depend
on the latest nss/nspr/sqlite release - and to handle 'rc' in
MOZILLA_VERSION variable, for a better naming of pkgnames and
master_sites.

All versions seem to run for me on amd64. I will probably commit those
tmrw or thursday, so please test those properly.

Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/firefox-esr/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    2 Sep 2014 16:36:52 -0000       1.12
+++ Makefile    14 Oct 2014 15:52:43 -0000
@@ -2,12 +2,11 @@
 
 COMMENT =      Firefox web browser, Extended Support Release
 
-MOZILLA_VERSION =      31.1.0esr
+MOZILLA_VERSION =      31.2.0esrrc3
 MOZILLA_BRANCH =       esr31
 MOZILLA_PROJECT =      firefox
 MOZILLA_CODENAME =     browser
 
-#MASTER_SITES= 
ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build1/source/
 PKGNAME =      ${MOZILLA_PROJECT}-esr-${MOZILLA_VERSION:S/esr//}
 SO_VERSION =   1.0
 MOZILLA_LIBS = browsercomps mozalloc mozgnome xul
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/firefox-esr/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo    2 Sep 2014 16:36:52 -0000       1.8
+++ distinfo    14 Oct 2014 15:52:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (mozilla/firefox-31.1.0esr.source.tar.bz2) = 
IJwmZnV8j/65uBOfJKW/2mX9UseM5h4wDjVHYkvEKn4=
-SIZE (mozilla/firefox-31.1.0esr.source.tar.bz2) = 147741041
+SHA256 (mozilla/firefox-31.2.0esr.source.tar.bz2) = 
At45nL9GfqU2BCAI0eDNSsb/3JtGnTGJOE8C7AWQ03g=
+SIZE (mozilla/firefox-31.2.0esr.source.tar.bz2) = 147362334
Index: mozilla.port.mk
===================================================================
RCS file: /cvs/ports/www/mozilla/mozilla.port.mk,v
retrieving revision 1.71
diff -u -r1.71 mozilla.port.mk
--- mozilla.port.mk     24 Jul 2014 17:57:42 -0000      1.71
+++ mozilla.port.mk     14 Oct 2014 15:52:16 -0000
@@ -19,15 +19,20 @@
 MAINTAINER ?=  Landry Breuil <lan...@openbsd.org>
 
 MOZILLA_DIST ?=        ${MOZILLA_PROJECT}
-MOZILLA_DIST_VERSION ?=        ${MOZILLA_VERSION}
+MOZILLA_DIST_VERSION ?=        ${MOZILLA_VERSION:C/rc.//}
 
 HOMEPAGE ?=    http://www.mozilla.org/projects/${MOZILLA_DIST}
 
+.if ${MOZILLA_VERSION:M*rc?}
+MASTER_SITES ?=        
ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_DIST}/nightly/${MOZILLA_DIST_VERSION}-candidates/build${MOZILLA_VERSION:C/.*(.)/\1/}/source/
 # first is the CDN and only has last releases
 # ftp.m.o has all the betas/candidate builds but should only be used as 
fallback
+.else
 MASTER_SITES ?=        
http://releases.mozilla.org/pub/mozilla.org/${MOZILLA_DIST}/releases/${MOZILLA_DIST_VERSION}/source/
 \
                
https://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_DIST}/releases/${MOZILLA_DIST_VERSION}/source/
 \
                
ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_DIST}/releases/${MOZILLA_DIST_VERSION}/source/
+.endif
+
 DISTNAME ?=    ${MOZILLA_DIST}-${MOZILLA_DIST_VERSION}.source
 EXTRACT_SUFX ?=        .tar.bz2
 DIST_SUBDIR ?= mozilla
@@ -38,8 +43,8 @@
                        archivers/zip>=2.3
 
 MODMOZ_LIB_DEPENDS =   textproc/hunspell \
-                       devel/nspr>=4.10.6 \
-                       security/nss>=3.16.2
+                       devel/nspr>=4.10.7 \
+                       security/nss>=3.17.2
 
 # bug #736961
 SEPARATE_BUILD =       Yes
@@ -53,7 +58,7 @@
                fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
                gobject-2.0 gthread-2.0 m \
                nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-               plc4 plds4 pthread event kvm sqlite3>=27 \
+               plc4 plds4 pthread event kvm sqlite3>=28 \
                smime3 sndio nssutil3 ssl3 stdc++ z hunspell-1.3
 
 # hack to build against systemwide sqlite3 (# 546162)
@@ -136,7 +141,7 @@
 .endif
 
 # needed for PLIST
-MOZILLA_VER =  ${MOZILLA_VERSION:C/b.$//:C/esr$//}
+MOZILLA_VER =  ${MOZILLA_VERSION:C/b.$//:C/esr$//:C/rc.$//}
 SUBST_VARS +=  MOZILLA_PROJECT MOZILLA_VER MOZILLA_VERSION
 
 MAKE_ENV +=    MOZILLA_OFFICIAL=1 \

Reply via email to