logrotate-git : update to latest git commit for master branch.

[Nils Ratusznik <nils%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Nils Ratusznik <nils%NetBSD.org@localhost>
Pushed By:	nils
Date:		Thu Jan 26 21:24:05 2017 +0100
Changeset:	772bb752f63fff81b5af568a5dbe866a5978d349

Modified Files:
	logrotate-git/Makefile
	logrotate-git/PLIST
	logrotate-git/distinfo
	logrotate-git/patches/patch-examples_logrotate-default
	logrotate-git/patches/patch-examples_logrotate.cron
Added Files:
	logrotate-git/patches/patch-config.c
Removed Files:
	logrotate-git/patches/patch-logrotate.8

Log Message:
logrotate-git : update to latest git commit for master branch.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=772bb752f63fff81b5af568a5dbe866a5978d349

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 logrotate-git/Makefile                             | 10 ++++----
 logrotate-git/PLIST                                |  5 ++--
 logrotate-git/distinfo                             | 15 ++++++------
 logrotate-git/patches/patch-config.c               | 16 +++++++++++++
 .../patches/patch-examples_logrotate-default       |  6 ++---
 .../patches/patch-examples_logrotate.cron          |  6 ++---
 logrotate-git/patches/patch-logrotate.8            | 28 ----------------------
 7 files changed, 38 insertions(+), 48 deletions(-)

diffs:
diff --git a/logrotate-git/Makefile b/logrotate-git/Makefile
index a5d52d8..ca42685 100644
--- a/logrotate-git/Makefile
+++ b/logrotate-git/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2015/06/29 12:28:55 nils Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/26 20:12:32 nils Exp $
 
 DISTNAME=		${GHCOMMIT}
-PKGNAME=		logrotate-3.10.0.20160812
+PKGNAME=		logrotate-3.11.0.20170123
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GITHUB:=logrotate/logrotate/archive/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=		https://github.com/logrotate/logrotate/
 COMMENT=		Daemon to rotate, compress, remove and mail system log files
 LICENSE=		gnu-gpl-v2
 
-GHCOMMIT=		6c0dfc4a3d3b0535a4848d4ccb92631016a20a2d
+GHCOMMIT=		58e33d126e9422ac5271d6bda724c9065564a440
 USE_TOOLS+=		gmake gzip:run gunzip:run mail:run automake autoconf
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -22,6 +22,7 @@ CONFIGURE_ENV+=		STATEFILE=\"${VARBASE}/db/logrotate.status\"
 CONFIGURE_ENV+=		DEFAULT_MAIL_COMMAND=\"${MAIL_CMD:Q}\"
 CONFIGURE_ENV+=		COMPRESS_COMMAND=\"${GZIP_CMD:[1]:Q}\"
 CONFIGURE_ENV+=		UNCOMPRESS_COMMAND=\"${GUNZIP_CMD:[1]:Q}\"
+CONFIGURE_ARGS+=	--with-state-file-path="${VARBASE}/db/logrotate.status"
 
 BUILD_DEFS+=		VARBASE
 EGDIR=			${PREFIX}/share/examples/logrotate
@@ -36,7 +37,6 @@ SUBST_STAGE.paths=	pre-build
 SUBST_MESSAGE.paths=	Substituting paths variables.
 SUBST_FILES.paths=	examples/logrotate-default
 SUBST_FILES.paths+=	examples/logrotate.cron
-SUBST_FILES.paths+=	logrotate.8
 SUBST_VARS.paths=	PREFIX
 SUBST_VARS.paths+=	VARBASE
 SUBST_VARS.paths+=	PKG_SYSCONFDIR
@@ -52,7 +52,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/logrotate-default ${DESTDIR}${EGDIR}/logrotate.conf
 	${INSTALL_DATA} ${WRKSRC}/examples/logrotate.cron ${DESTDIR}/${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.* ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog.md ${DESTDIR}${PREFIX}/${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/${DOCDIR}
 	${INSTALL_MAN} ${WRKSRC}/logrotate.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
 	${INSTALL_MAN} ${WRKSRC}/logrotate.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
diff --git a/logrotate-git/PLIST b/logrotate-git/PLIST
index e0f0627..64c3306 100644
--- a/logrotate-git/PLIST
+++ b/logrotate-git/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.4 2017/01/26 20:12:32 nils Exp $
 man/man5/logrotate.conf.5
 man/man8/logrotate.8
 sbin/logrotate
-share/doc/logrotate/CHANGES
 share/doc/logrotate/COPYING
+share/doc/logrotate/ChangeLog.md
 share/doc/logrotate/README.HPUX
 share/doc/logrotate/README.Solaris
 share/doc/logrotate/README.md
 share/examples/logrotate/logrotate.conf
 share/examples/logrotate/logrotate.cron
+@pkgdir etc/logrotate.d
diff --git a/logrotate-git/distinfo b/logrotate-git/distinfo
index 04e35cb..ca09597 100644
--- a/logrotate-git/distinfo
+++ b/logrotate-git/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 01:32:20 agc Exp $
+$NetBSD: distinfo,v 1.13 2017/01/26 20:12:32 nils Exp $
 
-SHA1 (6c0dfc4a3d3b0535a4848d4ccb92631016a20a2d.tar.gz) = 24e204bdf26c0f110db8a8bf0e09b4c19dc7a655
-RMD160 (6c0dfc4a3d3b0535a4848d4ccb92631016a20a2d.tar.gz) = 8cfbd1b330240526bf9f9ac580dd31428d63d73f
-SHA512 (6c0dfc4a3d3b0535a4848d4ccb92631016a20a2d.tar.gz) = c2fee60cf77522b82a4fe397e83bc6908bb66920a14cbc09afa6c48629630e3c36351824405706abc7516b929d167d335ed2496636d459ddeb1b9f151c6a014e
-Size (6c0dfc4a3d3b0535a4848d4ccb92631016a20a2d.tar.gz) = 79570 bytes
-SHA1 (patch-examples_logrotate-default) = 57fc602caa5eeaa830f5d2dc0667e11330bcd1e8
-SHA1 (patch-examples_logrotate.cron) = 02981cb2b49e3f3f500fcb3db9b5dcb5fe62bddc
+SHA1 (58e33d126e9422ac5271d6bda724c9065564a440.tar.gz) = ace0b73de92266406acaa5d86aaca2493a2a24ba
+RMD160 (58e33d126e9422ac5271d6bda724c9065564a440.tar.gz) = 4c83ca4c58345fd4da2109f7fdbfc58adacc66bb
+SHA512 (58e33d126e9422ac5271d6bda724c9065564a440.tar.gz) = 66246f052ade1033e78e2e530499868d7bff34b926d31bba50b0ca949117441bf77e834efb5f7658140c5301ad45ddd8a80186c6df767e47b4998b55bafa4227
+Size (58e33d126e9422ac5271d6bda724c9065564a440.tar.gz) = 85348 bytes
+SHA1 (patch-config.c) = a6c775599857f01fa11bb99113795794f46664f5
+SHA1 (patch-examples_logrotate-default) = 6d3f575cc6563dd8c00dad4b1baa4e9d5eadae3b
+SHA1 (patch-examples_logrotate.cron) = e7e7a3f0ff77b3ee5fbf69ee2acecac136b0be8f
 SHA1 (patch-logrotate.8) = 0bf7d9cfbc2f5dfff42a82b523926b9c8d0362a0
diff --git a/logrotate-git/patches/patch-config.c b/logrotate-git/patches/patch-config.c
new file mode 100644
index 0000000..da4ae74
--- /dev/null
+++ b/logrotate-git/patches/patch-config.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-config.c,v 1.5 2017/01/26 20:12:32 nils Exp $
+
+Fix NetBSD compilation.
+
+--- config.c.orig	2016-12-02 13:12:33.000000000 +0000
++++ config.c
+@@ -3,6 +3,9 @@
+ #ifndef __NetBSD__
+ #include <alloca.h>
+ #endif
++#ifndef _LIBGEN_H_
++#  include <libgen.h>
++#endif
+ #include <limits.h>
+ #include <ctype.h>
+ #include <dirent.h>
diff --git a/logrotate-git/patches/patch-examples_logrotate-default b/logrotate-git/patches/patch-examples_logrotate-default
index e94203c..e1f3e86 100644
--- a/logrotate-git/patches/patch-examples_logrotate-default
+++ b/logrotate-git/patches/patch-examples_logrotate-default
@@ -1,8 +1,8 @@
-$NetBSD: patch-examples_logrotate-default,v 1.3 2015/03/11 21:34:16 nils Exp $
+$NetBSD: patch-examples_logrotate-default,v 1.4 2017/01/26 20:12:32 nils Exp $
 
 Add pkgsrc paths compatibility.
 
---- examples/logrotate-default.orig	2014-10-16 11:12:35.000000000 +0000
+--- examples/logrotate-default.orig	2016-12-02 13:12:33.000000000 +0000
 +++ examples/logrotate-default
 @@ -14,22 +14,7 @@ dateext
  # uncomment this if you want your log files compressed
@@ -26,6 +26,6 @@ Add pkgsrc paths compatibility.
 -    rotate 1
 -}
 +# Packages drop log rotation information into this directory
-+include @PKG_SYSCONFDIR@/logrotate.d
++include /usr/pkg/etc/logrotate.d
  
  # system-specific logs may be also be configured here.
diff --git a/logrotate-git/patches/patch-examples_logrotate.cron b/logrotate-git/patches/patch-examples_logrotate.cron
index 490c6e0..854d450 100644
--- a/logrotate-git/patches/patch-examples_logrotate.cron
+++ b/logrotate-git/patches/patch-examples_logrotate.cron
@@ -1,14 +1,14 @@
-$NetBSD: patch-examples_logrotate.cron,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
+$NetBSD: patch-examples_logrotate.cron,v 1.2 2017/01/26 20:12:32 nils Exp $
 
 Add pkgsrc paths compatibility
 
---- examples/logrotate.cron.orig	2011-08-31 12:39:04.000000000 +0000
+--- examples/logrotate.cron.orig	2016-12-02 13:12:33.000000000 +0000
 +++ examples/logrotate.cron
 @@ -1,6 +1,6 @@
  #!/bin/sh
  
 -/usr/sbin/logrotate /etc/logrotate.conf
-+@PREFIX@/sbin/logrotate @PKG_SYSCONFDIR@/logrotate.conf
++/usr/pkg/sbin/logrotate /usr/pkg/etc/logrotate.conf
  EXITVALUE=$?
  if [ $EXITVALUE != 0 ]; then
      /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"
diff --git a/logrotate-git/patches/patch-logrotate.8 b/logrotate-git/patches/patch-logrotate.8
deleted file mode 100644
index 4c6ca2f..0000000
--- a/logrotate-git/patches/patch-logrotate.8
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-logrotate.8,v 1.3 2013/07/28 11:21:23 obache Exp $
-
-Add pkgsrc paths compatibility
-
---- logrotate.8.orig	2013-06-10 12:02:36.000000000 +0000
-+++ logrotate.8
-@@ -59,7 +59,7 @@ and mail it to the recipient. The defaul
- \fB\-s\fR, \fB\-\-state <statefile>\fR
- Tells \fBlogrotate\fR to use an alternate state file.  This is useful
- if logrotate is being run as a different user for various sets of
--log files.  The default state file is \fI/var/lib/logrotate.status\fR.
-+log files.  The default state file is \fI@VARBASE@/db/logrotate.status\fR.
- 
- .TP
- \fB\-\-usage\fR
-@@ -523,10 +523,10 @@ Log files are rotated if the current yea
- .SH FILES
- .PD 0
- .TP 27
--\fI/var/lib/logrotate.status\fR
-+\fI@VARBASE@/db/logrotate.status\fR
- Default state file.
- .TP 27
--\fI/etc/logrotate.conf\fR
-+\fI@PKG_SYSCONFDIR@/logrotate.conf\fR
- Configuration options.
- 
- .SH SEE ALSO