Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Feb 2018 23:49:44 +0000 (UTC)
From:      "Danilo G. Baio" <dbaio@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r461116 - in head/misc/wmweather+: . files
Message-ID:  <201802062349.w16Nnim3085261@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbaio
Date: Tue Feb  6 23:49:44 2018
New Revision: 461116
URL: https://svnweb.freebsd.org/changeset/ports/461116

Log:
  misc/wmweather+: Change location of config file
  
  Update pkg-message to also inform the possibility of use a global config file.
  
  PR:		225681
  Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer)

Modified:
  head/misc/wmweather+/Makefile
  head/misc/wmweather+/files/pkg-message.in

Modified: head/misc/wmweather+/Makefile
==============================================================================
--- head/misc/wmweather+/Makefile	Tue Feb  6 23:13:54 2018	(r461115)
+++ head/misc/wmweather+/Makefile	Tue Feb  6 23:49:44 2018	(r461116)
@@ -3,6 +3,7 @@
 
 PORTNAME=	wmweather+
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	misc windowmaker geography
 MASTER_SITES=	SF/wmweatherplus/wmweather%2B/ \
 		SF/nemysisfreebsdp/misc/:icons
@@ -54,11 +55,14 @@ WM_LIB_DEPENDS=		libWMaker.so:x11-wm/windowmaker
 WM_LIB_DEPENDS_OFF=	libwraster.so:x11-wm/libwraster
 
 post-patch:
-	@${REINPLACE_CMD} -e 's| __THROW __attribute__ ((__noreturn__))|| ; \
-		s|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
+	@${REINPLACE_CMD} \
+		-e 's| __THROW __attribute__ ((__noreturn__))||' \
+		-e 's|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
+		-e 's|"/etc/wmweather+.conf"|"${PREFIX}/etc/wmweather+.conf"|' \
 		${WRKSRC}/${PORTNAME}.c
-	@${REINPLACE_CMD} -e \
-		's|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
+	@${REINPLACE_CMD} \
+		-e 's|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
+		-e 's|/etc/wmweather+.conf|${PREFIX}/etc/wmweather+.conf|' \
 		${WRKSRC}/${PORTNAME}.1.in
 
 do-install:

Modified: head/misc/wmweather+/files/pkg-message.in
==============================================================================
--- head/misc/wmweather+/files/pkg-message.in	Tue Feb  6 23:13:54 2018	(r461115)
+++ head/misc/wmweather+/files/pkg-message.in	Tue Feb  6 23:49:44 2018	(r461116)
@@ -7,11 +7,14 @@ All options are given in the config file and in comman
 Please copy example.conf to yours home directory and adjust it to your needs!
 
     su user
-
     mkdir ~/.wmweather+
-
     cp -a %%EXAMPLESDIR%%/example.conf ~/.wmweather+/conf
+    exit
 
+If you prefer a global configuration file, do
+
+    su root
+    cp -a %%EXAMPLESDIR%%/example.conf %%PREFIX%%/etc/wmweather+.conf
     exit
 
 Have fun!



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802062349.w16Nnim3085261>