Winter cleanup of the mozillas :
- Add gtar to BUILD_DEPENDS everywhere in moz.port.mk, since fx 18 will start using gtar-only options. Ditto for unzip, used during install. - special-case the deps for firefox/thunderbird/seamonkey, since those are maintained on the long-term. Only those need to depend on the latest and greatest nss/nspr. - move the '--relax LDFLAGS for ppc' to moz.port.mk - move the 'yasm BUILD_DEPENDS for i385/amd64' to moz.port.mk - move more common CONFIGURE_ARGS to moz.port.mk (libevent,gio,bz2,gconf..) - fix MODMOZ_WANTLIB wrt nss/nspr majors - ensure we depend on sqlite3>=21, needed for fx/tb 18 - use --with-system-jpeg only in firefox36/sunbird/fennec/xulrunner, fx/tb 18 will have to use its bundled libjpeg-turbo (#791305) - bump REVISIONs for the WANTLIB/LIB_DEPENDS change.
This commit is contained in:
landry
parent
2ab5ea23e4
commit
2f3c1d8abb
@ -1,12 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.66 2012/11/12 20:45:32 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.67 2012/12/04 21:05:30 landry Exp $
|
||||
|
||||
MOZILLA_VERSION = 1.9.2.28
|
||||
MOZILLA_BRANCH = 1.9.2
|
||||
MOZILLA_PROJECT = xulrunner1.9
|
||||
MOZILLA_DIST = firefox
|
||||
MOZILLA_DIST_VERSION = 3.6.28
|
||||
REVISION-devel = 2
|
||||
REVISION-main = 5
|
||||
REVISION-devel = 3
|
||||
REVISION-main = 6
|
||||
|
||||
SO_VERSION = 3.2
|
||||
# NOTE: Must bump minor version if any shlib's are removed from the
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.23 2012/04/07 13:10:50 landry Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.24 2012/12/04 21:05:30 landry Exp $
|
||||
|
||||
COMMENT-main = standalone XUL/XPCOM runtime environment
|
||||
COMMENT-devel = devel files for Gecko
|
||||
@ -30,7 +30,7 @@ LIB_DEPENDS-devel = ${MODGETTEXT_LIB_DEPENDS} \
|
||||
devel/libIDL \
|
||||
${PKGNAME-main}:${BASE_PKGPATH},-main
|
||||
WANTLIB-devel += ${MODGETTEXT_WANTLIB} \
|
||||
c glib-2.0 gobject-2.0 gthread-2.0 m pthread stdc++ \
|
||||
c glib-2.0 gobject-2.0 m pthread stdc++ \
|
||||
IDL-2 nspr4 plc4 plds4
|
||||
|
||||
MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/build/autoconf
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.47 2012/11/12 20:45:32 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.48 2012/12/04 21:05:30 landry Exp $
|
||||
|
||||
COMMENT = Mozilla calendar
|
||||
|
||||
@ -10,7 +10,7 @@ MOZILLA_BRANCH = 1.9.2
|
||||
MOZILLA_CODENAME = calendar
|
||||
|
||||
EPOCH = 0
|
||||
REVISION = 22
|
||||
REVISION = 23
|
||||
|
||||
HOMEPAGE = http://www.mozilla.org/projects/calendar/sunbird/
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2012/11/12 20:45:32 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2012/12/04 21:05:30 landry Exp $
|
||||
|
||||
COMMENT = Mozilla mobile web browser
|
||||
|
||||
@ -7,7 +7,7 @@ MOZILLA_BRANCH = esr10
|
||||
MOZILLA_PROJECT = fennec
|
||||
MOZILLA_CODENAME = mobile
|
||||
PKGNAME = ${MOZILLA_PROJECT}-${MOZILLA_VERSION:S/esr//}
|
||||
REVISION = 4
|
||||
REVISION = 5
|
||||
|
||||
SO_VERSION = 6.0
|
||||
# NOTE: Must bump minor version if any shlib's are removed from the
|
||||
@ -42,12 +42,6 @@ CONFIGURE_ARGS += --with-system-libevent=/usr/
|
||||
CONFIGURE_ARGS += --with-system-zlib=/usr/ --with-system-bz2=${LOCALBASE}
|
||||
WANTLIB += event
|
||||
|
||||
.if ${MACHINE_ARCH:Msparc64}
|
||||
CONFIGURE_ARGS += --disable-tracejit --disable-methodjit
|
||||
.endif
|
||||
|
||||
# ensure we depend on cairo with tee backend enabled
|
||||
LIB_DEPENDS = graphics/cairo>=1.10.2p0
|
||||
# --with-system-png=${LOCALBASE}
|
||||
# no system png : apng support not bundled in
|
||||
|
||||
@ -56,8 +50,6 @@ MOZILLA_SUBST_FILES += config/autoconf.mk.in services/crypto/modules/WeaveCrypt
|
||||
|
||||
SUBST_VARS += MOZILLA_VERSION NSS_SO_VERSION
|
||||
|
||||
# package target uses gtar options
|
||||
BUILD_DEPENDS += archivers/gtar
|
||||
INSTALL_TARGET = package
|
||||
|
||||
# unzip used during install
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.29 2012/11/12 20:45:32 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.30 2012/12/04 21:05:30 landry Exp $
|
||||
|
||||
COMMENT = Mozilla web browser
|
||||
|
||||
# Don't forget to update devel/xulrunner/1.9 if patches changes.
|
||||
|
||||
MOZILLA_VERSION = 3.6.28
|
||||
REVISION = 7
|
||||
REVISION = 8
|
||||
MOZILLA_BRANCH = 1.9.2
|
||||
MOZILLA_PROJECT = firefox36
|
||||
MOZILLA_DIST = firefox
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: mozilla.port.mk,v 1.48 2012/11/12 20:45:32 landry Exp $
|
||||
# $OpenBSD: mozilla.port.mk,v 1.49 2012/12/04 21:05:29 landry Exp $
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc64
|
||||
@ -27,28 +27,63 @@ DIST_SUBDIR ?= mozilla
|
||||
|
||||
MODMOZ_RUN_DEPENDS = devel/desktop-file-utils
|
||||
MODMOZ_BUILD_DEPENDS = devel/libIDL \
|
||||
archivers/gtar \
|
||||
archivers/zip>=2.3
|
||||
|
||||
MODMOZ_LIB_DEPENDS = x11/gtk+2 \
|
||||
devel/nspr>=4.9.3 \
|
||||
security/nss>=3.14
|
||||
MODMOZ_LIB_DEPENDS = x11/gtk+2
|
||||
|
||||
MODMOZ_WANTLIB = X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \
|
||||
# special case the long-term maintained mozillas
|
||||
.if ${MOZILLA_PROJECT} == "firefox" || \
|
||||
${MOZILLA_PROJECT} == "thunderbird" || \
|
||||
${MOZILLA_PROJECT} == "seamonkey"
|
||||
MODMOZ_LIB_DEPENDS += devel/nspr>=4.9.3 \
|
||||
security/nss>=3.14
|
||||
# needed during install
|
||||
MODMOZ_BUILD_DEPENDS += archivers/unzip
|
||||
|
||||
# bug #736961
|
||||
SEPARATE_BUILD = Yes
|
||||
|
||||
# needed for webm
|
||||
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
|
||||
MODMOZ_BUILD_DEPENDS += devel/yasm
|
||||
.endif
|
||||
|
||||
CONFIGURE_ARGS += --enable-official-branding
|
||||
CONFIGURE_ARGS += --disable-gconf
|
||||
CONFIGURE_ARGS += --enable-gio
|
||||
CONFIGURE_ARGS += --with-system-libevent=/usr/
|
||||
CONFIGURE_ARGS += --with-system-bz2=${LOCALBASE}
|
||||
MODMOZ_WANTLIB += event
|
||||
.else
|
||||
# for old mozillas : fennec, sunbird, firefox36, xulrunner
|
||||
MODMOZ_LIB_DEPENDS += devel/nspr \
|
||||
security/nss
|
||||
CONFIGURE_ARGS += --with-system-jpeg=${LOCALBASE}
|
||||
MODMOZ_WANTLIB += jpeg
|
||||
.endif
|
||||
|
||||
MODMOZ_WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi \
|
||||
Xinerama Xrandr Xrender Xt atk-1.0 c cairo crypto expat \
|
||||
fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
|
||||
gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg krb5 m \
|
||||
nspr4>=21 nss3>=25 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
|
||||
pixman-1 plc4>=21 plds4>=21 png pthread pthread-stubs \
|
||||
smime3>=25 sndio softokn3>=25 ssl3>=25 stdc++ xcb \
|
||||
gobject-2.0 gthread-2.0 gtk-x11-2.0 krb5 m \
|
||||
nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
|
||||
pixman-1 plc4 plds4 png pthread pthread-stubs \
|
||||
smime3 sndio nssutil3 ssl3 stdc++ xcb \
|
||||
xcb-render GL xcb-shm z
|
||||
|
||||
# for all mozilla ports, build against systemwide sqlite3
|
||||
MODMOZ_WANTLIB += sqlite3
|
||||
MODMOZ_WANTLIB += sqlite3>=21
|
||||
CONFIGURE_ARGS += --enable-system-sqlite
|
||||
CONFIGURE_ENV += ac_cv_sqlite_secure_delete=yes
|
||||
|
||||
# avoids OOM when linking libxul
|
||||
# --no-keep-memory avoids OOM when linking libxul
|
||||
# --relax avoids relocation overflow on ppc, needed since sm 2.7b, tb 10.0b, fx 15.0b
|
||||
.if ${MACHINE_ARCH} == "powerpc"
|
||||
CONFIGURE_ENV += LDFLAGS="-Wl,--no-keep-memory -Wl,--relax"
|
||||
.else
|
||||
CONFIGURE_ENV += LDFLAGS="-Wl,--no-keep-memory"
|
||||
.endif
|
||||
|
||||
WANTLIB += ${MODMOZ_WANTLIB}
|
||||
BUILD_DEPENDS +=${MODMOZ_BUILD_DEPENDS}
|
||||
@ -59,8 +94,7 @@ VMEM_WARNING ?= Yes
|
||||
USE_GMAKE ?= Yes
|
||||
|
||||
AUTOCONF_VERSION = 2.13
|
||||
CONFIGURE_ARGS +=--with-system-jpeg=${LOCALBASE} \
|
||||
--with-system-zlib=/usr \
|
||||
CONFIGURE_ARGS += --with-system-zlib=/usr \
|
||||
--with-system-nspr \
|
||||
--with-system-nss \
|
||||
--with-pthreads \
|
||||
@ -78,6 +112,8 @@ CONFIGURE_ARGS +=--with-system-jpeg=${LOCALBASE} \
|
||||
--enable-svg-renderer=cairo \
|
||||
--enable-canvas
|
||||
|
||||
# no --with-system-jpeg starting with fx 18, requires libjpeg-turbo because of bug 791305
|
||||
|
||||
# for mozilla branches 1.9.2 and 2.x.x, build against systemwide cairo
|
||||
.if ${MOZILLA_BRANCH} != 1.9.1
|
||||
CONFIGURE_ARGS +=--enable-system-cairo
|
||||
|
||||
Loading…
Reference in New Issue
Block a user