Fri Jan 6 08:40:01 2012 UTC ()
Add yasm>=1.1.0 as a build dependence on platforms the need it.


(sbd)
diff -r1.78 -r1.79 pkgsrc/mail/thunderbird/Makefile
cvs diff -r1.78 -r1.79 pkgsrc/mail/thunderbird/Makefile (switch to unified diff)

--- pkgsrc/mail/thunderbird/Makefile 2011/12/05 13:20:36 1.78
+++ pkgsrc/mail/thunderbird/Makefile 2012/01/06 08:40:01 1.79
@@ -1,78 +1,85 @@ @@ -1,78 +1,85 @@
1# $NetBSD: Makefile,v 1.78 2011/12/05 13:20:36 dholland Exp $ 1# $NetBSD: Makefile,v 1.79 2012/01/06 08:40:01 sbd Exp $
2# 2#
3 3
4DISTNAME= thunderbird-${TB_VER}.source 4DISTNAME= thunderbird-${TB_VER}.source
5PKGNAME= thunderbird-${TB_VER} 5PKGNAME= thunderbird-${TB_VER}
6TB_VER= 8.0 6TB_VER= 8.0
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} 8MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= tnn@NetBSD.org 11MAINTAINER= tnn@NetBSD.org
12HOMEPAGE= http://www.mozillamessaging.com/en-US/thunderbird/ 12HOMEPAGE= http://www.mozillamessaging.com/en-US/thunderbird/
13COMMENT= Organize, secure and customize your mail 13COMMENT= Organize, secure and customize your mail
14 14
15USE_TOOLS+= unzip pax 15USE_TOOLS+= unzip pax
16WRKSRC= ${WRKDIR}/comm-release 16WRKSRC= ${WRKDIR}/comm-release
17MOZILLA_DIR= mozilla/ 17MOZILLA_DIR= mozilla/
18PLIST_SRC+= PLIST 18PLIST_SRC+= PLIST
19 19
20CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess 20CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess
21CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub 21CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub
22 22
23CONFIGURE_ARGS+= --enable-application=mail 23CONFIGURE_ARGS+= --enable-application=mail
24 24
25ALL_ENV+= MOZILLA_PKG_NAME=thunderbird 25ALL_ENV+= MOZILLA_PKG_NAME=thunderbird
26 26
 27.include "../../mk/bsd.prefs.mk"
 28
 29.if (${OPSYS} == "Linux" || ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin") && \
 30 (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
 31BUILD_DEPENDS+= yasm>=1.1.0:../../devel/yasm
 32.endif
 33
27#SUBST_CLASSES+= ext-compat 34#SUBST_CLASSES+= ext-compat
28#SUBST_STAGE.ext-compat= pre-configure 35#SUBST_STAGE.ext-compat= pre-configure
29#SUBST_MESSAGE.ext-compat= Fixing extension compatibility 36#SUBST_MESSAGE.ext-compat= Fixing extension compatibility
30#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf 37#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf
31#SUBST_FILES.ext-compat+= calendar/*/install.rdf 38#SUBST_FILES.ext-compat+= calendar/*/install.rdf
32#SUBST_FILES.ext-compat+= calendar/*/*/install.rdf 39#SUBST_FILES.ext-compat+= calendar/*/*/install.rdf
33#SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g' 40#SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g'
34 41
35pre-configure: 42pre-configure:
36 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf 43 cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoconf
37 cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf 44 cd ${WRKSRC}/mozilla && ${SETENV} ${CONFIGURE_ENV} autoconf
38 cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf 45 cd ${WRKSRC}/mozilla/js/src && ${SETENV} ${CONFIGURE_ENV} autoconf
39 cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${CONFIGURE_ENV} autoconf 46 cd ${WRKSRC}/mozilla/nsprpub && ${SETENV} ${CONFIGURE_ENV} autoconf
40 cd ${WRKSRC}/ldap/sdks/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf 47 cd ${WRKSRC}/ldap/sdks/c-sdk && ${SETENV} ${CONFIGURE_ENV} autoconf
41 48
42do-build: 49do-build:
43# XXX for some reason it doesn't work unless -j is explicitly specified 50# XXX for some reason it doesn't work unless -j is explicitly specified
44 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1} 51 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
45 52
46MOZILLA=thunderbird 53MOZILLA=thunderbird
47MOZILLA_NAME=Thunderbird 54MOZILLA_NAME=Thunderbird
48post-build: 55post-build:
49 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 56 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
50 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 57 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
51 -e 's|@MOZILLA_ICON@|${MOZILLA}.png|g' \ 58 -e 's|@MOZILLA_ICON@|${MOZILLA}.png|g' \
52 < ${FILESDIR}/desktop.in \ 59 < ${FILESDIR}/desktop.in \
53 > ${WRKDIR}/desktop 60 > ${WRKDIR}/desktop
54 61
55INSTALLATION_DIRS+= share/applications share/pixmaps 62INSTALLATION_DIRS+= share/applications share/pixmaps
56post-install: 63post-install:
57 ${INSTALL_DATA} ${WRKDIR}/desktop \ 64 ${INSTALL_DATA} ${WRKDIR}/desktop \
58 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 65 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
59 ${INSTALL_DATA} ${WRKSRC}/mozilla/dist/thunderbird/chrome/icons/default/default48.png \ 66 ${INSTALL_DATA} ${WRKSRC}/mozilla/dist/thunderbird/chrome/icons/default/default48.png \
60 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png 67 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
61 @${STEP_MSG} "Installing bundled thunderbird extensions." 68 @${STEP_MSG} "Installing bundled thunderbird extensions."
62 ${TOUCH} ${TOUCH_FLAGS} ${DESTDIR}${PREFIX}/include/thunderbird/mozilla/throw_gcc.h 69 ${TOUCH} ${TOUCH_FLAGS} ${DESTDIR}${PREFIX}/include/thunderbird/mozilla/throw_gcc.h
63 rm -rf ${WRKDIR}/extensions 70 rm -rf ${WRKDIR}/extensions
64 ${MKDIR} ${WRKDIR}/extensions 71 ${MKDIR} ${WRKDIR}/extensions
65 ${RUN} for e in ${XPI_FILES}; do \ 72 ${RUN} for e in ${XPI_FILES}; do \
66 subdir="`${UNZIP_CMD} -c "$$e" install.rdf | awk '/^ <em:id>/ {sub(".*<em:id>","");sub("</em:id>.*","");print;exit;}'`" && \ 73 subdir="`${UNZIP_CMD} -c "$$e" install.rdf | awk '/^ <em:id>/ {sub(".*<em:id>","");sub("</em:id>.*","");print;exit;}'`" && \
67 ${MKDIR} "${WRKDIR}/extensions/$$subdir" && \ 74 ${MKDIR} "${WRKDIR}/extensions/$$subdir" && \
68 cd "${WRKDIR}/extensions/$$subdir" && \ 75 cd "${WRKDIR}/extensions/$$subdir" && \
69 ${UNZIP_CMD} -aqo $$e; \ 76 ${UNZIP_CMD} -aqo $$e; \
70 done 77 done
71 cd ${WRKDIR}/extensions && pax -rw . \ 78 cd ${WRKDIR}/extensions && pax -rw . \
72 ${DESTDIR}${PREFIX}/lib/${MOZILLA}/extensions/. 79 ${DESTDIR}${PREFIX}/lib/${MOZILLA}/extensions/.
73 rm -rf ${WRKDIR}/extensions 80 rm -rf ${WRKDIR}/extensions
74 81
75.include "../../devel/xulrunner/mozilla-common.mk" 82.include "../../devel/xulrunner/mozilla-common.mk"
76.include "options.mk" 83.include "options.mk"
77.include "../../sysutils/desktop-file-utils/desktopdb.mk" 84.include "../../sysutils/desktop-file-utils/desktopdb.mk"
78.include "../../mk/bsd.pkg.mk" 85.include "../../mk/bsd.pkg.mk"