5 files changed, 63 insertions, 47 deletions

diff --git a/www/linux-seamonkey/Makefile b/www/linux-seamonkey/Makefile
index 5b785f11d770..355a5545adb2 100644
--- a/www/linux-seamonkey/Makefile
+++ b/www/linux-seamonkey/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.21
-CATEGORIES=	www
+DISTVERSION=	2.23
+CATEGORIES=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
@@ -13,6 +13,5 @@ USE_BZIP2=	yes
 
 USE_LINUX_APPS=	dbusglib dbuslibs alsalib alsa-plugins-oss
 
-NO_STAGE=	yes
 .include "${.CURDIR}/Makefile.common"
 .include <bsd.port.mk>
diff --git a/www/linux-seamonkey/Makefile.common b/www/linux-seamonkey/Makefile.common
index 878ec0c7653c..0321ece9cdea 100644
--- a/www/linux-seamonkey/Makefile.common
+++ b/www/linux-seamonkey/Makefile.common
@@ -1,12 +1,24 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
+.if defined(OVERRIDE_LINUX_NONBASE_PORTS) && \
+    ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10"
+.undef WANT_GTK218
+.endif
+
 CATEGORIES+=	linux
 MASTER_SITES?=	MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
 PKGNAMEPREFIX?=		linux-
 
-.if defined(REPLACE_GRE)
-EXTRACT_DEPENDS+=${NONEXISTENT}:${PORTSDIR}/www/linux-seamonkey:extract
+.if defined(WANT_GTK218)
+MASTER_SITES+=	https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/12/Everything/i386/os/Packages/:f12
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		glib2-2.22.2-2.fc12.i686.rpm:f12 \
+		gtk2-2.18.3-19.fc12.i686.rpm:f12
+GTK218_FILES=	lib/libgio-2.0.so.0 \
+		lib/libglib-2.0.so.0 \
+		usr/lib/libgdk-x11-2.0.so.0 \
+		usr/lib/libgtk-x11-2.0.so.0
 .endif
 
 NO_BUILD=	yes
@@ -16,9 +28,11 @@ BIN_NAME?=	${PORTNAME}
 USE_LINUX=	yes
 USE_LINUX_APPS+=	atk fontconfig gtk2 hicontheme pango
 WRKSRC?=	${WRKDIR}/${BIN_NAME}
-FDIR=		${PREFIX}/lib/${APP_NAME}
+FDIR=		${STAGEDIR}${PREFIX}/lib/${APP_NAME}
 COMMON_DIR=	${.CURDIR}/../../www/linux-seamonkey
 
+APP_ENV+=	MOZ_CRASHREPORTER_DISABLE=1
+
 PLIST_SUB+=	APP_NAME=${APP_NAME}
 SUB_LIST+=	APP_NAME=${APP_NAME}
 SUB_FILES=	${APP_NAME}.desktop
@@ -28,54 +42,56 @@ DESKTOP_SUFFIX?=	(Linux, devel)
 .endif
 DESKTOP_SUFFIX?=	(Linux)
 
+.if defined(WANT_GTK218)
+PLIST_SUB+=	GTK218=""
+.else
+PLIST_SUB+=	GTK218="@comment "
+.endif
+
 _A=	>> ${TMPPLIST}
 _Q=	2>/dev/null || true
 
 .if !target(post-extract)
 post-extract:
 	@${RM} -rf ${WRKSRC}/updates
-	@${MKDIR} ${WRKSRC}/${APP_SUBDIR}plugins
 	@${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions
+	@${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME} \
+		${WRKSRC}/${APP_SUBDIR}plugins
+. if defined(WANT_GTK218)
+.  for f in ${GTK218_FILES}
+	@${CP} -p ${WRKDIR}/${f} ${WRKSRC}
+	@${ECHO_CMD} ${f:T} >>${WRKSRC}/dependentlibs.list
+.  endfor
+	@${REINPLACE_CMD} -i '' '/libxul/ { h; d; }; $$G' \
+		${WRKSRC}/dependentlibs.list
+. endif
 .endif
 
-.if defined(REPLACE_GRE)
-# XXX remove after linux_base-c6 and linux-c6-gtk2 become default
-# using seamonkey gre for linux_base-f10 compat
-post-extract:	replace-gre
-replace-gre:	version-compat-check
-	@${ECHO_MSG} "===>   GRE versions are compatible, replacing with" \
-		"$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../../www/linux-seamonkey)"
-	cd $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../../www/linux-seamonkey); \
-		${CP} lib* dependentlibs.list ${WRKSRC}
-
-version-compat-check:
-	@${ECHO_MSG} "===>  Checking GRE version is compatible with" \
-		"$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../../www/linux-seamonkey)"
-	@ff_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' ${WRKSRC}/platform.ini); \
-	sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../../www/linux-seamonkey)/platform.ini); \
-	if [ $$ff_gre_version != $$sm_gre_version ]; then \
-	    ${ECHO_MSG} "===>   GRE versions aren't compatible, aborting"; \
-	    exit 1; \
-	fi
-.endif
 
 .if !target(post-patch)
 post-patch:
 	@${MKDIR} ${PREFS_FILE:H}
 
