Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 Nov 2013 13:08:10 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r1379 - in trunk: mail/linux-thunderbird www/firefox www/linux-seamonkey www/seamonkey
Message-ID:  <201311111308.rABD8AP9033102@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: flo
Date: Mon Nov 11 13:08:10 2013
New Revision: 1379

Log:
sync some more with ports

Modified:
   trunk/mail/linux-thunderbird/pkg-plist
   trunk/www/firefox/Makefile
   trunk/www/linux-seamonkey/Makefile.common
   trunk/www/linux-seamonkey/pkg-plist
   trunk/www/seamonkey/Makefile

Modified: trunk/mail/linux-thunderbird/pkg-plist
==============================================================================
--- trunk/mail/linux-thunderbird/pkg-plist	Sun Nov 10 18:21:34 2013	(r1378)
+++ trunk/mail/linux-thunderbird/pkg-plist	Mon Nov 11 13:08:10 2013	(r1379)
@@ -90,4 +90,3 @@
 @dirrm lib/%%APP_NAME%%/plugins
 @dirrm lib/%%APP_NAME%%/searchplugins
 @dirrm lib/%%APP_NAME%%
-@dirrmtry share/applications

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Sun Nov 10 18:21:34 2013	(r1378)
+++ trunk/www/firefox/Makefile	Mon Nov 11 13:08:10 2013	(r1379)
@@ -52,6 +52,10 @@
 
 WRKSRC:=	${WRKDIR}/mozilla-beta
 
+.if ${ARCH} == i386 && ${OSVERSION} < 1000000
+USE_GCC?=	yes
+.endif
+
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \

Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common	Sun Nov 10 18:21:34 2013	(r1378)
+++ trunk/www/linux-seamonkey/Makefile.common	Mon Nov 11 13:08:10 2013	(r1379)
@@ -69,7 +69,6 @@
 
 .if !target(do-install)
 do-install:
-	@${INSTALL} -d ${FDIR} ${PREFIX}/share/applications
 	@${INSTALL_DATA} ${WRKDIR}/${APP_NAME}.desktop ${PREFIX}/share/applications/
 	@${CP} -pR ${WRKSRC}/ ${FDIR}/
 	@${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/
@@ -116,7 +115,6 @@
 		-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/pkg-plist
==============================================================================
--- trunk/www/linux-seamonkey/pkg-plist	Sun Nov 10 18:21:34 2013	(r1378)
+++ trunk/www/linux-seamonkey/pkg-plist	Mon Nov 11 13:08:10 2013	(r1379)
@@ -140,4 +140,3 @@
 @dirrm lib/%%APP_NAME%%/plugins
 @dirrm lib/%%APP_NAME%%/searchplugins
 @dirrm lib/%%APP_NAME%%
-@dirrmtry share/applications

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Sun Nov 10 18:21:34 2013	(r1378)
+++ trunk/www/seamonkey/Makefile	Mon Nov 11 13:08:10 2013	(r1379)
@@ -23,6 +23,7 @@
 EM_VERSION=	1.6
 L_VERSION=	2.7b1
 
+SSP_UNSAFE=	yes
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=-2.7
 OBJDIR_BUILD=	# in-tree build broken after bug 789837



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311111308.rABD8AP9033102>