svn commit: r363001 - head/sysutils/uptimed

[John Marino]

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 <bsd.port.mk>

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