ports/140711: [patch] security/libssh2: add debug and zlib options

[Sofian Brabez]

>Number:         140711
>Category:       ports
>Synopsis:       [patch] security/libssh2: add debug and zlib options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 20 01:20:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Sofian Brabez
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
FreeBSD freebsd.ifr.lan 7.2-STABLE FreeBSD 7.2-STABLE #2: Thu Nov 19 01:59:45 CET 2009     root at freebsd.ifr.lan:/usr/obj/usr/src/sys/FREEBSD  i386
>Description:
- Add WITH_DEBUG knob
- Add WITH_ZLIB knob
- Clean non necessary lines
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN libssh2.orig/Makefile libssh2/Makefile
--- libssh2.orig/Makefile	2009-11-20 02:05:34.000000000 +0100
+++ libssh2/Makefile	2009-11-20 02:01:12.000000000 +0100
@@ -7,6 +7,7 @@
 
 PORTNAME=	libssh2
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.libssh2.org/download/ \
@@ -18,10 +19,19 @@
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-OPTIONS=	GCRYPT "Use libgcrypt instead of OpenSSL" off
+
+OPTIONS=	DEBUG "Enable pedantic and debug options" off \
+		GCRYPT "Use libgcrypt instead of OpenSSL" off \
+		ZLIB "Use Libz for compression" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.else
+CONFIGURE_ARGS+=	--disable-debug
+.endif
+
 .if defined(WITH_GCRYPT)
 LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=	--with-libgcrypt -with-libgcrypt-prefix=${LOCALBASE} --without-openssl
@@ -29,6 +39,12 @@
 LDFLAGS+=-L${LOCALBASE}/lib
 .endif
 
+.if defined(WITH_ZLIB)
+CONFIGURE_ARGS+=	--with-libz
+.else
+CONFIGURE_ARGS+=	--without-libz
+.endif
+
 MAN3=	libssh2_banner_set.3 \
 	libssh2_base64_decode.3 \
 	libssh2_channel_close.3 \
@@ -125,9 +141,6 @@
 	libssh2_version.3
 
 post-patch:
-	@${REINPLACE_CMD} -e '/ssh2_sample\.o/d' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|SHLIB_SUFFIX_NAME@ |SHLIB_SUFFIX_NAME at .0 |g' \
-		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 


>Release-Note:
>Audit-Trail:
>Unformatted: