svn commit: r362265 - in head/net-mgmt/smokeping: . files

[Rodrigo Osorio]

Author: rodrigo
Date: Sat Jul 19 15:40:49 2014
New Revision: 362265
URL: http://svnweb.freebsd.org/changeset/ports/362265
QAT: https://qat.redports.org/buildarchive/r362265/

Log:
  don't move files in stage dir anymore
  
  Submitted by:	rodrigo (maintainer)
  Approved by:	bapt (mentor)

Added:
  head/net-mgmt/smokeping/files/patch-etc_Makefile.in   (contents, props changed)
Modified:
  head/net-mgmt/smokeping/Makefile
  head/net-mgmt/smokeping/files/patch-htdocs-Makefile.in

Modified: head/net-mgmt/smokeping/Makefile
==============================================================================
--- head/net-mgmt/smokeping/Makefile	Sat Jul 19 15:25:43 2014	(r362264)
+++ head/net-mgmt/smokeping/Makefile	Sat Jul 19 15:40:49 2014	(r362265)
@@ -104,11 +104,6 @@ post-patch:
 		${WRKSRC}/bin/tSmoke
 
 post-install:
-.for FILE in basepage.html config smokemail smokeping_secrets tmail
-	${MV} ${STAGEDIR}/${ETCDIR}/${FILE}.dist ${STAGEDIR}/${ETCDIR}/${FILE}.sample
-.endfor
-	${MV} ${STAGEDIR}/${PREFIX}/smokeping/htdocs/smokeping.fcgi.dist ${STAGEDIR}/${PREFIX}/smokeping/htdocs/smokeping.fcgi.sample
-
 	${MKDIR} ${STAGEDIR}/${PREFIX}/smokeping/htdocs/img
 	${MKDIR} ${STAGEDIR}/${PREFIX}/var/smokeping
 

Added: head/net-mgmt/smokeping/files/patch-etc_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/smokeping/files/patch-etc_Makefile.in	Sat Jul 19 15:40:49 2014	(r362265)
@@ -0,0 +1,12 @@
+--- etc/Makefile.in	2013-03-04 13:07:55.000000000 +0000
++++ etc/Makefile.in.changes	2014-07-19 10:38:59.338305503 +0000
+@@ -258,7 +258,8 @@
+ 	@list='$(etc_DATA)'; test -n "$(etcdir)" || list=; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; \
++          mv $$p $${p%%.dist}.sample; \
++	  echo "$$d$${p%%.dist}.sample"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(etcdir)'"; \

Modified: head/net-mgmt/smokeping/files/patch-htdocs-Makefile.in
==============================================================================
--- head/net-mgmt/smokeping/files/patch-htdocs-Makefile.in	Sat Jul 19 15:25:43 2014	(r362264)
+++ head/net-mgmt/smokeping/files/patch-htdocs-Makefile.in	Sat Jul 19 15:40:49 2014	(r362265)
@@ -1,11 +1,15 @@
---- htdocs/Makefile.in.orig	2013-03-04 14:07:55.000000000 +0100
-+++ htdocs/Makefile.in	2013-05-20 12:58:07.514020869 +0200
-@@ -433,7 +433,7 @@
+--- htdocs/Makefile.in.orig	2013-03-04 13:07:55.000000000 +0000
++++ htdocs/Makefile.in	2014-07-19 10:42:00.470292529 +0000
+@@ -432,9 +432,9 @@
+ 
  install-data-local:
  	$(MKDIR) -p $(DESTDIR)$(HTDOCSDIR)
- 	$(ECHO)	"#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
+-	$(ECHO)	"#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
 -	$(ECHO)	"exec $(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
-+	$(ECHO)	"exec $(prefix)/bin/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
- 	chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
+-	chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
++	$(ECHO)	"#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample
++	$(ECHO)	"exec $(prefix)/bin/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample
++	chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.sample
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.