Date: Fri, 7 Mar 2014 12:53:40 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347380 - head/security/libssh2 Message-ID: <201403071253.s27CreJU041254@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> - TRACE_DESC= Enable debug packet traces -.include <bsd.port.pre.mk> - -.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 <bsd.port.pre.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403071253.s27CreJU041254>