aboutsummaryrefslogtreecommitdiff
path: root/net/spserver
diff options
context:
space:
mode:
authorVanilla I. Shu <vanilla@FreeBSD.org>2013-09-24 16:47:45 +0000
committerVanilla I. Shu <vanilla@FreeBSD.org>2013-09-24 16:47:45 +0000
commitafc99aa14a0a7f657a9af97ff9a5db27fe88bd81 (patch)
treee130c9565ce452b67bacc8df6e880900ee2483f5 /net/spserver
parent172810a1035de217cebd549deeff5d9d1d5486e2 (diff)
downloadports-afc99aa14a0a7f657a9af97ff9a5db27fe88bd81.tar.gz
ports-afc99aa14a0a7f657a9af97ff9a5db27fe88bd81.zip
Notes
Diffstat (limited to 'net/spserver')
-rw-r--r--net/spserver/Makefile33
-rw-r--r--net/spserver/files/patch-gnutls_Makefile5
-rw-r--r--net/spserver/files/patch-matrixssl_Makefile4
-rw-r--r--net/spserver/files/patch-openssl_Makefile5
-rw-r--r--net/spserver/files/patch-spserver_Makefile9
-rw-r--r--net/spserver/files/patch-sptunnel_Makefile11
-rw-r--r--net/spserver/files/patch-xyssl_Makefile5
7 files changed, 40 insertions, 32 deletions
diff --git a/net/spserver/Makefile b/net/spserver/Makefile
index 9b977eb76e53..642ea2832490 100644
--- a/net/spserver/Makefile
+++ b/net/spserver/Makefile
@@ -23,7 +23,6 @@ OPTIONS_DEFINE= GNUTLS
# MATRIXSSL "Enable matrixssl support" off \
# XYSSL "Enable xyssl support" off
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMATRIXSSL}
@@ -58,30 +57,30 @@ post-patch:
${SED} -i -E 's,%PREFIX%,${PREFIX},g' ${WRKSRC}/xyssl/Makefile
do-install:
- @${MKDIR} ${PREFIX}/include/spserver
- @${INSTALL} ${WRKSRC}/spserver/*.hpp ${PREFIX}/include/spserver
- @${INSTALL} ${WRKSRC}/spserver/libspserver.so ${PREFIX}/lib/libspserver.so.1
- @${LN} -s ${PREFIX}/lib/libspserver.so.1 ${PREFIX}/lib/libspserver.so
- @${INSTALL} ${WRKSRC}/openssl/spopenssl.hpp ${PREFIX}/include/spserver
- @${INSTALL} ${WRKSRC}/openssl/libspopenssl.so ${PREFIX}/lib/libspopenssl.so.1
- @${LN} -s ${PREFIX}/lib/libspopenssl.so.1 ${PREFIX}/lib/libspopenssl.so
+ @${MKDIR} ${STAGEDIR}/${PREFIX}/include/spserver
+ @${INSTALL} ${WRKSRC}/spserver/*.hpp ${STAGEDIR}/${PREFIX}/include/spserver
+ @${INSTALL} ${WRKSRC}/spserver/libspserver.so ${STAGEDIR}/${PREFIX}/lib/libspserver.so.1
+ @${LN} -s ${PREFIX}/lib/libspserver.so.1 ${STAGEDIR}/${PREFIX}/lib/libspserver.so
+ @${INSTALL} ${WRKSRC}/openssl/spopenssl.hpp ${STAGEDIR}/${PREFIX}/include/spserver
+ @${INSTALL} ${WRKSRC}/openssl/libspopenssl.so ${STAGEDIR}/${PREFIX}/lib/libspopenssl.so.1
+ @${LN} -s ${PREFIX}/lib/libspopenssl.so.1 ${STAGEDIR}/${PREFIX}/lib/libspopenssl.so
.if ${PORT_OPTIONS:MGNUTLS}
- @${INSTALL} ${WRKSRC}/gnutls/spgnutls.hpp ${PREFIX}/include/spserver
- @${INSTALL} ${WRKSRC}/gnutls/libspgnutls.so ${PREFIX}/lib/libspgnutls.so.1
- @${LN} -s ${PREFIX}/lib/libspgnutls.so.1 ${PREFIX}/lib/libspgnutls.so
+ @${INSTALL} ${WRKSRC}/gnutls/spgnutls.hpp ${STAGEDIR}/${PREFIX}/include/spserver
+ @${INSTALL} ${WRKSRC}/gnutls/libspgnutls.so ${STAGEDIR}/${PREFIX}/lib/libspgnutls.so.1
+ @${LN} -s ${PREFIX}/lib/libspgnutls.so.1 ${STAGEDIR}/${PREFIX}/lib/libspgnutls.so
.endif
.if ${PORT_OPTIONS:MMATRIXSSL}
- @${INSTALL} ${WRKSRC}/matrixssl/spmatrixssl.hpp ${PREFIX}/include/spserver
- @${INSTALL} ${WRKSRC}/matrixssl/libspmatrixssl.so ${PREFIX}/lib/libspmatrixssl.so.1
- @${LN} -s ${PREFIX}/lib/libspmatrixssl.so.1 ${PREFIX}/lib/libspmatrixssl.so
+ @${INSTALL} ${WRKSRC}/matrixssl/spmatrixssl.hpp ${STAGEDIR}/${PREFIX}/include/spserver
+ @${INSTALL} ${WRKSRC}/matrixssl/libspmatrixssl.so ${STAGEDIR}/${PREFIX}/lib/libspmatrixssl.so.1
+ @${LN} -s ${PREFIX}/lib/libspmatrixssl.so.1 ${STAGEDIR}/${PREFIX}/lib/libspmatrixssl.so
.endif
.if ${PORT_OPTIONS:MXYSSL}
- @${INSTALL} ${WRKSRC}/xyssl/spxyssl.hpp ${PREFIX}/include/spserver
- @${INSTALL} ${WRKSRC}/xyssl/libspxyssl.so ${PREFIX}/lib/libspxyssl.so.1
- @${LN} -s ${PREFIX}/lib/libspxyssl.so.1 ${PREFIX}/lib/libspxyssl.so
+ @${INSTALL} ${WRKSRC}/xyssl/spxyssl.hpp ${STAGEDIR}/${PREFIX}/include/spserver
+ @${INSTALL} ${WRKSRC}/xyssl/libspxyssl.so ${STAGEDIR}/${PREFIX}/lib/libspxyssl.so.1
+ @${LN} -s ${PREFIX}/lib/libspxyssl.so.1 ${STAGEDIR}/${PREFIX}/lib/libspxyssl.so
.endif
.include <bsd.port.mk>
diff --git a/net/spserver/files/patch-gnutls_Makefile b/net/spserver/files/patch-gnutls_Makefile
index 232f53e68c2f..2cb7a860a68d 100644
--- a/net/spserver/files/patch-gnutls_Makefile
+++ b/net/spserver/files/patch-gnutls_Makefile
@@ -1,12 +1,13 @@
--- gnutls/Makefile.orig 2009-12-13 10:02:39.000000000 +0800
-+++ gnutls/Makefile 2013-09-08 11:15:38.000000000 +0800
++++ gnutls/Makefile 2013-09-08 21:03:21.000000000 +0800
@@ -1,20 +1,19 @@
#--------------------------------------------------------------------
-CC = gcc
AR = ar cru
- CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
+-CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
++CFLAGS += -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
SOFLAGS = -shared
-LDFLAGS = -lstdc++ -lpthread -lresolv
+LDFLAGS = -lstdc++ -lpthread
diff --git a/net/spserver/files/patch-matrixssl_Makefile b/net/spserver/files/patch-matrixssl_Makefile
index 8fe9acf12ee0..a107c0b3e569 100644
--- a/net/spserver/files/patch-matrixssl_Makefile
+++ b/net/spserver/files/patch-matrixssl_Makefile
@@ -1,5 +1,5 @@
--- matrixssl/Makefile.orig 2009-12-13 10:02:35.000000000 +0800
-+++ matrixssl/Makefile 2013-09-08 11:15:57.000000000 +0800
++++ matrixssl/Makefile 2013-09-08 21:03:12.000000000 +0800
@@ -1,20 +1,19 @@
#--------------------------------------------------------------------
@@ -7,7 +7,7 @@
-CC = gcc
AR = ar cru
-CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
-+CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC -Dlinux
++CFLAGS += -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC -Dlinux
SOFLAGS = -shared
-LDFLAGS = -lstdc++ -lpthread -lresolv
+LDFLAGS = -lstdc++ -lpthread
diff --git a/net/spserver/files/patch-openssl_Makefile b/net/spserver/files/patch-openssl_Makefile
index d4cf2547eb3b..d27254e612d4 100644
--- a/net/spserver/files/patch-openssl_Makefile
+++ b/net/spserver/files/patch-openssl_Makefile
@@ -1,12 +1,13 @@
--- openssl/Makefile.orig 2009-12-13 10:02:34.000000000 +0800
-+++ openssl/Makefile 2013-09-08 11:16:13.000000000 +0800
++++ openssl/Makefile 2013-09-08 21:03:07.000000000 +0800
@@ -1,11 +1,10 @@
#--------------------------------------------------------------------
-CC = gcc
AR = ar cru
- CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
+-CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
++CFLAGS += -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
SOFLAGS = -shared
-LDFLAGS = -lstdc++ -lpthread -lresolv
+LDFLAGS = -lstdc++ -lpthread
diff --git a/net/spserver/files/patch-spserver_Makefile b/net/spserver/files/patch-spserver_Makefile
index 5e0cdf207a2d..4080ecc4f990 100644
--- a/net/spserver/files/patch-spserver_Makefile
+++ b/net/spserver/files/patch-spserver_Makefile
@@ -1,13 +1,16 @@
--- spserver/Makefile.orig 2009-12-13 10:02:38.000000000 +0800
-+++ spserver/Makefile 2013-09-08 11:16:36.000000000 +0800
-@@ -1,7 +1,6 @@
++++ spserver/Makefile 2013-09-08 21:02:47.000000000 +0800
+@@ -1,9 +1,8 @@
#--------------------------------------------------------------------
-CC = gcc
AR = ar cru
- CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
+-CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
++CFLAGS += -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
SOFLAGS = -shared
+ LDFLAGS = -lstdc++ -lpthread
+
@@ -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
index dc16e04db34c..4e6e58a26103 100644
--- a/net/spserver/files/patch-sptunnel_Makefile
+++ b/net/spserver/files/patch-sptunnel_Makefile
@@ -1,10 +1,13 @@
---- 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 @@
+--- sptunnel/Makefile.orig 2009-12-13 10:02:35.000000000 +0800
++++ sptunnel/Makefile 2013-09-08 21:02:59.000000000 +0800
+@@ -1,9 +1,8 @@
#--------------------------------------------------------------------
-CC = gcc
AR = ar cru
- CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
+-CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
++CFLAGS += -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
SOFLAGS = -shared
+ LDFLAGS = -lstdc++ -lpthread -lresolv
+
diff --git a/net/spserver/files/patch-xyssl_Makefile b/net/spserver/files/patch-xyssl_Makefile
index dbaa7818a071..30669a2a3186 100644
--- a/net/spserver/files/patch-xyssl_Makefile
+++ b/net/spserver/files/patch-xyssl_Makefile
@@ -1,12 +1,13 @@
--- xyssl/Makefile.orig 2009-12-13 10:02:34.000000000 +0800
-+++ xyssl/Makefile 2013-09-08 11:17:09.000000000 +0800
++++ xyssl/Makefile 2013-09-08 21:03:33.000000000 +0800
@@ -1,20 +1,19 @@
#--------------------------------------------------------------------
-CC = gcc
AR = ar cru
- CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
+-CFLAGS = -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
++CFLAGS += -Wall -D_REENTRANT -D_GNU_SOURCE -g -fPIC
SOFLAGS = -shared
-LDFLAGS = -lstdc++ -lpthread -lresolv
+LDFLAGS = -lstdc++ -lpthread
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 22:37:32 +0000