From owner-svn-ports-head@FreeBSD.ORG Fri Mar 7 12:53:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9ECF45A; Fri, 7 Mar 2014 12:53:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AC553BDD; Fri, 7 Mar 2014 12:53:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s27CrecH041255; Fri, 7 Mar 2014 12:53:40 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s27CreJU041254; Fri, 7 Mar 2014 12:53:40 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201403071253.s27CreJU041254@svn.freebsd.org> From: Dmitry Marakasov Date: Fri, 7 Mar 2014 12:53:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347380 - head/security/libssh2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Mar 2014 12:53:40 -0000 Author: amdmi3 Date: Fri Mar 7 12:53:40 2014 New Revision: 347380 URL: http://svnweb.freebsd.org/changeset/ports/347380 QAT: https://qat.redports.org/buildarchive/r347380/ Log: - Use new OPTIONS features - Remove useless (with staging support) maintainer target - Fix pkgconfig file PR: 185891 Submitted by: amdmi3 Approved by: maintainer timeout Modified: head/security/libssh2/Makefile Modified: head/security/libssh2/Makefile ============================================================================== --- head/security/libssh2/Makefile Fri Mar 7 12:08:08 2014 (r347379) +++ head/security/libssh2/Makefile Fri Mar 7 12:53:40 2014 (r347380) @@ -3,7 +3,7 @@ PORTNAME= libssh2 PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= security devel MASTER_SITES= http://www.libssh2.org/download/ \ @@ -22,37 +22,22 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= GCRYPT TRACE ZLIB OPTIONS_DEFAULT= ZLIB -.include - TRACE_DESC= Enable debug packet traces -.include - -.if ${PORT_OPTIONS:MTRACE} -CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --disable-debug -.endif - -.if ${PORT_OPTIONS:MGCRYPT} -LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt -CONFIGURE_ARGS+= --with-libgcrypt -with-libgcrypt-prefix=${LOCALBASE} --without-openssl -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif - -.if ${PORT_OPTIONS:MZLIB} -CONFIGURE_ARGS+= --with-libz -.else -CONFIGURE_ARGS+= --without-libz -.endif +TRACE_CONFIGURE_ENABLE= debug +GCRYPT_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt +GCRYPT_CONFIGURE_ON= --with-libgcrypt -with-libgcrypt-prefix=${LOCALBASE} --without-openssl +GCRYPT_CFLAGS= -I${LOCALBASE}/include +GCRYPT_LDFLAGS= -L${LOCALBASE}/lib +ZLIB_CONFIGURE_WITH= libz -# allow maintainer to generate MAN3 manpages list (make extract is required before) -x-generate-man3: extract - @(cd ${WRKSRC}/docs && ${LS} -1F *.3 | ${SORT} | ${CUT} -d '/' -f4 \ - | ${GREP} -v template) +.include post-patch: +.if defined(WITH_OPENSSL_BASE) + @${REINPLACE_CMD} -e '/LIBSREQUIRED=/ s|libssl,libcrypto||' \ + ${WRKSRC}/configure.ac ${WRKSRC}/configure +.endif @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in