Attachment #177493 for bug #214914

View | Details | Raw Unified | Return to bug 214914
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	libssh2
PORTVERSION=	1.8.0
PORTEPOCH=	2
CATEGORIES=	security devel
MASTER_SITES=	http://www.libssh2.org/download/ \


TRACE_CONFIGURE_ENABLE=	debug
GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
GCRYPT_CONFIGURE_ON=	--with-libgcrypt
GCRYPT_CONFIGURE_OFF=	--with-openssl
GCRYPT_CPPFLAGS=	-I${LOCALBASE}/include
GCRYPT_LIBS=		-L${LOCALBASE}/lib
GCRYPT_USES_OFF=	ssl
ZLIB_CONFIGURE_WITH=	libz


.include <bsd.port.pre.mk>

post-patch:
	@${REINPLACE_CMD} -e '/Libs:/s/@LIBS@//' \
		${WRKSRC}/libssh2.pc.in
.if ! ${PORT_OPTIONS:MGCRYPT}
.  if ${SSL_DEFAULT} == base

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (libssh2-1.7.0.tar.gz) = e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584	1	TIMESTAMP = 1479341225
2	SIZE (libssh2-1.7.0.tar.gz) = 811714	2	SHA256 (libssh2-1.8.0.tar.gz) = 39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4
		3	SIZE (libssh2-1.8.0.tar.gz) = 854916




--- configure.orig	2016-11-28 18:30:51 UTC
+++ configure
@@ -14250,9 +14250,9 @@ if test "${with_libgcrypt+set}" = set; t
 
   old_LDFLAGS=$LDFLAGS
   old_CFLAGS=$CFLAGS
-  if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
-    LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
-    CFLAGS="$CFLAGS -I$use_libgcrypt/include"
+  if test -n "$with_libgcrypt_prefix" && test "$with_libgcrypt_prefix" != "no"; then
+    LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
+    CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
   fi
 
 

Return to bug 214914

Lines 2-8 Link Here

(-)Makefile (-6 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libssh2	4	PORTNAME= libssh2
5	PORTVERSION= 1.7.0	5	PORTVERSION= 1.8.0
6	PORTEPOCH= 2	6	PORTEPOCH= 2
7	CATEGORIES= security devel	7	CATEGORIES= security devel
8	MASTER_SITES= http://www.libssh2.org/download/ \	8	MASTER_SITES= http://www.libssh2.org/download/ \
Lines 26-43 TRACE_DESC= Enable debug packet traces Link Here
26		26
27	TRACE_CONFIGURE_ENABLE= debug	27	TRACE_CONFIGURE_ENABLE= debug
28	GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt	28	GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
29	GCRYPT_CONFIGURE_ON= --with-libgcrypt --without-openssl	29	GCRYPT_CONFIGURE_ON= --with-libgcrypt
30	GCRYPT_CONFIGURE_OFF= --without-libgcrypt --with-openssl	30	GCRYPT_CONFIGURE_OFF= --with-openssl
31	GCRYPT_CPPFLAGS= -I${LOCALBASE}/include	31	GCRYPT_CPPFLAGS= -I${LOCALBASE}/include
32	GCRYPT_LIBS= -L${LOCALBASE}/lib	32	GCRYPT_LIBS= -L${LOCALBASE}/lib
33	GCRYPT_USE_OFF= openssl=yes	33	GCRYPT_USES_OFF= ssl
34	ZLIB_CONFIGURE_WITH= libz	34	ZLIB_CONFIGURE_WITH= libz
35		35
36
37	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
38		37
39	post-patch:	38	post-patch:
40	@${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \	39	@${REINPLACE_CMD} -e '/Libs:/s/@LIBS@//' \
41	${WRKSRC}/libssh2.pc.in	40	${WRKSRC}/libssh2.pc.in
42	.if ! ${PORT_OPTIONS:MGCRYPT}	41	.if ! ${PORT_OPTIONS:MGCRYPT}
43	. if ${SSL_DEFAULT} == base	42	. if ${SSL_DEFAULT} == base

Line 0 Link Here

(-)files/patch-configure (+15 lines)
	1	--- configure.orig 2016-11-28 18:30:51 UTC
	2	+++ configure
	3	@@ -14250,9 +14250,9 @@ if test "${with_libgcrypt+set}" = set; t
	4
	5	old_LDFLAGS=$LDFLAGS
	6	old_CFLAGS=$CFLAGS
	7	- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
	8	- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
	9	- CFLAGS="$CFLAGS -I$use_libgcrypt/include"
	10	+ if test -n "$with_libgcrypt_prefix" && test "$with_libgcrypt_prefix" != "no"; then
	11	+ LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
	12	+ CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
	13	fi
	14
	15