ports/148786: [MAINTAINER] net-mgmt/zabbix-server: fix libssh2 check; add curl, iodbc, and unixodbc options

[Jim Riggs]

>Number:         148786
>Category:       ports
>Synopsis:       [MAINTAINER] net-mgmt/zabbix-server: fix libssh2 check; add curl, iodbc, and unixodbc options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 20 12:40:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Jim Riggs
>Release:        FreeBSD 6.3-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD zion.christianserving.org 6.3-RELEASE-p2 FreeBSD 6.3-RELEASE-p2 #3: Mon May  5 21:27:22 CDT
>Description:
- fix builds with libssh2 (upstream bug in configure)
- add requested CURL, IODBC, and UNIXODBC options

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- zabbix-server-1.8.2_3,2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/Makefile /root/portwork/zabbix/net-mgmt/zabbix-server/Makefile
--- /usr/ports/net-mgmt/zabbix-server/Makefile	2010-06-30 14:43:40.000000000 -0500
+++ /root/portwork/zabbix/net-mgmt/zabbix-server/Makefile	2010-07-20 07:03:46.000000000 -0500
@@ -7,7 +7,7 @@
 
 PORTNAME=	zabbix
 PORTVERSION=	1.8.2
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -59,11 +59,14 @@
 		PGSQL "Use PostgreSQL backend" off \
 		SQLITE "Use SQLite backend" off \
 		IPV6 "Support for IPv6" on \
+		FPING "Use fping for pinging hosts" on \
+		JABBER "Support for jabber media type" on \
+		CURL "Support web monitoring with cURL" on \
 		LDAP "Support for checking LDAP servers" on \
 		IPMI "Support for IPMI" off \
-		JABBER "Use jabber media type" on \
-		FPING "Use fping for pinging hosts" on \
-		SSH "Use libssh2 for SSH-based checks" off
+		SSH "Support for SSH-based checks" off \
+		IODBC "Support for iODBC" off \
+		UNIXODBC "Support for unixODBC" off
 
 .include <bsd.port.options.mk>
 
@@ -83,6 +86,10 @@
 IGNORE=		zabbix requires a database backend
 .endif
 
+.ifdef WITHOUT_CURL
+CONFIGURE_ARGS+=	--without-libcurl
+.endif
+
 .ifndef WITHOUT_LDAP
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=	--with-ldap
@@ -106,6 +113,20 @@
 LIB_DEPENDS+=	ssh2:${PORTSDIR}/security/libssh2
 CONFIGURE_ARGS+=	--with-ssh2
 .endif
+
+.if defined(WITH_IODBC) && defined(WITH_UNIXODBC)
+IGNORE=	"Cannot build with both iODBC and unixODBC"
+.endif
+
+.ifdef WITH_IODBC
+LIB_DEPENDS+=	iodbc:${PORTSDIR}/databases/libiodbc
+CONFIGURE_ARGS+=	--with-iodbc
+.endif
+
+.ifdef WITH_UNIXODBC
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=	--with-unixodbc
+.endif
 .endif # if ${ZABBIX_BUILD} != "agent"
 
 .ifdef WITH_IPV6
diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/files/patch-configure /root/portwork/zabbix/net-mgmt/zabbix-server/files/patch-configure
--- /usr/ports/net-mgmt/zabbix-server/files/patch-configure	2010-06-05 14:26:08.000000000 -0500
+++ /root/portwork/zabbix/net-mgmt/zabbix-server/files/patch-configure	2010-07-13 09:39:51.000000000 -0500
@@ -1,6 +1,27 @@
-
---- configure.orig	2010-05-17 15:38:52.189911152 +0400
-+++ configure	2010-05-17 15:39:13.793087125 +0400
+--- configure.orig	2010-03-29 12:23:15.000000000 -0500
++++ configure	2010-07-13 09:39:06.000000000 -0500
+@@ -12345,8 +12345,8 @@
+ echo $ECHO_N "checking for SSH2 support... $ECHO_C" >&6; }
+      if test "x$_libssh2_dir" = "xno"; then
+        if test -f /usr/include/libssh2.h; then
+-         SSH2_CFLAGS=-I$/usr/include
+-         SSH2_LDFLAGS=-L$/usr/lib
++         SSH2_CFLAGS=-I/usr/include
++         SSH2_LDFLAGS=-L/usr/lib
+          SSH2_LIBS="-lssh2"
+          found_ssh2="yes"
+ 
+@@ -12383,8 +12383,8 @@
+ 	fi;
+ 
+        elif test -f /usr/local/include/libssh2.h; then
+-         SSH2_CFLAGS=-I$/usr/local/include
+-         SSH2_LDFLAGS=-L$/usr/local/lib
++         SSH2_CFLAGS=-I/usr/local/include
++         SSH2_LDFLAGS=-L/usr/local/lib
+          SSH2_LIBS="-lssh2"
+          found_ssh2="yes"
+ 
 @@ -12472,7 +12472,7 @@
       fi #if test "x$_libssh2_dir" = "xno"; then
    fi # if test "x$want_ssh2" != "xno"; then
@@ -19,5 +40,3 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_SSH2 1
-
-
--- zabbix-server-1.8.2_3,2.patch ends here ---

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