Updated to version 3.9.1. Changelog :

3.9.0 -> 3.9.1
	- Fix off-by-one error which can lead to crash when copytruncate is used.
3.8.9 -> 3.9.0
	- Fix crash when using long dateformat. [nmerdan]
	- Add support for %H dateformat. [czchen]
	- Fix regression introduced in 3.8.9 when when rotating multiple
	  logs when one of them is missing.
	- In the debug mode, do not skip the code-path which handles the case when
	  the last rotation does not exist. [Sergey Vidishev]
	- Show more precise description when "log does not need rotating".\
	- Add new -l option to log verbose output to file. The file is overwritten
	  on every logrotate execution.
	- Allow rotation of sparse files with copytruncate.

PKgsrc changes :
Switched from old Makefile to new building procedure, using autogen,
configure and (g)make, which was introduced in version 3.8.8.
The new patch file contains a workaround to get the new building procedure
working.

3 files changed, 35 insertions, 13 deletions

diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index 568d34a5418..7ac656093eb 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2015/03/11 21:34:16 nils Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/29 12:28:55 nils Exp $
 
-DISTNAME=		logrotate-3.8.9
+DISTNAME=		logrotate-3.9.1
 CATEGORIES=		sysutils
 MASTER_SITES=		https://fedorahosted.org/releases/l/o/logrotate/
 
@@ -9,15 +9,16 @@ HOMEPAGE=		https://fedorahosted.org/logrotate/
 COMMENT=		Daemon to rotate, compress, remove and mail system log files
 LICENSE=		gnu-gpl-v2
 
-USE_TOOLS+=		gmake gzip:run gunzip:run mail:run
+USE_TOOLS+=		gmake gzip:run gunzip:run mail:run automake autoconf
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+HAS_CONFIGURE=		yes
 NO_EXPORT_CPP=		yes
 
-CFLAGS+=		-DSTATEFILE=\"${VARBASE}/db/logrotate.status\"
-CFLAGS+=		-DDEFAULT_MAIL_COMMAND=\"${MAIL_CMD:Q}\"
-CFLAGS+=		-DCOMPRESS_COMMAND=\"${GZIP_CMD:[1]:Q}\"
-CFLAGS+=		-DUNCOMPRESS_COMMAND=\"${GUNZIP_CMD:[1]:Q}\"
-
-MAKE_ENV+=		RPM_OPT_FLAGS=${CFLAGS:Q}
+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}\"
 
 BUILD_DEFS+=		VARBASE
 EGDIR=			${PREFIX}/share/examples/logrotate
@@ -38,6 +39,11 @@ SUBST_VARS.paths+=	VARBASE
 SUBST_VARS.paths+=	PKG_SYSCONFDIR
 
 DOCDIR=			share/doc/logrotate
+
+pre-configure:
+	cd ${WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ./autogen.sh
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/logrotate ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/examples/logrotate-default ${DESTDIR}${EGDIR}/logrotate.conf
diff --git a/sysutils/logrotate/distinfo b/sysutils/logrotate/distinfo
index d2af3785018..ecab07e7449 100644
--- a/sysutils/logrotate/distinfo
+++ b/sysutils/logrotate/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2015/03/11 21:34:16 nils Exp $
+$NetBSD: distinfo,v 1.9 2015/06/29 12:28:55 nils Exp $
 
-SHA1 (logrotate-3.8.9.tar.gz) = 60016413ec2133945bd3b71cbd8274b31686ada4
-RMD160 (logrotate-3.8.9.tar.gz) = 885d2a2e9c4dec531c51db5d562c6103854ab9db
-Size (logrotate-3.8.9.tar.gz) = 77408 bytes
+SHA1 (logrotate-3.9.1.tar.gz) = 7ba734cd1ffa7198b66edc4bca17a28ea8999386
+RMD160 (logrotate-3.9.1.tar.gz) = e2fd3ca124735c5d54c85a7e620b9b018b4066ef
+Size (logrotate-3.9.1.tar.gz) = 79061 bytes
+SHA1 (patch-Makefile.am) = 857e290854f3925e42e85469ac28ea06fad70727
 SHA1 (patch-examples_logrotate-default) = 57fc602caa5eeaa830f5d2dc0667e11330bcd1e8
 SHA1 (patch-examples_logrotate.cron) = 02981cb2b49e3f3f500fcb3db9b5dcb5fe62bddc
 SHA1 (patch-logrotate.8) = 0bf7d9cfbc2f5dfff42a82b523926b9c8d0362a0
diff --git a/sysutils/logrotate/patches/patch-Makefile.am b/sysutils/logrotate/patches/patch-Makefile.am
new file mode 100644
index 00000000000..01936a2a942
--- /dev/null
+++ b/sysutils/logrotate/patches/patch-Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.am,v 1.1 2015/06/29 12:28:55 nils Exp $
+
+Workaround to successfully compile everything
+
+--- Makefile.am.orig	2015-04-03 07:39:35.000000000 +0000
++++ Makefile.am
+@@ -1,7 +1,7 @@
+ MAN = logrotate.8
+ MAN5 = logrotate.conf.5
+ 
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ sbin_PROGRAMS = logrotate
+ logrotate_SOURCES = logrotate.c log.c config.c basenames.c
+