From owner-svn-ports-head@FreeBSD.ORG Sun Jul 27 00:40:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A7051DCD; Sun, 27 Jul 2014 00:40:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 797C42133; Sun, 27 Jul 2014 00:40:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6R0eUgg060553; Sun, 27 Jul 2014 00:40:30 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6R0eUc4060551; Sun, 27 Jul 2014 00:40:30 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407270040.s6R0eUc4060551@svn.freebsd.org> From: John Marino Date: Sun, 27 Jul 2014 00:40:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363001 - head/sysutils/uptimed 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.18 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: Sun, 27 Jul 2014 00:40:40 -0000 Author: marino Date: Sun Jul 27 00:40:29 2014 New Revision: 363001 URL: http://svnweb.freebsd.org/changeset/ports/363001 QAT: https://qat.redports.org/buildarchive/r363001/ Log: sysutils/uptimed: Fix config path and prevent config file overwrite PR: 187774 Submitted by: Lukasz Wasikowski Modified: head/sysutils/uptimed/Makefile head/sysutils/uptimed/pkg-plist Modified: head/sysutils/uptimed/Makefile ============================================================================== --- head/sysutils/uptimed/Makefile Sun Jul 27 00:27:36 2014 (r363000) +++ head/sysutils/uptimed/Makefile Sun Jul 27 00:40:29 2014 (r363001) @@ -3,7 +3,7 @@ PORTNAME= uptimed PORTVERSION= 0.3.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://podgorny.cz/uptimed/releases/ \ http://www.predatorlabs.net/dl/ @@ -27,13 +27,20 @@ post-patch: 's|/usr/lib/sendmail|/usr/sbin/sendmail| ; \ s|/var/run/uptimed|/var/run/uptimed.pid|' \ ${WRKSRC}/etc/uptimed.conf-dist + @${REINPLACE_CMD} -e \ + 's|/etc/uprecords-cgi/|${PREFIX}/www/cgi-bin/|' \ + ${WRKSRC}/src/uprecords.c post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin ${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/uprecords \ ${STAGEDIR}${PREFIX}/www/cgi-bin/uprecords.cgi - ${INSTALL_DATA} ${WRKSRC}/sample-cgi/* \ - ${STAGEDIR}${PREFIX}/www/cgi-bin + ${INSTALL_DATA} ${WRKSRC}/sample-cgi/uprecords.conf \ + ${STAGEDIR}${PREFIX}/www/cgi-bin/uprecords.conf.sample + ${INSTALL_DATA} ${WRKSRC}/sample-cgi/uprecords.header \ + ${STAGEDIR}${PREFIX}/www/cgi-bin/uprecords.header.sample + ${INSTALL_DATA} ${WRKSRC}/sample-cgi/uprecords.footer \ + ${STAGEDIR}${PREFIX}/www/cgi-bin/uprecords.footer.sample @${MKDIR} ${STAGEDIR}/var/spool/uptimed .include Modified: head/sysutils/uptimed/pkg-plist ============================================================================== --- head/sysutils/uptimed/pkg-plist Sun Jul 27 00:27:36 2014 (r363000) +++ head/sysutils/uptimed/pkg-plist Sun Jul 27 00:40:29 2014 (r363001) @@ -9,8 +9,8 @@ man/man1/uprecords.1.gz man/man8/uptimed.8.gz sbin/uptimed www/cgi-bin/uprecords.cgi -www/cgi-bin/uprecords.conf -www/cgi-bin/uprecords.footer -www/cgi-bin/uprecords.header +www/cgi-bin/uprecords.conf.sample +www/cgi-bin/uprecords.footer.sample +www/cgi-bin/uprecords.header.sample @dirrmtry www/cgi-bin @unexec rmdir /var/spool/uptimed 2>/dev/null || true