Fixed with clang.

6 files changed, 40 insertions, 17 deletions

diff --git a/net/spserver/files/patch-gnutls_Makefile b/net/spserver/files/patch-gnutls_Makefile
index c7bfe24b9172..232f53e68c2f 100644
--- a/net/spserver/files/patch-gnutls_Makefile
+++ b/net/spserver/files/patch-gnutls_Makefile
@@ -1,6 +1,10 @@
 --- gnutls/Makefile.orig	2009-12-13 10:02:39.000000000 +0800
-+++ gnutls/Makefile	2011-09-05 16:11:46.000000000 +0800
-@@ -5,16 +5,16 @@ CC = gcc
++++ gnutls/Makefile	2013-09-08 11:15:38.000000000 +0800
+@@ -1,20 +1,19 @@
+ 
+ #--------------------------------------------------------------------
+ 
+-CC = gcc
  AR = ar cru
  CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
  SOFLAGS = -shared
diff --git a/net/spserver/files/patch-matrixssl_Makefile b/net/spserver/files/patch-matrixssl_Makefile
index 85cb04479dbb..8fe9acf12ee0 100644
--- a/net/spserver/files/patch-matrixssl_Makefile
+++ b/net/spserver/files/patch-matrixssl_Makefile
@@ -1,8 +1,10 @@
 --- matrixssl/Makefile.orig	2009-12-13 10:02:35.000000000 +0800
-+++ matrixssl/Makefile	2011-09-05 16:12:25.000000000 +0800
-@@ -3,18 +3,18 @@
++++ matrixssl/Makefile	2013-09-08 11:15:57.000000000 +0800
+@@ -1,20 +1,19 @@
  
- CC = gcc
+ #--------------------------------------------------------------------
+ 
+-CC = gcc
  AR = ar cru
 -CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
 +CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC -Dlinux
@@ -24,7 +26,7 @@
  
  SPSERVER_INCL = -I../spserver
  SPSERVER_LIB  = -L../spserver -lspserver
-@@ -37,7 +37,7 @@ libspmatrixssl.so: $(LIBOBJS)
+@@ -37,7 +36,7 @@ libspmatrixssl.so: $(LIBOBJS)
  	$(LINKER) $(SOFLAGS) $^ -o $@
  
  testechos: testechos.o
diff --git a/net/spserver/files/patch-openssl_Makefile b/net/spserver/files/patch-openssl_Makefile
index 318052698b9b..d4cf2547eb3b 100644
--- a/net/spserver/files/patch-openssl_Makefile
+++ b/net/spserver/files/patch-openssl_Makefile
@@ -1,6 +1,10 @@
---- openssl/Makefile.orig	Wed Aug 22 22:03:27 2007
-+++ openssl/Makefile	Fri Aug 24 15:46:20 2007
-@@ -5,7 +5,7 @@
+--- openssl/Makefile.orig	2009-12-13 10:02:34.000000000 +0800
++++ openssl/Makefile	2013-09-08 11:16:13.000000000 +0800
+@@ -1,11 +1,10 @@
+ 
+ #--------------------------------------------------------------------
+ 
+-CC = gcc
  AR = ar cru
  CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
  SOFLAGS = -shared
@@ -9,7 +13,7 @@
  
  LINKER = $(CC)
  LINT = lint -c
-@@ -14,7 +14,7 @@
+@@ -14,7 +13,7 @@ RM = /bin/rm -f
  OPENSSL_INCL = -I/usr/include/openssl/
  OPENSSL_LIB  = -L/usr/lib -lssl -lcrypto
  
diff --git a/net/spserver/files/patch-spserver_Makefile b/net/spserver/files/patch-spserver_Makefile
index ecbb5fe956ba..5e0cdf207a2d 100644
--- a/net/spserver/files/patch-spserver_Makefile
+++ b/net/spserver/files/patch-spserver_Makefile
@@ -1,15 +1,14 @@
 --- spserver/Makefile.orig	2009-12-13 10:02:38.000000000 +0800
-+++ spserver/Makefile	2011-09-05 16:10:49.000000000 +0800
-@@ -1,7 +1,7 @@
++++ spserver/Makefile	2013-09-08 11:16:36.000000000 +0800
+@@ -1,7 +1,6 @@
  
  #--------------------------------------------------------------------
  
 -CC = gcc
-+#CC = gcc
  AR = ar cru
  CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
  SOFLAGS = -shared
-@@ -11,8 +11,8 @@ LINKER = $(CC)
+@@ -11,8 +10,8 @@ LINKER = $(CC)
  LINT = lint -c
  RM = /bin/rm -f
  
diff --git a/net/spserver/files/patch-sptunnel_Makefile b/net/spserver/files/patch-sptunnel_Makefile
new file mode 100644
index 000000000000..dc16e04db34c
--- /dev/null
+++ b/net/spserver/files/patch-sptunnel_Makefile
@@ -0,0 +1,10 @@
+--- sptunnel/Makefile.orig	2013-09-08 11:17:23.000000000 +0800
++++ sptunnel/Makefile	2013-09-08 11:17:35.000000000 +0800
+@@ -1,7 +1,6 @@
+ 
+ #--------------------------------------------------------------------
+ 
+-CC = gcc
+ AR = ar cru
+ CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
+ SOFLAGS = -shared
diff --git a/net/spserver/files/patch-xyssl_Makefile b/net/spserver/files/patch-xyssl_Makefile
index 79950b6d3c5d..dbaa7818a071 100644
--- a/net/spserver/files/patch-xyssl_Makefile
+++ b/net/spserver/files/patch-xyssl_Makefile
@@ -1,6 +1,10 @@
---- xyssl/Makefile.orig	2008-10-04 23:25:56.000000000 +0800
-+++ xyssl/Makefile	2008-10-04 23:27:00.000000000 +0800
-@@ -5,16 +5,16 @@
+--- xyssl/Makefile.orig	2009-12-13 10:02:34.000000000 +0800
++++ xyssl/Makefile	2013-09-08 11:17:09.000000000 +0800
+@@ -1,20 +1,19 @@
+ 
+ #--------------------------------------------------------------------
+ 
+-CC = gcc
  AR = ar cru
  CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
  SOFLAGS = -shared