git: 33f0b7845b89 - main - sysutils/fetchlog: 1.4 → 1.6

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=33f0b7845b89d4a9500fcb06aced902fa3bb879e

commit 33f0b7845b89d4a9500fcb06aced902fa3bb879e
Author:     Alexander Haderer <alexander.haderer@loescap.de>
AuthorDate: 2024-08-23 16:07:50 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-23 16:11:27 +0000

    sysutils/fetchlog: 1.4 → 1.6
    
    Changelog:
    1.5 15 Aug 2024
     - extension: new option '4' for multiline output in a format that is
       required for Nagios 4 plugins
    1.6 22 Aug 2024
     - fix: typo Makefile
    https://fetchlog.sourceforge.net/CHANGES.txt
    
    Improve port:
     - Replace PORTVERSION with DISTVERSION
     - Move PLIST_FILES before PORTDOCS (pet portclippy)
    
    PR:     281011
---
 sysutils/fetchlog/Makefile             | 10 +++++-----
 sysutils/fetchlog/distinfo             |  5 +++--
 sysutils/fetchlog/files/patch-Makefile | 15 ++-------------
 sysutils/fetchlog/pkg-descr            |  3 ---
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/sysutils/fetchlog/Makefile b/sysutils/fetchlog/Makefile
index 0497959c1c56..8354e0ce2952 100644
--- a/sysutils/fetchlog/Makefile
+++ b/sysutils/fetchlog/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	fetchlog
-PORTVERSION=	1.4
-PORTREVISION=	1
+DISTVERSION=	1.6
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -10,10 +9,11 @@ WWW=		https://fetchlog.sourceforge.net/
 
 LICENSE=	GPLv2
 
-PORTDOCS=	CHANGES README README.Nagios README.SNMP
-PORTEXAMPLES=	fetchlog.cfg fetchlog_service.cfg notify.cfg.example
-
 PLIST_FILES=	bin/fetchlog share/man/man1/fetchlog.1.gz
+PORTDOCS=	CHANGES README README.Nagios README.SNMP
+PORTEXAMPLES=	fetchlog.cfg fetchlog_service.cfg notify.cfg.example \
+		check_snmp_fetchlog_b2n check_snmp_fetchlog_bb2b \
+		check_snmp_fetchlog_bb2n
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/sysutils/fetchlog/distinfo b/sysutils/fetchlog/distinfo
index 6584e8b77037..f268eeba8134 100644
--- a/sysutils/fetchlog/distinfo
+++ b/sysutils/fetchlog/distinfo
@@ -1,2 +1,3 @@
-SHA256 (fetchlog-1.4.tar.gz) = 2017cba285b4167fb9f148b4509d7463402820e4e7a04865cec0fe887bd5e13a
-SIZE (fetchlog-1.4.tar.gz) = 32393
+TIMESTAMP = 1724415288
+SHA256 (fetchlog-1.6.tar.gz) = b6afa2b8e55ab560e1fcc30f4af945d54ebfb8935fee967bcd5c26b65666eff2
+SIZE (fetchlog-1.6.tar.gz) = 34174
diff --git a/sysutils/fetchlog/files/patch-Makefile b/sysutils/fetchlog/files/patch-Makefile
index c69aa4dfac18..61a4da6ebac6 100644
--- a/sysutils/fetchlog/files/patch-Makefile
+++ b/sysutils/fetchlog/files/patch-Makefile
@@ -1,17 +1,6 @@
---- Makefile.orig	2010-07-02 10:10:08 UTC
+--- Makefile.orig	2024-08-23 12:01:44 UTC
 +++ Makefile
-@@ -23,8 +23,8 @@ FETCHLOG_VERSION=1.4
- ### compiler
- 
- ### gcc
--CC=gcc
--CFLAGS= -O -Werror -Wall -Wcast-qual -Wstrict-prototypes \
-+CC?=cc
-+CFLAGS+= -O -Wall -Wcast-qual -Wstrict-prototypes \
- 	-Wmissing-prototypes -Wmissing-declarations -Winline -Wcast-align 
- ### cc
- #CC=cc
-@@ -57,7 +57,7 @@ HAS_REGEX=-DHAS_REGEX
+@@ -54,7 +54,7 @@ HAS_REGEX=-DHAS_REGEX
  ### installdir    
  ###   will use $INSTDIR/bin  and  $INSTDIR/man/man1, 
  ###   both dirs have to exist for installation
diff --git a/sysutils/fetchlog/pkg-descr b/sysutils/fetchlog/pkg-descr
index be8454fba88d..36442938328b 100644
--- a/sysutils/fetchlog/pkg-descr
+++ b/sysutils/fetchlog/pkg-descr
@@ -8,6 +8,3 @@ fetchlog works on syslog generated logfiles as well as other logfiles.
 
 fetchlog can be used standalone or as a Nagios (TM) plugin.  Together
 with Net-SNMP one can look at/monitor new messages in remote logfiles.
-
--Alexander Haderer
-alexander.haderer@loescap.de