Date: Sat, 7 Sep 2013 15:45:23 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326642 - in head/net-p2p/dclib: . files Message-ID: <201309071545.r87FjNNk082212@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Sat Sep 7 15:45:23 2013 New Revision: 326642 URL: http://svnweb.freebsd.org/changeset/ports/326642 Log: - Fix build on CURRENT (change in OpenSSL API) - While at it, trim Makefile headers and use new LIB_DEPENDS format Reported by: pkg-fallout Added: head/net-p2p/dclib/files/extra-dclib-core_cssl.cpp (contents, props changed) Modified: head/net-p2p/dclib/Makefile (contents, props changed) Modified: head/net-p2p/dclib/Makefile ============================================================================== --- head/net-p2p/dclib/Makefile Sat Sep 7 14:56:48 2013 (r326641) +++ head/net-p2p/dclib/Makefile Sat Sep 7 15:45:23 2013 (r326642) @@ -1,11 +1,6 @@ -# ex: ts=8 -# New ports collection makefile for: dclib -# Date created: Wed 10 Jul 2002 -# Whom: Sverrir Valgeirsson <e96sv@yahoo.se> and -# Amar Takhar <verm@drunkmonk.net> et al -# +# Created by: Sverrir Valgeirsson <e96sv@yahoo.se> and +# Amar Takhar <verm@drunkmonk.net> et al # $FreeBSD$ -# PORTNAME= dclib PORTVERSION= 0.3.23 @@ -16,7 +11,7 @@ MASTER_SITES= SF/wxdcgui/${PORTNAME}/${P MAINTAINER= gahr@FreeBSD.org COMMENT= Direct connect interface library for valknut -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/${DISTNAME} @@ -27,6 +22,12 @@ USE_GNOME= libxml2 CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 1000015 +EXTRA_PATCHES= ${FILESDIR}/extra-dclib-core_cssl.cpp +.endif + post-extract: ${CHMOD} 0755 ${WRKSRC}/admin/install-sh @@ -41,4 +42,4 @@ post-patch: ${REINPLACE_CMD} -e 's|-D_XOPEN_SOURCE=500||g; \ s|-D_BSD_SOURCE||g' ${WRKSRC}/configure ${WRKSRC}/configure.in -.include <bsd.port.mk> +.include <bsd.port.post.mk> Added: head/net-p2p/dclib/files/extra-dclib-core_cssl.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/dclib/files/extra-dclib-core_cssl.cpp Sat Sep 7 15:45:23 2013 (r326642) @@ -0,0 +1,38 @@ +--- dclib/core/cssl.cpp.orig 2013-09-07 16:26:31.000000000 +0200 ++++ dclib/core/cssl.cpp 2013-09-07 16:28:11.000000000 +0200 +@@ -86,7 +86,7 @@ + /** */ + SSL_CTX * CSSL::InitClientCTX() + { +- SSL_METHOD *method; ++ const SSL_METHOD *method; + SSL_CTX *ctx = NULL; + + method = SSLv23_client_method(); /* Create new client-method instance */ +@@ -109,7 +109,7 @@ + /** */ + SSL_CTX * CSSL::InitServerCTX() + { +- SSL_METHOD *method; ++ const SSL_METHOD *method; + SSL_CTX *ctx = NULL; + + method = SSLv23_server_method(); /* Create new client-method instance */ +@@ -130,7 +130,7 @@ + /** */ + SSL_CTX * CSSL::NewTLSv1ClientCTX() + { +- SSL_METHOD * method = TLSv1_client_method(); ++ const SSL_METHOD * method = TLSv1_client_method(); + SSL_CTX * ctx = NULL; + + if ( method != NULL ) +@@ -149,7 +149,7 @@ + /** */ + SSL_CTX * CSSL::NewTLSv1ServerCTX() + { +- SSL_METHOD * method = TLSv1_server_method(); ++ const SSL_METHOD * method = TLSv1_server_method(); + SSL_CTX * ctx = NULL; + + if ( method != NULL )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309071545.r87FjNNk082212>