From owner-svn-ports-all@freebsd.org Wed Jan 11 11:15:28 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 89D91CABF3D; Wed, 11 Jan 2017 11:15:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 644EE1C7E; Wed, 11 Jan 2017 11:15:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0BBFRWd030285; Wed, 11 Jan 2017 11:15:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0BBFRJL030283; Wed, 11 Jan 2017 11:15:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701111115.v0BBFRJL030283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 11 Jan 2017 11:15:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431172 - in head/net-p2p/dclib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 11:15:28 -0000 Author: amdmi3 Date: Wed Jan 11 11:15:27 2017 New Revision: 431172 URL: https://svnweb.freebsd.org/changeset/ports/431172 Log: - Add LICENSE - Switch to USES=ssl - Switch to USES=localbase - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL Added: head/net-p2p/dclib/files/patch-dclib-core_cssl.cpp - copied unchanged from r431171, head/net-p2p/dclib/files/extra-dclib-core_cssl.cpp Deleted: head/net-p2p/dclib/files/extra-dclib-core_cssl.cpp Modified: head/net-p2p/dclib/Makefile Modified: head/net-p2p/dclib/Makefile ============================================================================== --- head/net-p2p/dclib/Makefile Wed Jan 11 10:51:54 2017 (r431171) +++ head/net-p2p/dclib/Makefile Wed Jan 11 11:15:27 2017 (r431172) @@ -10,29 +10,22 @@ MASTER_SITES= SF/wxdcgui/${PORTNAME}/${P MAINTAINER= ports@FreeBSD.org COMMENT= Direct connect interface library for valknut -WRKSRC= ${WRKDIR}/${DISTNAME} +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING +WRKSRC= ${WRKDIR}/${DISTNAME} + +USES= jpeg libtool localbase pathfix ssl tar:bzip2 GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= jpeg libtool pathfix tar:bzip2 USE_GNOME= libxml2 +INSTALL_TARGET= install-strip USE_LDCONFIG= yes -USE_OPENSSL= yes - -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib - -.include - -.if ${OSVERSION} >= 1000015 -EXTRA_PATCHES= ${FILESDIR}/extra-dclib-core_cssl.cpp -.endif post-patch: - ${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ - ${REINPLACE_CMD} -e 's|dclib-0.3/||g' - ${REINPLACE_CMD} -e 's|-0.3||g' ${WRKSRC}/dclib.pc.in - ${REINPLACE_CMD} -e 's|-D_XOPEN_SOURCE=500||g; \ - s|-D_BSD_SOURCE||g' ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ + ${REINPLACE_CMD} -e 's|dclib-0.3/||g' + @${REINPLACE_CMD} -e 's|-0.3||g' ${WRKSRC}/dclib.pc.in + @${REINPLACE_CMD} -e 's|-D_XOPEN_SOURCE=500||g; \ + s|-D_BSD_SOURCE||g' ${WRKSRC}/configure .include Copied: head/net-p2p/dclib/files/patch-dclib-core_cssl.cpp (from r431171, 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/patch-dclib-core_cssl.cpp Wed Jan 11 11:15:27 2017 (r431172, copy of r431171, head/net-p2p/dclib/files/extra-dclib-core_cssl.cpp) @@ -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 )