aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2019-01-04 05:40:51 +0800
committeradamw <adamw@FreeBSD.org>2019-01-04 05:40:51 +0800
commit8f33fe2acc37c6d9aab37c529f9aecdfc1d67150 (patch)
treeeaef0594ed803e726373afeda71f2daef167c846
parent1045e7dd918ae154ac6f22db6347bd2271ad668e (diff)
downloadfreebsd-ports-gnome-8f33fe2acc37c6d9aab37c529f9aecdfc1d67150.tar.gz
freebsd-ports-gnome-8f33fe2acc37c6d9aab37c529f9aecdfc1d67150.tar.zst
freebsd-ports-gnome-8f33fe2acc37c6d9aab37c529f9aecdfc1d67150.zip
Fix config file instructions for goaccess.
I completely misunderstood the config file location for goaccess.conf. The config file hasn't moved to ETCDIR, only the sample file has. The config file is still read from PREFIX/etc. Remove the UPDATING/pkg-message instructions about this, and install the config file to the correct place, along with a PORTREVISION bump. Pointy hat: adamw
-rw-r--r--UPDATING12
-rw-r--r--sysutils/goaccess/Makefile2
-rw-r--r--sysutils/goaccess/files/pkg-message.in8
-rw-r--r--sysutils/goaccess/pkg-plist2
4 files changed, 2 insertions, 22 deletions
diff --git a/UPDATING b/UPDATING
index c8116a630f85..10c45cd3f80b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,18 +6,6 @@ You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20190103:
- AFFECTS: users of sysutils/goaccess
- AUTHOR: adamw@FreeBSD.org
-
- The goaccess.conf location has changed for version 1.3. To preserve
- your settings, you must move your goaccess.conf to the new location.
-
- OLD: ${PREFIX}/etc/goaccess.conf
- NEW: ${PREFIX}/etc/goaccess/goaccess.conf
-
- # mv /usr/local/etc/goaccess.conf /usr/local/etc/goaccess/goaccess.conf
-
-20190103:
AFFECTS: users of multimedia/vlc*
AUTHOR: riggs@FreeBSD.org
diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile
index 7b2c7e3b5346..27bb3024462b 100644
--- a/sysutils/goaccess/Makefile
+++ b/sysutils/goaccess/Makefile
@@ -3,6 +3,7 @@
PORTNAME= goaccess
PORTVERSION= 1.3
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://tar.goaccess.io/
@@ -21,7 +22,6 @@ CFLAGS+= -I${NCURSESINC} -I${LOCALBASE}/include
LDFLAGS+= -L${NCURSESLIB} -L${LOCALBASE}/lib
PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO
-SUB_FILES= pkg-message
OPTIONS_DEFINE= DOCS DEBUG NLS UTF8
OPTIONS_DEFAULT= GEOIP UTF8
diff --git a/sysutils/goaccess/files/pkg-message.in b/sysutils/goaccess/files/pkg-message.in
deleted file mode 100644
index 6dcd29550b12..000000000000
--- a/sysutils/goaccess/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-====================================================================
-
-The goaccess.conf location has changed for goaccess-1.3. To preserve
-your settings, you must move your goaccess.conf to the new location:
-
- mv %%PREFIX%%/etc/goaccess.conf %%ETCDIR%%/goaccess.conf
-
-====================================================================
diff --git a/sysutils/goaccess/pkg-plist b/sysutils/goaccess/pkg-plist
index 03b9e2b4cad7..b9ea5c2d007e 100644
--- a/sysutils/goaccess/pkg-plist
+++ b/sysutils/goaccess/pkg-plist
@@ -1,6 +1,6 @@
bin/goaccess
%%ETCDIR%%/browsers.list
-@sample %%ETCDIR%%/goaccess.conf.sample
+@sample %%ETCDIR%%/goaccess.conf.sample etc/goaccess.conf
man/man1/goaccess.1.gz
%%NLS%%share/locale/es/LC_MESSAGES/goaccess.mo
%%NLS%%share/locale/fr/LC_MESSAGES/goaccess.mo