svn commit: r302382 - in head/net-mgmt/xymon-server: . files

[Dirk Meyer]

Author: dinoex
Date: Fri Aug 10 10:34:59 2012
New Revision: 302382
URL: http://svn.freebsd.org/changeset/ports/302382

Log:
  - fix build of showgraph
  - bump PORTREVISION

Modified:
  head/net-mgmt/xymon-server/Makefile
  head/net-mgmt/xymon-server/files/Makefile
  head/net-mgmt/xymon-server/pkg-plist

Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile	Fri Aug 10 09:03:12 2012	(r302381)
+++ head/net-mgmt/xymon-server/Makefile	Fri Aug 10 10:34:59 2012	(r302382)
@@ -7,6 +7,7 @@
 
 PORTNAME=	xymon
 PORTVERSION=	4.3.10
+PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}

Modified: head/net-mgmt/xymon-server/files/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/files/Makefile	Fri Aug 10 09:03:12 2012	(r302381)
+++ head/net-mgmt/xymon-server/files/Makefile	Fri Aug 10 10:34:59 2012	(r302382)
@@ -39,30 +39,35 @@ SECUREXYMONCGIURL = /xymon-seccgi
 # Webserver group-ID
 HTTPDGID=80
 
+# PCRE settings
+PCREINCDIR = -I${LOCALBASE}/include
+PCRELIBS = -L${LOCALBASE}/lib -lpcre
+RPATHVAL += ${LOCALBASE}/lib
+
 # RRDtool settings
 RRDDEF = -DRRDTOOL12
 RRDINCDIR = -I${LOCALBASE}/include
 RRDLIBS = -L${LOCALBASE}/lib -lrrd -L${LOCALBASE}/lib -lpng
 RPATHVAL += ${LOCALBASE}/lib
-
-# PCRE settings
-PCREINCDIR = -I${LOCALBASE}/include
-PCRELIBS = -L${LOCALBASE}/lib -lpcre
-RPATHVAL += ${LOCALBASE}/lib
+DORRD = yes
 #
 # OpenSSL settings
-SSLFLAGS = -DHAVE_OPENSSL=1
+SSLFLAGS = -DHAVE_OPENSSL -DHAVE_SSLV2_SUPPORT
 SSLINCDIR = -I${OPENSSLINC}
 SSLLIBS = -L${OPENSSLLIB} -lssl -lcrypto
 RPATHVAL += ${OPENSSLLIB}
+DOSSL = yes
 #
 ifdef WITH_LDAP
 # OpenLDAP settings
 LDAPFLAGS = -DXYMON_LDAP -DXYMON_LDAP_USESTARTTLS
 LDAPINCDIR = -I${PREFIX}/include
-LDAPLIBS = -L${PREFIX}/lib -lldap -llber
+LDAPLIBS = -L${PREFIX}/lib -lldap
 RPATHVAL += ${PREFIX}/lib
+RPATHVAL += /usr/local/lib
+DOLDAP = yes
 endif
+#
 # clock_gettime() settings
 LIBRTDEF = 
 

Modified: head/net-mgmt/xymon-server/pkg-plist
==============================================================================
--- head/net-mgmt/xymon-server/pkg-plist	Fri Aug 10 09:03:12 2012	(r302381)
+++ head/net-mgmt/xymon-server/pkg-plist	Fri Aug 10 10:34:59 2012	(r302382)
@@ -19,8 +19,10 @@
 %%WWWDIR%%/cgi-bin/hostlist.sh
 %%WWWDIR%%/cgi-bin/nongreen.sh
 %%WWWDIR%%/cgi-bin/notifications.sh
+%%WWWDIR%%/cgi-bin/perfdata.sh
 %%WWWDIR%%/cgi-bin/report.sh
 %%WWWDIR%%/cgi-bin/reportlog.sh
+%%WWWDIR%%/cgi-bin/showgraph.sh
 %%WWWDIR%%/cgi-bin/snapshot.sh
 %%WWWDIR%%/cgi-bin/svcstatus.sh
 %%WWWDIR%%/cgi-bin/topchanges.sh
@@ -55,10 +57,12 @@
 %%WWWDIR%%/server/bin/hostlist.cgi
 %%WWWDIR%%/server/bin/moverrd.sh
 %%WWWDIR%%/server/bin/notifications.cgi
+%%WWWDIR%%/server/bin/perfdata.cgi
 %%WWWDIR%%/server/bin/renamevars
 %%WWWDIR%%/server/bin/report.cgi
 %%WWWDIR%%/server/bin/reportlog.cgi
 %%WWWDIR%%/server/bin/rrdcachectl
+%%WWWDIR%%/server/bin/showgraph.cgi
 %%WWWDIR%%/server/bin/snapshot.cgi
 %%WWWDIR%%/server/bin/statusreport.cgi
 %%WWWDIR%%/server/bin/svcstatus.cgi
@@ -81,6 +85,7 @@
 %%WWWDIR%%/server/bin/xymond_history
 %%WWWDIR%%/server/bin/xymond_hostdata
 %%WWWDIR%%/server/bin/xymond_locator
+%%WWWDIR%%/server/bin/xymond_rrd
 %%WWWDIR%%/server/bin/xymond_sample
 %%WWWDIR%%/server/bin/xymondigest
 %%WWWDIR%%/server/bin/xymonfetch