Bug 236613: fixed the fallout from the change to MPL/LGPL/GPL tri-license.

Our script for processing the *.def on the Mac cannot handle blank lines.
Modified Files: nssckbi.def nss.def smime.def softokn.def ssl.def

5 files changed, 8 insertions, 13 deletions

diff --git a/security/nss/lib/ckfw/builtins/nssckbi.def b/security/nss/lib/ckfw/builtins/nssckbi.def
index e0b12cc97..47b280430 100644
--- a/security/nss/lib/ckfw/builtins/nssckbi.def
+++ b/security/nss/lib/ckfw/builtins/nssckbi.def
@@ -34,7 +34,7 @@
 ;+# the terms of any one of the MPL, the GPL or the LGPL.
 ;+#
 ;+# ***** END LICENSE BLOCK *****
-
+;+#
 ;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
 ;+#   1. For all unix platforms, the string ";-"  means "remove this line"
 ;+#   2. For all unix platforms, the string " DATA " will be removed from any 
@@ -47,7 +47,6 @@
 ;+#    And for AIX, the first ";" will also be removed.
 ;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
 ;+#   directives are hidden behind ";", ";+", and ";-"
-
 ;+
 ;+NSS_3.1 {       # NSS 3.1 release
 ;+    global:
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index 41b830016..04432e7fe 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -36,11 +36,11 @@
 ;+# the terms of any one of the MPL, the GPL or the LGPL.
 ;+#
 ;+# ***** END LICENSE BLOCK *****
-
+;+#
 ;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
 ;+#   1. For all unix platforms, the string ";-"  means "remove this line"
 ;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#  line on which it occurs.
+;+#	line on which it occurs.
 ;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
 ;+#      On AIX, lines containing ";+" will be removed.  
 ;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
@@ -49,7 +49,6 @@
 ;+#    And for AIX, the first ";" will also be removed.
 ;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
 ;+#   directives are hidden behind ";", ";+", and ";-"
-
 ;+NSS_3.2 {       # NSS 3.2 release
 ;+    global:
 LIBRARY nss3	;-
diff --git a/security/nss/lib/smime/smime.def b/security/nss/lib/smime/smime.def
index ecb2dcff4..91e77c61a 100644
--- a/security/nss/lib/smime/smime.def
+++ b/security/nss/lib/smime/smime.def
@@ -34,11 +34,11 @@
 ;+# the terms of any one of the MPL, the GPL or the LGPL.
 ;+#
 ;+# ***** END LICENSE BLOCK *****
-
+;+#
 ;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
 ;+#   1. For all unix platforms, the string ";-"  means "remove this line"
 ;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#  line on which it occurs.
+;+#	line on which it occurs.
 ;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
 ;+#      On AIX, lines containing ";+" will be removed.  
 ;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
@@ -47,7 +47,6 @@
 ;+#    And for AIX, the first ";" will also be removed.
 ;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
 ;+#   directives are hidden behind ";", ";+", and ";-"
-
 ;+
 ;+NSS_3.2 {               # NSS 3.2 release
 ;+    global:
diff --git a/security/nss/lib/softoken/softokn.def b/security/nss/lib/softoken/softokn.def
index 884a141fa..2544d1b92 100644
--- a/security/nss/lib/softoken/softokn.def
+++ b/security/nss/lib/softoken/softokn.def
@@ -35,11 +35,11 @@
 ;+# the terms of any one of the MPL, the GPL or the LGPL.
 ;+#
 ;+# ***** END LICENSE BLOCK *****
-
+;+#
 ;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
 ;+#   1. For all unix platforms, the string ";-"  means "remove this line"
 ;+#   2. For all unix platforms, the string " DATA " will be removed from any 
-;+#  line on which it occurs.
+;+#	line on which it occurs.
 ;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
 ;+#      On AIX, lines containing ";+" will be removed.  
 ;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
@@ -48,7 +48,6 @@
 ;+#    And for AIX, the first ";" will also be removed.
 ;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
 ;+#   directives are hidden behind ";", ";+", and ";-"
-
 ;+NSS_3.4 {       # NSS 3.4 release
 ;+    global:
 LIBRARY softokn3 ;-
diff --git a/security/nss/lib/ssl/ssl.def b/security/nss/lib/ssl/ssl.def
index 705bb0147..745934e92 100644
--- a/security/nss/lib/ssl/ssl.def
+++ b/security/nss/lib/ssl/ssl.def
@@ -34,7 +34,7 @@
 ;+# the terms of any one of the MPL, the GPL or the LGPL.
 ;+#
 ;+# ***** END LICENSE BLOCK *****
-
+;+#
 ;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
 ;+#   1. For all unix platforms, the string ";-"  means "remove this line"
 ;+#   2. For all unix platforms, the string " DATA " will be removed from any 
@@ -47,7 +47,6 @@
 ;+#    And for AIX, the first ";" will also be removed.
 ;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
 ;+#   directives are hidden behind ";", ";+", and ";-"
-
 ;+
 ;+NSS_3.2 {       # NSS 3.2 release
 ;+    global: