security update to 2.0.0.4 plus some minor things, like consistify
COMMENT w/ firefox, move MESSAGE/part of DESCR to README.OpenBSD, wantlib for xenocara http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.4 ok kurt@, naddy@
This commit is contained in:
martynas
parent
e543e41802
commit
7ae584e391
@ -1,13 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.56 2007/06/13 12:06:59 martynas Exp $
|
||||
# $OpenBSD: Makefile,v 1.57 2007/06/22 18:51:30 martynas Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
|
||||
|
||||
COMMENT= "redesign of the integrated Mozilla App-Suite mail component"
|
||||
COMMENT= "redesign of Mozilla's mail component"
|
||||
|
||||
VER= 2.0.0.0
|
||||
VER= 2.0.0.4
|
||||
DISTNAME= mozilla
|
||||
PKGNAME= mozilla-thunderbird-${VER}p0
|
||||
PKGNAME= mozilla-thunderbird-${VER}
|
||||
SO_VERSION= 13.0
|
||||
# NOTE: Must bump minor version if any shlib's are removed from the
|
||||
# components dir to avoid pkg_add -r issues. Whenever PKGNAME gets
|
||||
@ -31,16 +31,16 @@ CATEGORIES= mail news
|
||||
|
||||
HOMEPAGE= http://www.mozilla.org/projects/thunderbird/
|
||||
|
||||
# mozilla public license
|
||||
# MPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= X11 Xau Xdmcp Xft Xrender Xinerama Xt c expat \
|
||||
fontconfig freetype m pthread z \
|
||||
atk-1.0 cairo glib-2.0 gmodule-2.0 gobject-2.0 glitz \
|
||||
jpeg pango-1.0 pangoft2-1.0 pangocairo-1.0 pangox-1.0 \
|
||||
png stdc++
|
||||
WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi Xinerama \
|
||||
Xrandr Xrender Xt atk-1.0 c cairo expat fontconfig \
|
||||
freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
|
||||
jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
|
||||
pangox-1.0 png pthread stdc++ z
|
||||
|
||||
MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${VER}/source/
|
||||
DISTFILES= thunderbird-${VER}-source.tar.bz2
|
||||
@ -87,10 +87,8 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \
|
||||
--enable-svg-renderer=cairo \
|
||||
--enable-system-cairo \
|
||||
--enable-canvas \
|
||||
--enable-official-branding
|
||||
|
||||
# from mail/config/mozconfig
|
||||
CONFIGURE_ARGS+=--enable-application=mail
|
||||
--enable-official-branding \
|
||||
--enable-application=mail
|
||||
|
||||
MAKE_ENV= MOZ_CO_PROJECT=mail \
|
||||
LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
|
||||
@ -121,12 +119,11 @@ pre-configure:
|
||||
do-install:
|
||||
@cd ${MOB} && \
|
||||
find ${DATADIRS} -type d \
|
||||
-exec ${INSTALL_DATA_DIR} ${MOZ}/{} \;
|
||||
@cd ${MOB} && \
|
||||
-exec ${INSTALL_DATA_DIR} ${MOZ}/{} \; && \
|
||||
find ${DATADIRS} ! -type d \
|
||||
-exec ${INSTALL_DATA} -m 644 {} ${MOZ}/{} \;
|
||||
${INSTALL_DATA} ${MOB}/*.so.${SO_VERSION} ${MOZ}
|
||||
${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ}
|
||||
${INSTALL_DATA} ${MOB}/*.so.${SO_VERSION} \
|
||||
${WRKSRC}/LICENSE ${MOZ}
|
||||
${INSTALL_SCRIPT} ${MOB}/thunderbird \
|
||||
${MOB}/thunderbird-config ${PREFIX}/bin/
|
||||
ln -f ${PREFIX}/bin/thunderbird ${PREFIX}/bin/mozilla-thunderbird
|
||||
@ -135,5 +132,7 @@ do-install:
|
||||
${MOB}/thunderbird-bin \
|
||||
${MOB}/mozilla-xremote-client ${MOZ}
|
||||
ln -f ${MOZ}/thunderbird-bin ${MOZ}/mozilla-thunderbird-bin
|
||||
@sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' \
|
||||
< ${FILESDIR}/README.OpenBSD > ${MOZ}/README.OpenBSD
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (thunderbird-2.0.0.0-source.tar.bz2) = jmctn5IG4OHwN5Day1Hhuw==
|
||||
RMD160 (thunderbird-2.0.0.0-source.tar.bz2) = 5gWqqxalLtG90o7AtCNUmaplSas=
|
||||
SHA1 (thunderbird-2.0.0.0-source.tar.bz2) = HEnrQNKJpn9Wv6Vz50PO1sFJ3RY=
|
||||
SHA256 (thunderbird-2.0.0.0-source.tar.bz2) = yy9epElSFDjPZo/4zybM6Vjlq0VGhtPOVqSOAR2Noes=
|
||||
SIZE (thunderbird-2.0.0.0-source.tar.bz2) = 37379868
|
||||
MD5 (thunderbird-2.0.0.4-source.tar.bz2) = Js3z4sjZVCE0Wvjojrya/w==
|
||||
RMD160 (thunderbird-2.0.0.4-source.tar.bz2) = q506Cna/xpJIxDmKRIIzT9sIuY8=
|
||||
SHA1 (thunderbird-2.0.0.4-source.tar.bz2) = 6tlk1GRE7mndOSyVlqCyt70sLXs=
|
||||
SHA256 (thunderbird-2.0.0.4-source.tar.bz2) = Ys87kjgYSpdWMjZ2t2O2wP4xLbv8QELmSTCvDkZxCno=
|
||||
SIZE (thunderbird-2.0.0.4-source.tar.bz2) = 37391875
|
||||
|
||||
21
mail/mozilla-thunderbird/files/README.OpenBSD
Normal file
21
mail/mozilla-thunderbird/files/README.OpenBSD
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: README.OpenBSD,v 1.1 2007/06/22 18:51:30 martynas Exp $
|
||||
|
||||
If you encounter strange problems or Thunderbird doesn't start at
|
||||
all, try the -safe-mode switch.
|
||||
|
||||
To disable anti-aliasing (xft) set GDK_USE_XFT=0 in the environment.
|
||||
|
||||
Links
|
||||
|
||||
To make Thunderbird open links using Firefox, shut down Thunderbird
|
||||
and add these lines to ~/.thunderbird/<something>.default/prefs.js:
|
||||
|
||||
user_pref("network.protocol-handler.app.ftp", "!!PREFIX!!/bin/firefox");
|
||||
user_pref("network.protocol-handler.app.http", "!!PREFIX!!/bin/firefox");
|
||||
user_pref("network.protocol-handler.app.https", "!!PREFIX!!/bin/firefox");
|
||||
|
||||
Plugins
|
||||
|
||||
Thunderbird looks for plugins in ~/.mozilla/plugins
|
||||
${LOCALBASE}/mozilla-thunderbird/plugins and
|
||||
${LOCALBASE}/lib/mozilla-plugins.
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure_in,v 1.11 2007/04/30 22:40:31 martynas Exp $
|
||||
--- configure.in.orig Fri Sep 15 16:13:01 2006
|
||||
+++ configure.in Fri Nov 3 22:36:05 2006
|
||||
@@ -1931,7 +1931,7 @@ case "$target" in
|
||||
$OpenBSD: patch-configure_in,v 1.12 2007/06/22 18:51:30 martynas Exp $
|
||||
--- configure.in.orig Tue Apr 3 18:40:02 2007
|
||||
+++ configure.in Fri Jun 15 11:49:34 2007
|
||||
@@ -1974,7 +1974,7 @@ case "$target" in
|
||||
;;
|
||||
|
||||
*-openbsd*)
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.11 2007/04/30 22:40:31 martynas Exp $
|
||||
DSO_CFLAGS=''
|
||||
DSO_PIC_CFLAGS='-fPIC'
|
||||
DSO_LDOPTS='-shared -fPIC'
|
||||
@@ -3804,7 +3804,7 @@ _SAVE_LIBS=$LIBS
|
||||
@@ -3872,7 +3872,7 @@ _SAVE_LIBS=$LIBS
|
||||
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
|
||||
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
|
||||
if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.11 2007/04/30 22:40:31 martynas Exp $
|
||||
LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
|
||||
fi
|
||||
if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
|
||||
@@ -3834,7 +3834,7 @@ LDFLAGS=$_SAVE_LDFLAGS
|
||||
@@ -3902,7 +3902,7 @@ LDFLAGS=$_SAVE_LDFLAGS
|
||||
LIBS=$_SAVE_LIBS
|
||||
|
||||
if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.3 2007/04/30 22:40:31 martynas Exp $
|
||||
--- modules/plugin/base/public/nptypes.h.orig Thu May 19 23:49:42 2005
|
||||
+++ modules/plugin/base/public/nptypes.h Sat Sep 10 09:27:13 2005
|
||||
@@ -67,10 +67,8 @@
|
||||
|
||||
/*
|
||||
* BSD/OS ships no header that defines uint32_t, nor bool (for C)
|
||||
- * OpenBSD ships no header that defines uint32_t and using its bool macro is
|
||||
- * unsafe.
|
||||
*/
|
||||
- #if defined(bsdi) || defined(OPENBSD)
|
||||
+ #if defined(bsdi)
|
||||
typedef u_int32_t uint32_t;
|
||||
|
||||
#if !defined(__cplusplus)
|
||||
@@ -78,7 +76,7 @@
|
||||
#endif
|
||||
#else
|
||||
/*
|
||||
- * FreeBSD defines uint32_t and bool.
|
||||
+ * FreeBSD and OpenBSD define uint32_t and bool.
|
||||
*/
|
||||
#include <inttypes.h>
|
||||
#include <stdbool.h>
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h,v 1.2 2007/04/30 22:40:31 martynas Exp $
|
||||
--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig Thu Feb 23 21:37:11 2006
|
||||
+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Sun Feb 18 11:28:45 2007
|
||||
@@ -107,12 +107,16 @@
|
||||
#define THUNK_BASED_THIS_ADJUST
|
||||
|
||||
#elif defined(__OpenBSD__)
|
||||
-/* OpenBSD instroduces GCC 2.95.x in late May 1999 */
|
||||
+#if __GNUC__ >= 3
|
||||
+#define THUNK_BASED_THIS_ADJUST
|
||||
+#else
|
||||
+/* OpenBSD introduces GCC 2.95.x in late May 1999 */
|
||||
#include <sys/param.h>
|
||||
#if OpenBSD <= 199905
|
||||
#define THUNK_BASED_THIS_ADJUST
|
||||
#else
|
||||
#define CFRONT_STYLE_THIS_ADJUST
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
#elif defined(__bsdi__)
|
||||
@ -2,10 +2,3 @@ Mozilla Thunderbird is a redesign of the integrated Mozilla App-Suite
|
||||
mail component. Its goal is to leverage much of the existing
|
||||
functionality of that product to produce a stand-alone mail application
|
||||
that is simple and extensible.
|
||||
|
||||
Thunderbird looks for plugins in ~/.mozilla/plugins
|
||||
${LOCALBASE}/mozilla-thunderbird/plugins
|
||||
and ${LOCALBASE}/lib/mozilla-plugins.
|
||||
|
||||
To disable anti-aliasing (xft) altogether set GDK_USE_XFT=0 in the
|
||||
environment.
|
||||
|
||||
@ -1,9 +1,2 @@
|
||||
If you encounter strange problems or thunderbird doesn't start at
|
||||
all, try the -safe-mode switch.
|
||||
|
||||
To make Thunderbird open links using Firefox, shut down Thunderbird
|
||||
and add these lines to ~/.thunderbird/<something>.default/prefs.js:
|
||||
|
||||
user_pref("network.protocol-handler.app.ftp", "${PREFIX}/bin/firefox");
|
||||
user_pref("network.protocol-handler.app.http", "${PREFIX}/bin/firefox");
|
||||
user_pref("network.protocol-handler.app.https", "${PREFIX}/bin/firefox");
|
||||
Please see ${PREFIX}/mozilla-thunderbird/README.OpenBSD for information
|
||||
about running Firefox on OpenBSD.
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2007/04/30 22:40:31 martynas Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.11 2007/06/22 18:51:30 martynas Exp $
|
||||
%%SHARED%%
|
||||
bin/mozilla-thunderbird
|
||||
bin/thunderbird
|
||||
bin/thunderbird-config
|
||||
mozilla-thunderbird/
|
||||
mozilla-thunderbird/LICENSE
|
||||
mozilla-thunderbird/README.OpenBSD
|
||||
mozilla-thunderbird/chrome/
|
||||
mozilla-thunderbird/chrome/US.jar
|
||||
mozilla-thunderbird/chrome/chromelist.txt
|
||||
|
||||
Loading…
Reference in New Issue
Block a user