4 files changed, 21 insertions, 34 deletions

diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 36d520bdfaa7..1d030ab6578c 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-PORTVERSION=	2.17.1
+PORTVERSION=	2.19
 CATEGORIES=	www
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
+MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index cfc15ad5ecf7..ace1516151fc 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -6,10 +6,7 @@
 #
 
 CATEGORIES+=	linux
-.ifndef	MASTER_SITES
-MASTER_SITES=	MOZILLA
-MASTER_SITE_SUBDIR?=	${PORTNAME}/releases/${DISTVERSION}
-.endif
+MASTER_SITES?=	MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
 PKGNAMEPREFIX?=		linux-
 
 NO_BUILD=	yes
@@ -25,7 +22,7 @@ COMMON_DIR=	${.CURDIR}/../../www/linux-seamonkey
 PLIST_SUB+=	APP_NAME=${APP_NAME}
 SUB_LIST+=	APP_NAME=${APP_NAME}
 SUB_FILES=	${APP_NAME}.desktop
-PREFS_FILE=	${WRKSRC}/defaults/pref/browser-prefs.js
+PREFS_FILE?=	${WRKSRC}/defaults/pref/browser-prefs.js
 .if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX:M*devel*}
 DESKTOP_SUFFIX?=	(Linux, devel)
 .endif
@@ -37,16 +34,20 @@ _Q=	2>/dev/null || true
 .if !target(post-extract)
 post-extract:
 	@${RM} -rf ${WRKSRC}/updates
-	@${MKDIR} ${WRKSRC}/plugins ${WRKSRC}/extensions
+	@${MKDIR} ${WRKSRC}/${APP_SUBDIR}plugins
+	@${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions
 .endif
 
 .if ${CATEGORIES:Mwww}
 .if !target(post-patch)
 post-patch:
-	@${ECHO} 'pref("general.useragent.vendor", "'${OPSYS}'");' >> ${PREFS_FILE}
-	@${ECHO} 'pref("general.useragent.vendorSub", "'${ARCH}'");' >> ${PREFS_FILE}
-	# prefer libsydneyaudio (bug780531)
+	@${MKDIR} ${PREFS_FILE:H}
+
+	# no AFMT_FLOAT support in kernel (bug 780531)
 	${ECHO} 'pref("media.use_cubeb", false);' >> ${PREFS_FILE}
+
+	# out-of-process plugins don't work with linuxulator (ports/170402)
+	${ECHO} 'pref("dom.ipc.plugins.enabled", false);' >> ${PREFS_FILE}
 .endif
 .endif
 
@@ -58,9 +59,9 @@ do-install:
 	@${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/
 	@${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME}
 	@${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \
-		${FDIR}/plugins/ ${_Q}
+		${FDIR}/${APP_SUBDIR}plugins/ ${_Q}
 	@${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \
-		${FDIR}/extensions/ ${_Q}
+		${FDIR}/${APP_SUBDIR}extensions/ ${_Q}
 .endif
 
 # Keep empty directories with pkg_* tools
@@ -90,12 +91,12 @@ create-plist: build
 	cd ${WRKSRC} && ${FIND} -s . -type f -or -type l | \
 		${SED} -e "s#^\.#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST}
 	${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ \
-		%D/lib/%%APP_NAME%%/plugins/ ${_Q}' >> ${PLIST}
+		%D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ ${_Q}' >> ${PLIST}
 	${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \
-		%D/lib/%%APP_NAME%%/extensions/ ${_Q}' >> ${PLIST}
-	${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/plugins/ \
+		%D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ ${_Q}' >> ${PLIST}
+	${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ \
 		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
-	${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/extensions/ \
+	${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ \
 		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
 	cd ${WRKSRC} && ${FIND} -sd . -type d | \
 		${SED} -e "s#^\.#@dirrm lib/%%APP_NAME%%#" >> ${PLIST}
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index bef3bfc594c6..4f2b6b743ed5 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.17.1.tar.bz2) = 1beda01853c1e130dd34e76e7a1c8ebe1ff841ae9fb451c451dc57de3afeacb3
-SIZE (seamonkey-2.17.1.tar.bz2) = 26587871
+SHA256 (seamonkey-2.19.tar.bz2) = 418d8ebc992340f8719042c599aeaf2c3751e4dc99454c1e28648d8be9e5f006
+SIZE (seamonkey-2.19.tar.bz2) = 26816834
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 9ce0559c4111..9a3f443866f5 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -53,7 +53,7 @@ lib/%%APP_NAME%%/chrome/icons/default/seamonkey.png
 lib/%%APP_NAME%%/chrome/icons/default/venkman-window.png
 lib/%%APP_NAME%%/chrome/icons/default/venkman-window16.png
 lib/%%APP_NAME%%/chrome/icons/default/venkman-window48.png
-lib/%%APP_NAME%%/components/binary.manifest
+lib/%%APP_NAME%%/components/components.manifest
 lib/%%APP_NAME%%/components/libdbusservice.so
 lib/%%APP_NAME%%/components/libmozgnome.so
 lib/%%APP_NAME%%/components/libnkgnomevfs.so
@@ -101,7 +101,6 @@ lib/%%APP_NAME%%/libsmime3.so
 lib/%%APP_NAME%%/libsoftokn3.chk
 lib/%%APP_NAME%%/libsoftokn3.so
 lib/%%APP_NAME%%/libssl3.so
-lib/%%APP_NAME%%/libxpcom.so
 lib/%%APP_NAME%%/libxul.so
 lib/%%APP_NAME%%/license.txt
 lib/%%APP_NAME%%/mozilla-xremote-client
@@ -138,19 +137,6 @@ lib/%%APP_NAME%%/updater.ini
 @dirrm lib/%%APP_NAME%%/extensions
 @dirrm lib/%%APP_NAME%%/icons
 @dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/modules/services-aitc
-@dirrm lib/%%APP_NAME%%/modules/services-common
-@dirrm lib/%%APP_NAME%%/modules/services-crypto
-@dirrm lib/%%APP_NAME%%/modules/services-sync/stages
-@dirrm lib/%%APP_NAME%%/modules/services-sync/engines
-@dirrm lib/%%APP_NAME%%/modules/services-sync
-@dirrm lib/%%APP_NAME%%/modules/services/datareporting
-@dirrm lib/%%APP_NAME%%/modules/services
-@dirrm lib/%%APP_NAME%%/modules/identity
-@dirrm lib/%%APP_NAME%%/modules/commonjs/promise
-@dirrm lib/%%APP_NAME%%/modules/commonjs
-@dirrm lib/%%APP_NAME%%/modules/accessibility
-@dirrm lib/%%APP_NAME%%/modules
 @dirrm lib/%%APP_NAME%%/plugins
 @dirrm lib/%%APP_NAME%%/searchplugins
 @dirrm lib/%%APP_NAME%%