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

[Florian Smeets]

Author: flo
Date: Sat Dec 14 20:45:15 2013
New Revision: 336484
URL: http://svnweb.freebsd.org/changeset/ports/336484

Log:
  - reenable ENIGMAIL by default, it was disabled on purpose in the previous
    commit, but was accidentally forgotten in the commit log
  - add a patch to fix the build with ENIGMAIL [1]
  
  Tested by:	Christoph Lukas <clukas at firc.de>
  Obtained from:	OpenBSD [1]

Added:
  head/www/seamonkey/files/patch-config__config.mk   (contents, props changed)
Modified:
  head/www/seamonkey/Makefile

Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile	Sat Dec 14 20:10:52 2013	(r336483)
+++ head/www/seamonkey/Makefile	Sat Dec 14 20:45:15 2013	(r336484)
@@ -3,6 +3,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.23
+PORTREVISION=	1
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -48,7 +49,7 @@ MOZ_PKGCONFIG_FILES=
 NOT_FOR_ARCHS=	ia64
 
 OPTIONS_DEFINE=	CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
-OPTIONS_DEFAULT=CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
 
 CHATZILLA_DESC?=Chatzilla IRC module
 COMPOSER_DESC?=	HTML Composer module

Added: head/www/seamonkey/files/patch-config__config.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/seamonkey/files/patch-config__config.mk	Sat Dec 14 20:45:15 2013	(r336484)
@@ -0,0 +1,13 @@
+Fix fallout from http://hg.mozilla.org/releases/comm-release/rev/a6ab55f00e21
+XPIDL_LINK being undefined breaks enigmail build
+--- config/config.mk.orig	Tue Dec 10 10:22:36 2013
++++ config/config.mk	Tue Dec 10 10:22:57 2013
+@@ -325,6 +325,7 @@ MY_RULES	:= $(DEPTH)/config/myrules.mk
+ # Default command macros; can be overridden in <arch>.mk.
+ #
+ CCC		= $(CXX)
++XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
+ 
+ OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
+ 
+