Improve SNMP support (fix openssl dependency and add net-snmp5 support).

PR:		ports/53687
Submitted by:	Alex Dupre <sysadmin@alexdupre.com> (maintainer)

6 files changed, 30 insertions, 6 deletions

diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index ccf3d0604ee6..95d650c42340 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -202,10 +202,14 @@ WITH_DOMXML=	yes
 WITH_ICONV_DEP=	yes
 .endif
 
-.if defined(WITH_SNMP) || defined(WITH_POSTGRESQL)
+.if defined(WITH_POSTGRESQL)
 WITH_OPENSSL_DEP=	yes
 .endif
 
+.if defined(WITH_SNMP)
+WITH_OPENSSL=	yes
+.endif
+
 .if defined(WITH_WDDX) || defined(WITH_XMLRPC) || defined(WITH_XSLT)
 WITH_XML_DEP=	yes
 .endif
@@ -484,7 +488,11 @@ CONFIGURE_ARGS+=--enable-shmop
 .endif
 
 .if defined(WITH_SNMP)
+.if exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
+.else
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+.endif
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
 .endif
 
diff --git a/lang/php4/scripts/configure.php b/lang/php4/scripts/configure.php
index c2ba88382cba..2bfa37b5c889 100644
--- a/lang/php4/scripts/configure.php
+++ b/lang/php4/scripts/configure.php
@@ -64,7 +64,7 @@ READLINE	"readline support (CLI only)" ${WITH_READLINE:-OFF} \
 RECODE		"recode support" ${WITH_RECODE:-OFF} \
 SESSION		"session support" ${WITH_SESSION:-OFF} \
 SHMOP		"shmop support" ${WITH_SHMOP:-OFF} \
-SNMP		"SNMP support" ${WITH_SNMP:-OFF} \
+SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
 SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
 SYBASEDB	"Sybase/MS-SQL database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
 SYBASECT	"Sybase/MS-SQL database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index ccf3d0604ee6..95d650c42340 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -202,10 +202,14 @@ WITH_DOMXML=	yes
 WITH_ICONV_DEP=	yes
 .endif
 
-.if defined(WITH_SNMP) || defined(WITH_POSTGRESQL)
+.if defined(WITH_POSTGRESQL)
 WITH_OPENSSL_DEP=	yes
 .endif
 
+.if defined(WITH_SNMP)
+WITH_OPENSSL=	yes
+.endif
+
 .if defined(WITH_WDDX) || defined(WITH_XMLRPC) || defined(WITH_XSLT)
 WITH_XML_DEP=	yes
 .endif
@@ -484,7 +488,11 @@ CONFIGURE_ARGS+=--enable-shmop
 .endif
 
 .if defined(WITH_SNMP)
+.if exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
+.else
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+.endif
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
 .endif
 
diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php
index c2ba88382cba..2bfa37b5c889 100644
--- a/lang/php5/scripts/configure.php
+++ b/lang/php5/scripts/configure.php
@@ -64,7 +64,7 @@ READLINE	"readline support (CLI only)" ${WITH_READLINE:-OFF} \
 RECODE		"recode support" ${WITH_RECODE:-OFF} \
 SESSION		"session support" ${WITH_SESSION:-OFF} \
 SHMOP		"shmop support" ${WITH_SHMOP:-OFF} \
-SNMP		"SNMP support" ${WITH_SNMP:-OFF} \
+SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
 SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
 SYBASEDB	"Sybase/MS-SQL database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
 SYBASECT	"Sybase/MS-SQL database support (CT-lib)" ${WITH_SYBASECT:-OFF} \
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index ccf3d0604ee6..95d650c42340 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -202,10 +202,14 @@ WITH_DOMXML=	yes
 WITH_ICONV_DEP=	yes
 .endif
 
-.if defined(WITH_SNMP) || defined(WITH_POSTGRESQL)
+.if defined(WITH_POSTGRESQL)
 WITH_OPENSSL_DEP=	yes
 .endif
 
+.if defined(WITH_SNMP)
+WITH_OPENSSL=	yes
+.endif
+
 .if defined(WITH_WDDX) || defined(WITH_XMLRPC) || defined(WITH_XSLT)
 WITH_XML_DEP=	yes
 .endif
@@ -484,7 +488,11 @@ CONFIGURE_ARGS+=--enable-shmop
 .endif
 
 .if defined(WITH_SNMP)
+.if exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net/net-snmp4
+.else
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+.endif
 CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack
 .endif
 
diff --git a/lang/php53/scripts/configure.php b/lang/php53/scripts/configure.php
index c2ba88382cba..2bfa37b5c889 100644
--- a/lang/php53/scripts/configure.php
+++ b/lang/php53/scripts/configure.php
@@ -64,7 +64,7 @@ READLINE	"readline support (CLI only)" ${WITH_READLINE:-OFF} \
 RECODE		"recode support" ${WITH_RECODE:-OFF} \
 SESSION		"session support" ${WITH_SESSION:-OFF} \
 SHMOP		"shmop support" ${WITH_SHMOP:-OFF} \
-SNMP		"SNMP support" ${WITH_SNMP:-OFF} \
+SNMP		"SNMP support (implies OPENSSL)" ${WITH_SNMP:-OFF} \
 SOCKETS		"sockets support" ${WITH_SOCKETS:-OFF} \
 SYBASEDB	"Sybase/MS-SQL database support (DB-lib)" ${WITH_SYBASEDB:-OFF} \
 SYBASECT	"Sybase/MS-SQL database support (CT-lib)" ${WITH_SYBASECT:-OFF} \