svn commit: r425997 - head/net-mgmt/xymon-server

[Mark Felder]

Author: feld
Date: Sat Nov 12 22:23:32 2016
New Revision: 425997
URL: https://svnweb.freebsd.org/changeset/ports/425997

Log:
  www/xymon-server: Fix example Apache config files
  
  The example config files for Apache had nonsense variables strewn
  throughout as we do not use the interactive build process for Xymon
  which would replace them after asking the user a series of questions.
  Sane defaults have been chosen to make the examples more useful to the
  user.

Modified:
  head/net-mgmt/xymon-server/Makefile

Modified: head/net-mgmt/xymon-server/Makefile
==============================================================================
--- head/net-mgmt/xymon-server/Makefile	Sat Nov 12 22:06:09 2016	(r425996)
+++ head/net-mgmt/xymon-server/Makefile	Sat Nov 12 22:23:32 2016	(r425997)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xymon
 PORTVERSION=	4.3.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
@@ -29,9 +29,8 @@ XYMONUSER?=	xymon
 XYMONHOSTNAME?=	xymon.example.com
 XYMONHOSTIP?=	127.0.0.1
 
-USES=		cpe gmake shebangfix
+USES=		cpe gmake shebangfix ssl
 SHEBANG_FILES=	${WRKSRC}/xymond/xymonreports.sh.DIST ${WRKSRC}/build/upgrade430.sh
-USE_OPENSSL=	yes
 MAKE_JOBS_UNSAFE=	yes
 CONFIGURE_ENV=	MAKE=gmake
 MAKE_ENV+=	XYMONUSER="${XYMONUSER}"
@@ -73,6 +72,13 @@ post-patch:
 	${REINPLACE_CMD} -e 's|TRACEROUTE="traceroute"|TRACEROUTE="mtr -c 2 -n --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
 	${RM} ${WRKSRC}/docs/manpages/man1/xymonping.1.html
 	${RM} ${WRKSRC}/xymonnet/xymonping.1
+	${REINPLACE_CMD} -e 's|@CGIDIR@|${WWWDIR}/server/cgi-bin|g' \
+	-e 's|@SECURECGIDIR@|${WWWDIR}/server/cgi-secure|g' \
+	-e 's|@INSTALLETCDIR@|${WWWDIR}/server/etc|g' \
+	-e 's|@INSTALLWWWDIR@|${WWWDIR}/server/www|g' \
+	-e 's|@SECUREXYMONCGIURL@|/cgi-secure|g' \
+	-e 's|@XYMONCGIURL@|/cgi-bin|g' \
+	-e 's|@XYMONHOSTURL@|/xymon|g' ${WRKSRC}/xymond/etcfiles/xymon-apache-*.DIST
 
 # Configure script is interactive
 do-configure: