Update to 3.8.2, from Nils Ratusznik via pkgsrc-wip.

Changes:
- show error and ignore config if '{' is not present after log files declaration
- support whitespaces in compressoptions directive
- support for tilde expansion in config files
- fixed mail sending for 'mailfirst', 'dateext' and 'delaycompress' combination
- do not use gzip/gunzip from /usr/local on Solaris
- Do not include alloca.h on NetBSD, since alloca() is declared in stdlib.h there

8 files changed, 16 insertions, 75 deletions

diff --git a/sysutils/logrotate/MESSAGE b/sysutils/logrotate/MESSAGE
index 9d2338e35a5..b940b5d3f84 100644
--- a/sysutils/logrotate/MESSAGE
+++ b/sysutils/logrotate/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
+$NetBSD: MESSAGE,v 1.2 2013/01/10 18:16:29 wiz Exp $
 To set up ${PKGNAME}:
 
 1/ modify ${PKG_SYSCONFDIR}/logrotate.conf to your needs,
@@ -9,5 +9,5 @@ ${PKG_SYSCONFDIR}/logrotate.d/
 2/ set up a daily cron job for logrotate in ${ROOT_USER}'s crontab;
 this can be done with one of the following line:
 0 0 * * * /bin/sh ${EGDIR}/logrotate.cron
-0 0 * * * ${PREFIX}/bin/logrotate ${PKG_SYSCONFDIR}/logrotate.conf
+0 0 * * * ${PREFIX}/sbin/logrotate ${PKG_SYSCONFDIR}/logrotate.conf
 ===========================================================================
diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index e105a966400..66697709fd7 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/10/23 19:51:11 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/01/10 18:16:29 wiz Exp $
 #
 
-DISTNAME=		logrotate-3.8.1
+DISTNAME=		logrotate-3.8.2
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_GENTOO:=distfiles/}
 MASTER_SITES+=		${MASTER_SITE_FREEBSD:=distfiles/}
@@ -15,9 +15,9 @@ USE_TOOLS+=		gmake gzip:run gunzip:run mail:run
 NO_EXPORT_CPP=		yes
 
 CFLAGS+=		-DSTATEFILE=\"${VARBASE}/db/logrotate.status\"
-CFLAGS+=		-DDEFAULT_MAIL_COMMAND=\"${MAIL_CMD}\"
-CFLAGS+=		-DCOMPRESS_COMMAND=\"${GZIP_CMD:[1]}\"
-CFLAGS+=		-DUNCOMPRESS_COMMAND=\"${GUNZIP_CMD:[1]}\"
+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}
 
@@ -26,7 +26,7 @@ EGDIR=			${PREFIX}/share/examples/logrotate
 CONF_FILES=		${EGDIR}/logrotate.conf ${PKG_SYSCONFDIR}/logrotate.conf
 OWN_DIRS=		${PKG_SYSCONFDIR}/logrotate.d
 MESSAGE_SUBST+=		EGDIR=${EGDIR}
-
+INSTALLATION_DIRS+=	${EGDIR} ${PKG_SYSCONFDIR} ${OWN_DIRS}
 AUTO_MKDIRS=		yes
 
 SUBST_CLASSES+=		paths
diff --git a/sysutils/logrotate/PLIST b/sysutils/logrotate/PLIST
index e8385a6977b..28dabfa0d1d 100644
--- a/sysutils/logrotate/PLIST
+++ b/sysutils/logrotate/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/01/10 18:16:29 wiz Exp $
 man/man5/logrotate.conf.5
 man/man8/logrotate.8
 sbin/logrotate
diff --git a/sysutils/logrotate/distinfo b/sysutils/logrotate/distinfo
index df0afee79fa..2fbbebce2e9 100644
--- a/sysutils/logrotate/distinfo
+++ b/sysutils/logrotate/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
+$NetBSD: distinfo,v 1.2 2013/01/10 18:16:29 wiz Exp $
 
