Date: Tue, 24 Sep 2013 16:47:45 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328167 - in head/net/spserver: . files Message-ID: <201309241647.r8OGljY7005792@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Tue Sep 24 16:47:45 2013 New Revision: 328167 URL: http://svnweb.freebsd.org/changeset/ports/328167 Log: 1: Add support of STAGE. 2: do not overwrite CFLAGS. Modified: head/net/spserver/Makefile head/net/spserver/files/patch-gnutls_Makefile head/net/spserver/files/patch-matrixssl_Makefile head/net/spserver/files/patch-openssl_Makefile head/net/spserver/files/patch-spserver_Makefile head/net/spserver/files/patch-sptunnel_Makefile head/net/spserver/files/patch-xyssl_Makefile Modified: head/net/spserver/Makefile ============================================================================== --- head/net/spserver/Makefile Tue Sep 24 16:47:23 2013 (r328166) +++ head/net/spserver/Makefile Tue Sep 24 16:47:45 2013 (r328167) @@ -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> Modified: head/net/spserver/files/patch-gnutls_Makefile ============================================================================== --- head/net/spserver/files/patch-gnutls_Makefile Tue Sep 24 16:47:23 2013 (r328166) +++ head/net/spserver/files/patch-gnutls_Makefile Tue Sep 24 16:47:45 2013 (r328167) @@ -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 Modified: head/net/spserver/files/patch-matrixssl_Makefile ============================================================================== --- head/net/spserver/files/patch-matrixssl_Makefile Tue Sep 24 16:47:23 2013 (r328166) +++ head/net/spserver/files/patch-matrixssl_Makefile Tue Sep 24 16:47:45 2013 (r328167) @@ -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 Modified: head/net/spserver/files/patch-openssl_Makefile ============================================================================== --- head/net/spserver/files/patch-openssl_Makefile Tue Sep 24 16:47:23 2013 (r328166) +++ head/net/spserver/files/patch-openssl_Makefile Tue Sep 24 16:47:45 2013 (r328167) @@ -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 Modified: head/net/spserver/files/patch-spserver_Makefile ============================================================================== --- head/net/spserver/files/patch-spserver_Makefile Tue Sep 24 16:47:23 2013 (r328166) +++ head/net/spserver/files/patch-spserver_Makefile Tue Sep 24 16:47:45 2013 (r328167) @@ -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 Modified: head/net/spserver/files/patch-sptunnel_Makefile ============================================================================== --- head/net/spserver/files/patch-sptunnel_Makefile Tue Sep 24 16:47:23 2013 (r328166) +++ head/net/spserver/files/patch-sptunnel_Makefile Tue Sep 24 16:47:45 2013 (r328167) @@ -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 + Modified: head/net/spserver/files/patch-xyssl_Makefile ============================================================================== --- head/net/spserver/files/patch-xyssl_Makefile Tue Sep 24 16:47:23 2013 (r328166) +++ head/net/spserver/files/patch-xyssl_Makefile Tue Sep 24 16:47:45 2013 (r328167) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309241647.r8OGljY7005792>