cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump REVISION-main after the moz.port.mk changes, tb wont see a 17.0.1

Browse Source 
for this cycle. Readd the --with-system-jpeg locally (to remove in 18),
and remove all the configure_env/args/build_depends stuff that moved to
moz.port.mk.
Shrinks Makefile by 18 lines.
This commit is contained in:
landry 2012-12-04 21:13:32 +00:00
parent d1a495aa58
commit 99802081a2
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.163 2012/11/24 10:32:41 landry Exp $
# $OpenBSD: Makefile,v 1.164 2012/12/04 21:13:32 landry Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
@ -6,7 +6,6 @@ COMMENT-enigmail = Mozilla Thunderbird GnuPG extension
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
# Don't forget to bump mail/thunderbird-i18n after updates.
# Don't forget to update productivity/sunbird if patches changes.
MOZILLA_VERSION = 17.0
MOZILLA_BRANCH = release
@ -20,6 +19,7 @@ ENIG_V = 1.4.6
PKGNAME-enigmail = enigmail-${ENIG_V}
EPOCH-lightning = 0
EPOCH-enigmail = 0
REVISION-main = 0
#MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build1/source/
MASTER_SITES0 = http://www.mozilla-enigmail.org/download/source/
@ -55,40 +55,22 @@ NO_REGRESS = Yes
MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/ldap/sdks/c-sdk/config/autoconf
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS += --enable-official-branding
CONFIGURE_ARGS += --with-system-libevent=/usr/
CONFIGURE_ARGS += --with-system-bz2=${LOCALBASE}
WANTLIB += event
# bug #736961
SEPARATE_BUILD = Yes
# XXX needed since 10.0b4, relocation overflow otherwise...
# replaces -g by -Os
.if ${MACHINE_ARCH} == "powerpc"
CONFIGURE_ENV += MOZ_DEBUG_FLAGS="-Os"
.endif
# needed for webm
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
BUILD_DEPENDS += devel/yasm
.endif
# to remove in 18
CONFIGURE_ARGS += --with-system-jpeg=${LOCALBASE}
WANTLIB += jpeg
LIB_DEPENDS-lightning = STEM->=${MOZILLA_VERSION:S/b/beta/}:${BUILD_PKGPATH},-main
WANTLIB-lightning = lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/xpcom \
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/xul \
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/mozalloc \
c m stdc++ nspr4 plc4 plds4 pthread
BUILD_DEPENDS += archivers/unzip #to unzip xpi
RUN_DEPENDS-enigmail = security/gnupg
LIB_DEPENDS-enigmail = ${LIB_DEPENDS-lightning}
WANTLIB-enigmail = ${WANTLIB-lightning}
# build lightning xpi
CONFIGURE_ARGS += --enable-calendar \
--enable-gio \
--disable-gconf
CONFIGURE_ARGS += --enable-calendar
ALL_TARGET = default
@ -122,6 +104,6 @@ post-install:
# install icon for desktop file
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
${INSTALL_DATA} ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default256.png \
${PREFIX}/share/pixmaps/thunderbird.png
${PREFIX}/share/pixmaps/${MOZILLA_PROJECT}.png
.include <bsd.port.mk>