Date: Sat, 15 Feb 2014 05:09:19 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1498 - in trunk/www/seamonkey: . files Message-ID: <201402150509.s1F59Jdk047530@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Feb 15 05:09:19 2014
New Revision: 1498
Log:
unbreak |make patch| with ENIGMAIL disabled after r1488
Added:
trunk/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
- copied, changed from r1497, trunk/www/seamonkey/files/patch-mailnews-extensions-enigmail-config-getOsTarget.pl
Deleted:
trunk/www/seamonkey/files/patch-mailnews-extensions-enigmail-config-getOsTarget.pl
Modified:
trunk/www/seamonkey/Makefile
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Sat Feb 15 05:09:11 2014 (r1497)
+++ trunk/www/seamonkey/Makefile Sat Feb 15 05:09:19 2014 (r1498)
@@ -105,6 +105,7 @@
EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \
${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \
${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
.endif
.endif
Copied and modified: trunk/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl (from r1497, trunk/www/seamonkey/files/patch-mailnews-extensions-enigmail-config-getOsTarget.pl)
==============================================================================
Deleted: trunk/www/seamonkey/files/patch-mailnews-extensions-enigmail-config-getOsTarget.pl
==============================================================================
--- trunk/www/seamonkey/files/patch-mailnews-extensions-enigmail-config-getOsTarget.pl Sat Feb 15 05:09:19 2014 (r1497)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,43 +0,0 @@
-commit 49a1daf
-Author: Patrick Brunschwig <patrick@enigmail.net>
-Date: Tue Jan 28 18:10:54 2014 +0100
-
- fixed detection of compiler type for better supporting cross-compilers
----
- config/getOsTarget.pl | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git config/getOsTarget.pl config/getOsTarget.pl
-index 91285cd..cf4a233 100755
---- mailnews/extensions/enigmail/config/getOsTarget.pl
-+++ mailnews/extensions/enigmail/config/getOsTarget.pl
-@@ -9,13 +9,15 @@
- # -c : CPU and compiler type
- # -o : OS type
-
-+use File::Basename;
-+
- if ($#ARGV != 3) {
- exit (1);
- }
-
- my $srcOs = $ARGV[1];
- my $srcCpu = $ARGV[2];
--my $srcComp = $ARGV[3];
-+my $srcComp = basename($ARGV[3]);
-
- my $targetOs = "";
- my $targetCpu = "";
-@@ -95,10 +97,10 @@ else {
- if ($targetOs eq "WINNT") {
- $targetComp = "msvc";
- }
--if ($srcComp =~ /^gcc/) {
-+elsif ($srcComp =~ /gcc/) {
- $targetComp = "gcc3";
- }
--elsif ($srcComp =~ /^cc/) {
-+elsif ($srcComp =~ /cc/) {
- if ($targetOs eq "SunOS") {
- $targetComp = "sunc";
- }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402150509.s1F59Jdk047530>