[csw-devel] SF.net SVN: gar:[5563] csw/mgar/pkg/firefox/branches/firefox3.5-packaging

[wbonnet at users.sourceforge.net]

Revision: 5563
          http://gar.svn.sourceforge.net/gar/?rev=5563&view=rev
Author:   wbonnet
Date:     2009-07-10 22:24:42 +0000 (Fri, 10 Jul 2009)

Log Message:
-----------
Once again... more patches :)

Modified Paths:
--------------
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums

Added Paths:
-----------
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.config.mk.diff

Removed Paths:
-------------
    csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile	2009-07-10 21:38:36 UTC (rev 5562)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/Makefile	2009-07-10 22:24:42 UTC (rev 5563)
@@ -31,7 +31,7 @@
 PATCHFILES += js.src.configure.diff
 PATCHFILES += SunOS5.mk.diff
 PATCHFILES += lowpbe.c.diff
-PATCHFILES += softoken.mk.diff
+PATCHFILES += softoken.config.mk.diff
 PATCHFILES += fipsaudt.c.diff
 # PATCHFILES += nsMathUtils.h.diff
 # PATCHFILES += file_id.cc.diff

Modified: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums	2009-07-10 21:38:36 UTC (rev 5562)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/checksums	2009-07-10 22:24:42 UTC (rev 5563)
@@ -12,4 +12,4 @@
 3ad7b67c350157d9b54270139e36c107  download/lowpbe.c.diff
 f562a935a0fb2c5ad38f95af114d0a49  download/nsPluginsDirUnix.cpp.diff
 1de554cffc12f15bddf11ecdba0fe32d  download/packager.mk.diff
-49140d25970bc0422700a7a0bd35eaee  download/softoken.mk.diff
+46e4778961dea277f8ee657f475a89dd  download/softoken.config.mk.diff

Copied: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.config.mk.diff (from rev 5561, csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff)
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.config.mk.diff	                        (rev 0)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.config.mk.diff	2009-07-10 22:24:42 UTC (rev 5563)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru firefox.orig/security/nss/lib/softoken/config.mk firefox/security/nss/lib/softoken/config.mk
+--- firefox.orig/security/nss/lib/softoken/config.mk    2009-07-10 22:58:22.364751249 +0200
++++ firefox/security/nss/lib/softoken/config.mk       2009-07-10 22:58:22.364751249 +0200
+@@ -101,7 +101,7 @@
+ ifeq ($(OS_TARGET),SunOS)
+ # The -R '$ORIGIN' linker option instructs this library to search for its
+ # dependencies in the same directory where it resides.
+-MKSHLIB += -R '$$ORIGIN'
++MKSHLIB += -R '$$ORIGIN' -L../../../../dist/lib
+ OS_LIBS += -lbsm 
+ endif
+

Deleted: csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff	2009-07-10 21:38:36 UTC (rev 5562)
+++ csw/mgar/pkg/firefox/branches/firefox3.5-packaging/files/softoken.mk.diff	2009-07-10 22:24:42 UTC (rev 5563)
@@ -1,11 +0,0 @@
-diff --speed-large-files --minimal -Nru firefox.orig/security/nss/lib/softoken/config.mk firefox/security/nss/lib/softoken/config.mk
---- firefox.orig/security/nss/lib/softoken/config.mk    2009-07-10 22:58:22.364751249 +0200
-+++ firefox/security/nss/lib/softoken/config.mk       2009-07-10 22:58:22.364751249 +0200
-@@ -102,6 +102,7 @@
- # The -R '$ORIGIN' linker option instructs this library to search for its
- # dependencies in the same directory where it resides.
- MKSHLIB += -R '$$ORIGIN'
-+MKSHLIB += -L../../../../dist/lib
- OS_LIBS += -lbsm
- endif
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.