[Midnightbsd-cvs] mports [15654] trunk/www/linux-seamonkey: Seamonkey 2.21

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Dec 7 13:52:17 EST 2013 

Revision: 15654
          http://svnweb.midnightbsd.org/mports/?rev=15654
Author:   laffer1
Date:     2013-12-07 13:52:16 -0500 (Sat, 07 Dec 2013)
Log Message:
-----------
Seamonkey 2.21

Modified Paths:
--------------
    trunk/www/linux-seamonkey/Makefile
    trunk/www/linux-seamonkey/Makefile.common
    trunk/www/linux-seamonkey/distinfo
    trunk/www/linux-seamonkey/pkg-plist

Modified: trunk/www/linux-seamonkey/Makefile
===================================================================
--- trunk/www/linux-seamonkey/Makefile	2013-12-05 03:11:46 UTC (rev 15653)
+++ trunk/www/linux-seamonkey/Makefile	2013-12-07 18:52:16 UTC (rev 15654)
@@ -1,12 +1,13 @@
 # $MidnightBSD$
 
 PORTNAME=	seamonkey
-PORTVERSION=	2.17.1
+DISTVERSION=	2.21
 CATEGORIES=	www
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
+MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The open source, standards compliant web browser
+
 LICENSE=	mpl
 
 USE_BZIP2=	yes

Modified: trunk/www/linux-seamonkey/Makefile.common
===================================================================
--- trunk/www/linux-seamonkey/Makefile.common	2013-12-05 03:11:46 UTC (rev 15653)
+++ trunk/www/linux-seamonkey/Makefile.common	2013-12-07 18:52:16 UTC (rev 15654)
@@ -1,12 +1,13 @@
 # $MidnightBSD$
 
 CATEGORIES+=	linux
-.ifndef	MASTER_SITES
-MASTER_SITES=	MOZILLA_EXTENDED
-MASTER_SITE_SUBDIR?=	${PORTNAME}/releases/${DISTVERSION}
-.endif
+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
+.endif
+
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 APP_NAME=	${PKGBASE}
@@ -20,7 +21,7 @@
 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
@@ -32,18 +33,38 @@
 .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 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:
-	@${ECHO} 'pref("general.useragent.vendor", "'${OPSYS}'");' >> ${PREFS_FILE}
-	@${ECHO} 'pref("general.useragent.vendorSub", "'${ARCH}'");' >> ${PREFS_FILE}
-	# prefer libsydneyaudio (bug780531)
-	${ECHO} 'pref("media.use_cubeb", false);' >> ${PREFS_FILE}
+	@${MKDIR} ${PREFS_FILE:H}
+
+	# out-of-process plugins don't work with linuxulator (ports/170402)
+	${ECHO} 'pref("dom.ipc.plugins.enabled", false);' >> ${PREFS_FILE}
 .endif
-.endif
 
 .if !target(do-install)
 do-install:
@@ -53,15 +74,15 @@
 	@${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
 .if !target(post-extract-script)
 post-extract-script:
-	@if [ "${PKG_BIN:T}" != "pkg" ]; then \
+	@if [ "${PKG_BIN:T}" != "pkg-static" ]; then \
 	    for d in $$(${FIND} ${WRKSRC} -type d -empty); do \
 		${TOUCH} $$d/.keep_me; \
 		${ECHO_CMD} lib/${APP_NAME}/$${d#${WRKSRC}/}/.keep_me \
@@ -85,16 +106,15 @@
 	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}
-	${ECHO_CMD} @dirrmtry share/applications >> ${PLIST}
 
 snatch-desktop:
 	${SED} -E -e 's/${PORTNAME}/${APP_NAME}/' \

Modified: trunk/www/linux-seamonkey/distinfo
===================================================================
--- trunk/www/linux-seamonkey/distinfo	2013-12-05 03:11:46 UTC (rev 15653)
+++ trunk/www/linux-seamonkey/distinfo	2013-12-07 18:52:16 UTC (rev 15654)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.17.1.tar.bz2) = 1beda01853c1e130dd34e76e7a1c8ebe1ff841ae9fb451c451dc57de3afeacb3
-SIZE (seamonkey-2.17.1.tar.bz2) = 26587871
+SHA256 (seamonkey-2.21.tar.bz2) = ff6f361e1db0add6d4c38e5594a8b99c31f11992ae56dc2981329f66439161e2
+SIZE (seamonkey-2.21.tar.bz2) = 29490026

Modified: trunk/www/linux-seamonkey/pkg-plist
===================================================================
--- trunk/www/linux-seamonkey/pkg-plist	2013-12-05 03:11:46 UTC (rev 15653)
+++ trunk/www/linux-seamonkey/pkg-plist	2013-12-07 18:52:16 UTC (rev 15654)
@@ -53,7 +53,7 @@
 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%%/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,20 +137,6 @@
 @dirrm lib/%%APP_NAME%%/extensions
 @dirrm lib/%%APP_NAME%%/icons
 @dirrm lib/%%APP_NAME%%/isp
- at dirrm lib/%%APP_NAME%%/modules/services-aitc
- at dirrm lib/%%APP_NAME%%/modules/services-common
- at dirrm lib/%%APP_NAME%%/modules/services-crypto
- at dirrm lib/%%APP_NAME%%/modules/services-sync/stages
- at dirrm lib/%%APP_NAME%%/modules/services-sync/engines
- at dirrm lib/%%APP_NAME%%/modules/services-sync
- at dirrm lib/%%APP_NAME%%/modules/services/datareporting
- at dirrm lib/%%APP_NAME%%/modules/services
- at dirrm lib/%%APP_NAME%%/modules/identity
- at dirrm lib/%%APP_NAME%%/modules/commonjs/promise
- at dirrm lib/%%APP_NAME%%/modules/commonjs
- at dirrm lib/%%APP_NAME%%/modules/accessibility
- at dirrm lib/%%APP_NAME%%/modules
 @dirrm lib/%%APP_NAME%%/plugins
 @dirrm lib/%%APP_NAME%%/searchplugins
 @dirrm lib/%%APP_NAME%%
- at dirrmtry share/applications

More information about the Midnightbsd-cvs mailing list