-	# out-of-process plugins don't work with linuxulator (ports/170402)
-	${ECHO} 'pref("dom.ipc.plugins.enabled", false);' >> ${PREFS_FILE}
+	# empty port preferences
+	@${DO_NADA} >>${PREFS_FILE}
+
+. if (${DISTVERSION:R:R} < 28 && ${PORTNAME} != "seamonkey") || \
+ (${PORTNAME} == "seamonkey" && ${DISTVERSION:C/[0-9]*\.//:C/b.*//} < 25)
+	# dummy resident-unique for make about:memory's "measure"
+	@${REINPLACE_CMD} -i '' \
+		's,/proc/self/smaps\(.Private\),////////dev/null\1,' \
+		${WRKSRC}/libxul.so
+. endif
 .endif
 
 .if !target(do-install)
 do-install:
-	@${INSTALL} -d ${FDIR} ${PREFIX}/share/applications
-	@${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	@${CP} -pR ${WRKSRC}/ ${FDIR}/
-	@${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/
-	@${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME}
-	@${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \
-		${FDIR}/${APP_SUBDIR}plugins/ ${_Q}
+	@${PRINTF} '#! /bin/sh\n${APP_ENV} \
+		${PREFIX}/lib/${APP_NAME}/${BIN_NAME} "$$@"\n' \
+		>>${STAGEDIR}${PREFIX}/bin/${APP_NAME}
+	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${APP_NAME}
 	@${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \
 		${FDIR}/${APP_SUBDIR}extensions/ ${_Q}
 .endif
@@ -106,19 +122,22 @@ create-plist: build
 	${ECHO_CMD} share/applications/%%APP_NAME%%.desktop >> ${PLIST}
 	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%%/${APP_SUBDIR}plugins/ ${_Q}' >> ${PLIST}
 	${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \
 		%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%%/${APP_SUBDIR}extensions/ \
 		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
 	cd ${WRKSRC} && ${FIND} -sd . -type d | \
 		${SED} -e "s#^\.#@dirrm lib/%%APP_NAME%%#" >> ${PLIST}
+.if defined(WANT_GTK218)
+. for f in ${GTK218_FILES}
+	${REINPLACE_CMD} -i '' '/${f:T}/s/^/%%GTK218%%/' ${PLIST}
+. endfor
+.endif
 
 snatch-desktop:
 	${SED} -E -e 's/${PORTNAME}/${APP_NAME}/' \
+		-e "s,@MOZILLA_NAME@,$$(echo ${PORTNAME} | ${SED} 's/\b./\u&/g')," \
+		-e 's/@MOZILLA@|%%MOZILLA%%/${APP_NAME}/' \
 		-e 's/^(Name.*=.+)$$/\1 ${DESKTOP_SUFFIX}/' \
 		-e 's/^(GenericName.*=.+)$$/\1 ${DESKTOP_SUFFIX}/' \
 		-e 's!^Icon=.*$$!Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm!' \
diff --git a/www/linux-seamonkey/distinfo b/www/linux-seamonkey/distinfo
index a786f2181101..87bff9dadc93 100644
--- a/www/linux-seamonkey/distinfo
+++ b/www/linux-seamonkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.21.tar.bz2) = ff6f361e1db0add6d4c38e5594a8b99c31f11992ae56dc2981329f66439161e2
-SIZE (seamonkey-2.21.tar.bz2) = 29490026
+SHA256 (seamonkey-2.23.tar.bz2) = 7c848d214233dfbc4543f9d76f9c8ec8afc5a21062dfe09acf137ec2be145199
+SIZE (seamonkey-2.23.tar.bz2) = 29492800
diff --git a/www/linux-seamonkey/files/linux-seamonkey.desktop.in b/www/linux-seamonkey/files/linux-seamonkey.desktop.in
index 212d753da2e7..57d2d4a4da65 100644
--- a/www/linux-seamonkey/files/linux-seamonkey.desktop.in
+++ b/www/linux-seamonkey/files/linux-seamonkey.desktop.in
@@ -160,10 +160,10 @@ Comment[vi]=Duyệt web
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=linux-seamonkey %U
-StartupNotify=true
+Exec=linux-seamonkey %u
+StartupNotify=false
 Terminal=false
 Type=Application
 Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm
-Categories=Application;Network;
+Categories=Network;WebBrowser;Email;News;TextEditor;IRCClient;
 MimeType=text/html;text/xml;application/xhtml+xml;
diff --git a/www/linux-seamonkey/pkg-plist b/www/linux-seamonkey/pkg-plist
index b1e1d8169138..a0afe7ca5e55 100644
--- a/www/linux-seamonkey/pkg-plist
+++ b/www/linux-seamonkey/pkg-plist
@@ -107,6 +107,7 @@ lib/%%APP_NAME%%/mozilla-xremote-client
 lib/%%APP_NAME%%/omni.ja
 lib/%%APP_NAME%%/platform.ini
 lib/%%APP_NAME%%/plugin-container
+lib/%%APP_NAME%%/plugins
 lib/%%APP_NAME%%/precomplete
 lib/%%APP_NAME%%/removed-files
 lib/%%APP_NAME%%/run-mozilla.sh
@@ -119,9 +120,7 @@ lib/%%APP_NAME%%/searchplugins/yahoo.xml
 lib/%%APP_NAME%%/update-settings.ini
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.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%%/chrome/icons/default
 @dirrm lib/%%APP_NAME%%/chrome/icons
@@ -137,6 +136,5 @@ lib/%%APP_NAME%%/updater.ini
 @dirrm lib/%%APP_NAME%%/extensions
 @dirrm lib/%%APP_NAME%%/icons
 @dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/plugins
 @dirrm lib/%%APP_NAME%%/searchplugins
 @dirrm lib/%%APP_NAME%%