svn commit: r331532 - in head/www/seamonkey: . files

[Florian Smeets]

Author: flo
Date: Thu Oct 24 20:54:41 2013
New Revision: 331532
URL: http://svnweb.freebsd.org/changeset/ports/331532

Log:
  - update enigmail to 1.6
  - don't force gcc for i386 builds [1]
  
  Submitted by:	mi [1]

Deleted:
  head/www/seamonkey/files/extra-bug886095
  head/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
Modified:
  head/www/seamonkey/Makefile
  head/www/seamonkey/distinfo
  head/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in   (contents, props changed)

Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile	Thu Oct 24 20:45:09 2013	(r331531)
+++ head/www/seamonkey/Makefile	Thu Oct 24 20:54:41 2013	(r331532)
@@ -3,6 +3,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.21
+PORTREVISION=	1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
@@ -19,7 +20,7 @@ BUILD_DEPENDS=	nspr>=4.10:${PORTSDIR}/de
 		unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
-EM_VERSION=	1.5.2
+EM_VERSION=	1.6
 L_VERSION=	2.6b3
 
 USE_AUTOTOOLS=	autoconf213:env
@@ -84,10 +85,6 @@ MOZ_OPTIONS+=	--disable-ldap --disable-m
 .if ! ${PORT_OPTIONS:MLDAP}
 MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
 .else
-# libprldap60.so: Undefined symbol "PR_GetCurrentThread"
-. if ${ARCH} == i386
-USE_GCC?=	yes
-. endif
 MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
 .endif
 .if ${PORT_OPTIONS:MENIGMAIL}
@@ -102,8 +99,6 @@ EM_ID=		${PORTNAME}@mozilla-enigmail.org
 EM_ID_RFILES=	${XPI_LIBDIR}/${EM_ID}/install.rdf \
 		${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \
 		${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile
-EXTRA_PATCHES+=	${FILESDIR}/extra-bug886095
 .endif
 .endif
 

Modified: head/www/seamonkey/distinfo
==============================================================================
--- head/www/seamonkey/distinfo	Thu Oct 24 20:45:09 2013	(r331531)
+++ head/www/seamonkey/distinfo	Thu Oct 24 20:54:41 2013	(r331532)
@@ -1,4 +1,4 @@
 SHA256 (seamonkey-2.21.source.tar.bz2) = 1b15b1e6bc19477ff7dfc805dd3629566b0b5e94eca9638fe2f4b47c3a8d5ae9
 SIZE (seamonkey-2.21.source.tar.bz2) = 140654724
-SHA256 (enigmail-1.5.2.tar.gz) = f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26
-SIZE (enigmail-1.5.2.tar.gz) = 1211395
+SHA256 (enigmail-1.6.tar.gz) = 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d
+SIZE (enigmail-1.6.tar.gz) = 1231111

Modified: head/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in
==============================================================================
--- head/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in	Thu Oct 24 20:45:09 2013	(r331531)
+++ head/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in	Thu Oct 24 20:54:41 2013	(r331532)
@@ -1,11 +1,12 @@
 --- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
 +++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-01 10:18:43.000000000 +0100
-@@ -147,6 +147,11 @@
+@@ -147,6 +147,12 @@
  CUSTOM_LIBS=1
  endif
  
 +ifeq ($(OS_ARCH), FreeBSD)
 +EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
++EXTRA_LIBS+= $(filter -L% -l%,${NSPRLINK})
 +CUSTOM_LIBS=1
 +endif
 +