- Unbreak the incompatible build with libssh2-0.16 and later.

  PECL::Bug #11770 Error installing ssh2-0.10
  http://pecl.php.net/bugs/bug.php?id=11779
- Fix libssh2 version checks.
- Update to 0.11

Obtained from:	upstream, oeriksson at mandriva dot com
Reported by:	many
Approved by:	rafan (mentor, implicit)

4 files changed, 73 insertions, 7 deletions

diff --git a/security/pecl-ssh2/Makefile b/security/pecl-ssh2/Makefile
index d292c8093095..68097daa9b14 100644
--- a/security/pecl-ssh2/Makefile
+++ b/security/pecl-ssh2/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	ssh2
-PORTVERSION=	0.10
+PORTVERSION=	0.11
 CATEGORIES=	security pear
-MASTER_SITES=	http://pecl.php.net/get/
+MASTER_SITES=	LOCAL/chinsan/PECL/
 PKGNAMEPREFIX=	pecl-
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PECL
@@ -21,7 +21,9 @@ LIB_DEPENDS=	ssh2:${PORTSDIR}/security/libssh2
 USE_PHP=	yes
 USE_PHPEXT=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's, -ldl,,' ${WRKSRC}/config.m4
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${EXTRA_LIBS}"
+
+CONFIGURE_ARGS=	--with-ssh2
 
 .include <bsd.port.mk>
diff --git a/security/pecl-ssh2/distinfo b/security/pecl-ssh2/distinfo
index 0a89959be8b9..6730e4aaa56e 100644
--- a/security/pecl-ssh2/distinfo
+++ b/security/pecl-ssh2/distinfo
@@ -1,3 +1,3 @@
-MD5 (PECL/ssh2-0.10.tgz) = 95bdbd6a9a0d14cb65c6d6bdc9ee1770
-SHA256 (PECL/ssh2-0.10.tgz) = 7e149a364fe23d49471402b35d4cb42611c8538065c722195d0e8521b95ab575
-SIZE (PECL/ssh2-0.10.tgz) = 22187
+MD5 (PECL/ssh2-0.11.tgz) = 103a71b89671ee2b597e079f88455022
+SHA256 (PECL/ssh2-0.11.tgz) = 0125d1b4e32d667c36af8c5803ac21fd5f56e65bf9075eb77b4363540bd8359c
+SIZE (PECL/ssh2-0.11.tgz) = 24960
diff --git a/security/pecl-ssh2/files/patch-config.m4 b/security/pecl-ssh2/files/patch-config.m4
new file mode 100644
index 000000000000..c9a5559c9f25
--- /dev/null
+++ b/security/pecl-ssh2/files/patch-config.m4
@@ -0,0 +1,53 @@
+--- config.m4	2006-03-15 03:10:23.000000000 +0100
++++ config.m4.oden	2007-08-07 17:00:07.000000000 +0200
+@@ -31,12 +31,12 @@
+ 
+   PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
+   [
+-    PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SSH2_DIR/lib, SSH2_SHARED_LIBADD)
++    PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $SSH2_DIR/$PHP_LIBDIR, SSH2_SHARED_LIBADD)
+     AC_DEFINE(HAVE_SSH2LIB,1,[Have libssh2])
+   ],[
+     AC_MSG_ERROR([libssh2 version >= 0.4 not found])
+   ],[
+-    -L$SSH2_DIR/lib -lm 
++    -L$SSH2_DIR/$PHP_LIBDIR -lm 
+   ])
+ 
+   PHP_CHECK_LIBRARY($LIBNAME,libssh2_channel_forward_listen_ex,
+@@ -45,7 +45,7 @@
+   ],[
+     AC_MSG_WARN([libssh2 <= 0.4, remote forwarding not enabled])
+   ],[
+-    -L$SSH2_DIR/lib -lm 
++    -L$SSH2_DIR/$PHP_LIBDIR -lm 
+   ])
+ 
+   PHP_CHECK_LIBRARY($LIBNAME,libssh2_userauth_hostbased_fromfile_ex,
+@@ -54,7 +54,7 @@
+   ],[
+     AC_MSG_WARN([libssh2 <= 0.6, hostbased authentication not enabled])
+   ],[
+-    -L$SSH2_DIR/lib -lm 
++    -L$SSH2_DIR/$PHP_LIBDIR -lm 
+   ])
+ 
+   PHP_CHECK_LIBRARY($LIBNAME,libssh2_poll,
+@@ -63,7 +63,7 @@
+   ],[
+     AC_MSG_WARN([libssh2 <= 0.7, poll support not enabled])
+   ],[
+-    -L$SSH2_DIR/lib -lm 
++    -L$SSH2_DIR/$PHP_LIBDIR -lm 
+   ])
+ 
+   PHP_CHECK_LIBRARY($LIBNAME,libssh2_publickey_init,
+@@ -72,7 +72,7 @@
+   ],[
+     AC_MSG_WARN([libssh2 <= 0.11, publickey subsystem support not enabled])
+   ],[
+-    -L$SSH2_DIR/lib -lm 
++    -L$SSH2_DIR/$PHP_LIBDIR -lm 
+   ])
+   
+   PHP_SUBST(SSH2_SHARED_LIBADD)
diff --git a/security/pecl-ssh2/files/patch-ssh2.c b/security/pecl-ssh2/files/patch-ssh2.c
new file mode 100644
index 000000000000..9a59644d2d5a
--- /dev/null
+++ b/security/pecl-ssh2/files/patch-ssh2.c
@@ -0,0 +1,11 @@
+--- ssh2.c	2006-06-07 19:35:34.000000000 +0200
++++ ssh2.c.oden	2007-08-07 17:32:29.000000000 +0200
+@@ -484,7 +484,7 @@
+ 
+ 	ZEND_FETCH_RESOURCE(session, LIBSSH2_SESSION*, &zsession, -1, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
+ 
+-#if LIBSSH2_APINO < 200412301450
++#if LIBSSH2_VERSION_NUM < 0x001000
+ 	libssh2_session_methods(session, &kex, &hostkey, &crypt_cs, &crypt_sc, &mac_cs, &mac_sc, &comp_cs, &comp_sc, &lang_cs, &lang_sc);
+ #else
+ 	kex = libssh2_session_methods(session, LIBSSH2_METHOD_KEX);