From owner-svn-ports-head@freebsd.org Sat Nov 12 22:23:33 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5FEFFC3EFDA; Sat, 12 Nov 2016 22:23:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 167BD191F; Sat, 12 Nov 2016 22:23:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uACMNWYo050767; Sat, 12 Nov 2016 22:23:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uACMNWIu050766; Sat, 12 Nov 2016 22:23:32 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201611122223.uACMNWIu050766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 12 Nov 2016 22:23:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425997 - head/net-mgmt/xymon-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Nov 2016 22:23:33 -0000 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: