- Update distinfo for enigmail 1.5.2, some version numbers were corrected in the distfile

- add a patch for enigmail back that's still required
- mark ENIGMAIL option broken, see https://bugzilla.mozilla.org/show_bug.cgi?id=886095
- remove the candidates URL from MASTER_SITES

3 files changed, 44 insertions, 4 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 4aab6a41ad02..9cee72b35980 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	seamonkey
 DISTVERSION=	2.19
 CATEGORIES?=	www ipv6
-MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
+MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
 DISTFILES=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
@@ -84,6 +83,7 @@ MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
 MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
 .endif
 .if ${PORT_OPTIONS:MENIGMAIL}
+BROKEN=		Does not build see https://bugzilla.mozilla.org/show_bug.cgi?id=886095
 MASTER_SITES+=	http://www.enigmail.net/download/source/:enigmail
 DISTFILES+=	${EM_DISTFILE}:enigmail
 RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
@@ -95,6 +95,7 @@ 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
 .endif
 .endif
 
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index dd8b2700c0c0..cd388e2f1370 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
 SHA256 (seamonkey-2.19.source.tar.bz2) = 3d05fc6af5a6bb7c30da38b7dfc32b68c6d8e3ab3257545e6605aa4d682abb46
 SIZE (seamonkey-2.19.source.tar.bz2) = 136076805
-SHA256 (enigmail-1.5.2.tar.gz) = 0f6b4313f8400242c1c479b0329375122acc4a4e43e5065fbc9e00adbfc42895
-SIZE (enigmail-1.5.2.tar.gz) = 1211342
+SHA256 (enigmail-1.5.2.tar.gz) = f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26
+SIZE (enigmail-1.5.2.tar.gz) = 1211395
diff --git a/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile b/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
new file mode 100644
index 000000000000..489f8f38d2da
--- /dev/null
+++ b/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
@@ -0,0 +1,39 @@
+--- mailnews/extensions/enigmail/ipc/src/Makefile.enig.orig	2013-07-08 16:36:56.488828884 +0200
++++ mailnews/extensions/enigmail/ipc/src/Makefile.enig	2013-07-08 16:38:38.044988437 +0200
+@@ -19,13 +19,13 @@
+ 
+ ifeq ($(OS_ARCH),NetBSD)
+ ifeq ($(DLL_SUFFIX),.so.1.0)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ endif
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ 
+@@ -36,7 +36,7 @@
+ 
+ ifeq ($(OS_ARCH),HP-UX)
+ ifeq ($(GNU_CC)$(GNU_CXX),)
+-LDFLAGS += -Wl,-Bsymbolic
++LDFLAGS += -shared -Wl,-Bsymbolic
+ CFLAGS += -fPIC
+ endif
+ endif
+@@ -67,7 +67,11 @@
+ 	$(CC) $(LDFLAGS) -o $(libname) $(objfiles)
+ 
+ source: $(source)
++ifneq (,$(filter 4.2.%, $(CC_VERSION)))
++	$(CC) $(CFLAGS) -c -o $(objfiles) $^
++else
+ 	$(CC) $(CFLAGS) -Wno-return-type-c-linkage -c -o $(objfiles) $^
++endif
+ 
+ 
+ clean: