4 files changed, 48 insertions, 28 deletions

diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 5b4ad12beee3..e7d508891f88 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-PORTVERSION=	2.14.1
+PORTVERSION=	2.15
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
 
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index c7d764b7daa4..de1341e89916 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -37,6 +37,7 @@ _Q=	2>/dev/null || true
 .if !target(post-extract)
 post-extract:
 	@${RM} -rf ${WRKSRC}/updates
+	@${MKDIR} ${WRKSRC}/plugins ${WRKSRC}/extensions
 .endif
 
 .if ${CATEGORIES:Mwww}
@@ -62,6 +63,26 @@ do-install:
 		${FDIR}/extensions/ ${_Q}
 .endif
 
+# Keep empty directories with pkg_* tools
+.if !target(post-extract-script)
+post-extract-script:
+	@if [ "${PKG_BIN:T}" != "pkg" ]; then \
+	    for d in $$(${FIND} ${WRKSRC} -type d -empty); do \
+		${TOUCH} $$d/.keep_me; \
+		${ECHO_CMD} lib/${APP_NAME}/$${d#${WRKSRC}/}/.keep_me \
+			>> ${WRKDIR}/.PLIST.opkg; \
+	    done; \
+	fi
+.endif
+
+.if !target(post-install-script)
+post-install-script:
+	@if [ -f ${WRKDIR}/.PLIST.opkg ]; then \
+		${CAT} ${TMPPLIST} >> ${WRKDIR}/.PLIST.opkg; \
+		${MV} ${WRKDIR}/.PLIST.opkg ${TMPPLIST}; \
+	fi
+.endif
+
 # Maintainer section
 create-plist: build
 	${ECHO_CMD} bin/%%APP_NAME%% > ${PLIST}
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index 76adb471c582..5d7901beab07 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.14.1.tar.bz2) = a52326a4e197ef83a48288420db7366c9a94a1c5f8e46a6e44b61c20aa166fac
-SIZE (seamonkey-2.14.1.tar.bz2) = 24030719
+SHA256 (seamonkey-2.15.tar.bz2) = 3dc92d91230399f16e966c7b4c8b36d0870979394339f357ef2c9989575fd204
+SIZE (seamonkey-2.15.tar.bz2) = 25993787
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index 015c759106e1..8c3bc83f6d72 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -17,8 +17,8 @@ lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow.png
 lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow16.png
 lib/%%APP_NAME%%/chrome/icons/default/addressbookWindow48.png
 lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties.png
-lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties48.png
 lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties16.png
+lib/%%APP_NAME%%/chrome/icons/default/bookmarkproperties48.png
 lib/%%APP_NAME%%/chrome/icons/default/default.png
 lib/%%APP_NAME%%/chrome/icons/default/default16.png
 lib/%%APP_NAME%%/chrome/icons/default/default48.png
@@ -117,39 +117,38 @@ lib/%%APP_NAME%%/searchplugins/creativecommons.xml
 lib/%%APP_NAME%%/searchplugins/google.xml
 lib/%%APP_NAME%%/searchplugins/wikipedia.xml
 lib/%%APP_NAME%%/searchplugins/yahoo.xml
+lib/%%APP_NAME%%/update-settings.ini
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
-lib/%%APP_NAME%%/update-settings.ini
 @exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
 @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
-@dirrm lib/%%APP_NAME%%/searchplugins
+@dirrm lib/%%APP_NAME%%/chrome/icons/default
+@dirrm lib/%%APP_NAME%%/chrome/icons
+@dirrm lib/%%APP_NAME%%/chrome
+@dirrm lib/%%APP_NAME%%/components
+@dirrm lib/%%APP_NAME%%/defaults/messenger
+@dirrm lib/%%APP_NAME%%/defaults/pref
+@dirrm lib/%%APP_NAME%%/defaults/profile
+@dirrm lib/%%APP_NAME%%/defaults
+@dirrm lib/%%APP_NAME%%/dictionaries
+@dirrm lib/%%APP_NAME%%/distribution/extensions
+@dirrm lib/%%APP_NAME%%/distribution
+@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-notifications
 @dirrm lib/%%APP_NAME%%/modules/services-sync/engines
 @dirrm lib/%%APP_NAME%%/modules/services-sync
-@dirrm lib/%%APP_NAME%%/modules/services-crypto
-@dirrm lib/%%APP_NAME%%/modules/services-common
-@dirrm lib/%%APP_NAME%%/modules/services-aitc
+@dirrm lib/%%APP_NAME%%/modules/identity
+@dirrm lib/%%APP_NAME%%/modules/commonjs/promise
+@dirrm lib/%%APP_NAME%%/modules/commonjs
 @dirrm lib/%%APP_NAME%%/modules
-@dirrm lib/%%APP_NAME%%/jssubloader/185/resource
-@dirrm lib/%%APP_NAME%%/jssubloader/185
-@dirrm lib/%%APP_NAME%%/jssubloader
-@dirrm lib/%%APP_NAME%%/jsloader/resource
-@dirrm lib/%%APP_NAME%%/jsloader
-@dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/icons
-@dirrm lib/%%APP_NAME%%/extensions
-@dirrm lib/%%APP_NAME%%/distribution/extensions
-@dirrm lib/%%APP_NAME%%/distribution
-@dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/defaults/profile
-@dirrm lib/%%APP_NAME%%/defaults/pref
-@dirrm lib/%%APP_NAME%%/defaults/messenger
-@dirrm lib/%%APP_NAME%%/defaults
-@dirrm lib/%%APP_NAME%%/components
-@dirrm lib/%%APP_NAME%%/chrome/icons/default
-@dirrm lib/%%APP_NAME%%/chrome/icons
-@dirrm lib/%%APP_NAME%%/chrome
+@dirrm lib/%%APP_NAME%%/plugins
+@dirrm lib/%%APP_NAME%%/searchplugins
 @dirrm lib/%%APP_NAME%%
 @dirrmtry share/applications