svn commit: r347752 - head/net/spserver

[Rene Ladan]

Author: rene
Date: Mon Mar 10 12:43:49 2014
New Revision: 347752
URL: http://svnweb.freebsd.org/changeset/ports/347752
QAT: https://qat.redports.org/buildarchive/r347752/

Log:
  Remove commented-out support for expired security/xyssl
  
  Submitted by:	johans
  Approved by:	portmgr (infrastructure blanket)

Modified:
  head/net/spserver/Makefile
  head/net/spserver/pkg-plist

Modified: head/net/spserver/Makefile
==============================================================================
--- head/net/spserver/Makefile	Mon Mar 10 12:32:36 2014	(r347751)
+++ head/net/spserver/Makefile	Mon Mar 10 12:43:49 2014	(r347752)
@@ -20,8 +20,7 @@ ALL_TARGET=	all build_openssl
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	GNUTLS
-#		MATRIXSSL	"Enable matrixssl support" off \
-#		XYSSL		"Enable xyssl support" off
+#		MATRIXSSL	"Enable matrixssl support" off
 
 .include <bsd.port.options.mk>
 
@@ -41,14 +40,6 @@ PLIST_SUB+=	WITH_GNUTLS=""
 PLIST_SUB+=	WITH_GNUTLS="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MXYSSL}
-BUILD_DEPENDS=	${LOCALBASE}/lib/libxyssl.a:${PORTSDIR}/security/xyssl
-ALL_TARGET+=	build_xyssl
-PLIST_SUB+=	WITH_XYSSL=""
-.else
-PLIST_SUB+=	WITH_XYSSL="@comment "
-.endif
-
 post-patch:
 	${SED} -i -E 's,%PREFIX%,${PREFIX},g' ${WRKSRC}/spserver/Makefile
 	${SED} -i -E 's,%PREFIX%,${PREFIX},g' ${WRKSRC}/gnutls/Makefile
@@ -77,10 +68,4 @@ do-install:
 	@${LN} -s ${PREFIX}/lib/libspmatrixssl.so.1 ${STAGEDIR}/${PREFIX}/lib/libspmatrixssl.so
 .endif
 
-.if ${PORT_OPTIONS:MXYSSL}
-	@${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/pkg-plist
==============================================================================
--- head/net/spserver/pkg-plist	Mon Mar 10 12:32:36 2014	(r347751)
+++ head/net/spserver/pkg-plist	Mon Mar 10 12:43:49 2014	(r347752)
@@ -29,7 +29,6 @@ include/spserver/sputils.hpp
 include/spserver/spwin32buffer.hpp
 include/spserver/spwin32iocp.hpp
 include/spserver/spwin32port.hpp
-%%WITH_XYSSL%%include/spserver/spxyssl.hpp
 %%WITH_GNUTLS%%lib/libspgnutls.so
 %%WITH_GNUTLS%%lib/libspgnutls.so.1
 %%WITH_MATRIXSSL%%lib/libspmatrixssl.so
@@ -38,6 +37,4 @@ lib/libspopenssl.so
 lib/libspopenssl.so.1
 lib/libspserver.so
 lib/libspserver.so.1
-%%WITH_XYSSL%%lib/libspxyssl.so
-%%WITH_XYSSL%%lib/libspxyssl.so.1
 @dirrm include/spserver