diff options
| author | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2014-07-19 15:40:49 +0000 |
|---|---|---|
| committer | Rodrigo Osorio <rodrigo@FreeBSD.org> | 2014-07-19 15:40:49 +0000 |
| commit | 37cc8339fbb41a91bd9e0a22a90d70e9f3a32a5a (patch) | |
| tree | e46be3b4d69f67bff9b72136b5da9a0d3ffec9ab /net-mgmt | |
| parent | 5ea5e6fbea4e59cce2099fa52a3db9dc73394640 (diff) | |
| download | ports-37cc8339fbb41a91bd9e0a22a90d70e9f3a32a5a.tar.gz ports-37cc8339fbb41a91bd9e0a22a90d70e9f3a32a5a.zip | |
Notes
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/smokeping/Makefile | 5 | ||||
| -rw-r--r-- | net-mgmt/smokeping/files/patch-etc_Makefile.in | 12 | ||||
| -rw-r--r-- | net-mgmt/smokeping/files/patch-htdocs-Makefile.in | 16 |
3 files changed, 22 insertions, 11 deletions
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 8d79c54937ac..9f36a839f7e5 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -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 diff --git a/net-mgmt/smokeping/files/patch-etc_Makefile.in b/net-mgmt/smokeping/files/patch-etc_Makefile.in new file mode 100644 index 000000000000..f3e6f231e0d9 --- /dev/null +++ b/net-mgmt/smokeping/files/patch-etc_Makefile.in @@ -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)'"; \ diff --git a/net-mgmt/smokeping/files/patch-htdocs-Makefile.in b/net-mgmt/smokeping/files/patch-htdocs-Makefile.in index 540cd365ba4b..a7b826211c56 100644 --- a/net-mgmt/smokeping/files/patch-htdocs-Makefile.in +++ b/net-mgmt/smokeping/files/patch-htdocs-Makefile.in @@ -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. |