-SHA1 (logrotate-3.8.1.tar.gz) = 1df36cee76a9c4c7438f35ca3599a7bdd68a09b5
-RMD160 (logrotate-3.8.1.tar.gz) = cec3bc6a4cb4226b31696977935818695027b0f8
-Size (logrotate-3.8.1.tar.gz) = 48827 bytes
-SHA1 (patch-config.c) = 4f0f173a193c290578d427b96625f44ceb6ba5e4
-SHA1 (patch-config.h) = f0b52b984d0711e2250326805c2a3f7582807d48
-SHA1 (patch-examples_logrotate-default) = 01fedd4e0f62231c670dd0c023776136c006f2d8
+SHA1 (logrotate-3.8.2.tar.gz) = 5832a34199e75c24df6c3028494d90145f275234
+RMD160 (logrotate-3.8.2.tar.gz) = 5e6c1006f590e72c6f36b639a4e0fcf4e49eb029
+Size (logrotate-3.8.2.tar.gz) = 51213 bytes
+SHA1 (patch-examples_logrotate-default) = df9671836392d99f2b31116aee18e51996dee173
 SHA1 (patch-examples_logrotate.cron) = 02981cb2b49e3f3f500fcb3db9b5dcb5fe62bddc
 SHA1 (patch-logrotate.8) = f37f746a3cccfd81e322ca5ef52c6fcb67d337d9
-SHA1 (patch-logrotate.c) = b5a3bb73329f30608edc5c73b00956492fc81637
diff --git a/sysutils/logrotate/patches/patch-config.c b/sysutils/logrotate/patches/patch-config.c
deleted file mode 100644
index 1e2ae421248..00000000000
--- a/sysutils/logrotate/patches/patch-config.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-config.c,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
-
-Compatibility patch for systems not using alloca.h .
-Patch commited upstream
-
---- config.c.orig	2011-08-31 12:39:04.000000000 +0000
-+++ config.c
-@@ -1,6 +1,9 @@
- #include <sys/queue.h>
-+#ifdef _ALLOCA_H
- #include <alloca.h>
-+#else
- #include <limits.h>
-+#endif
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
diff --git a/sysutils/logrotate/patches/patch-config.h b/sysutils/logrotate/patches/patch-config.h
deleted file mode 100644
index 3fd5c09e45a..00000000000
--- a/sysutils/logrotate/patches/patch-config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-config.h,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
-
-Values will be passed from pkgsrc.
-
---- config.h.orig	2011-08-31 12:39:04.000000000 +0000
-+++ config.h
-@@ -4,6 +4,7 @@
- 
- #define ROOT_UID 0
- 
-+/*
- #ifdef __hpux
- #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx"
- #define COMPRESS_COMMAND "/usr/contrib/bin/gzip"
-@@ -24,6 +25,7 @@
-    #define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
-    #define STATEFILE "/var/log/logrotate.status"
- #endif
-+*/
- 
- /*
-  * Default settings for Linux - leave these last.
diff --git a/sysutils/logrotate/patches/patch-examples_logrotate-default b/sysutils/logrotate/patches/patch-examples_logrotate-default
index ed1a1d17e9c..48d5a3a3df7 100644
--- a/sysutils/logrotate/patches/patch-examples_logrotate-default
+++ b/sysutils/logrotate/patches/patch-examples_logrotate-default
@@ -1,4 +1,4 @@
-$NetBSD: patch-examples_logrotate-default,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
+$NetBSD: patch-examples_logrotate-default,v 1.2 2013/01/10 18:16:29 wiz Exp $
 
 Add pkgsrc paths compatibility.
 
@@ -26,6 +26,6 @@ Add pkgsrc paths compatibility.
 -    rotate 1
 -}
 +# Packages drop log rotation information into this directory
-+include @PKG_SYSCONFDIR@/etc/logrotate.d
++include @PKG_SYSCONFDIR@/logrotate.d
  
  # system-specific logs may be also be configured here.
diff --git a/sysutils/logrotate/patches/patch-logrotate.c b/sysutils/logrotate/patches/patch-logrotate.c
deleted file mode 100644
index aab0a4103cb..00000000000
--- a/sysutils/logrotate/patches/patch-logrotate.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-logrotate.c,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
-
-Compatibility patch for systems not using alloca.h .
-Patch commited upstream. 
-
---- logrotate.c.orig	2011-08-31 12:39:04.000000000 +0000
-+++ logrotate.c
-@@ -1,6 +1,9 @@
- #include <sys/queue.h>
-+#ifdef _ALLOCA_H
- #include <alloca.h>
-+#else
- #include <limits.h>
-+#endif
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>