From owner-svn-ports-head@FreeBSD.ORG Thu May 14 07:51:12 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 008E944D; Thu, 14 May 2015 07:51:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1F6C1BA7; Thu, 14 May 2015 07:51:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4E7pBGe033180; Thu, 14 May 2015 07:51:11 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4E7p9cm033166; Thu, 14 May 2015 07:51:09 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201505140751.t4E7p9cm033166@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 14 May 2015 07:51:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386301 - in head/sysutils/logrotate: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 May 2015 07:51:12 -0000 Author: madpilot Date: Thu May 14 07:51:09 2015 New Revision: 386301 URL: https://svnweb.freebsd.org/changeset/ports/386301 Log: - Update to 3.8.9 - Add LICENSE - Use @sample in plist - While here, regenerate patches to silence portlint warnings PR: 196668 Submitted by: jyoung15 at gmail.com Approved by: Balazs Nagy (maintainer) Modified: head/sysutils/logrotate/Makefile head/sysutils/logrotate/distinfo head/sysutils/logrotate/files/patch-Makefile head/sysutils/logrotate/files/patch-config.c head/sysutils/logrotate/files/patch-config.h head/sysutils/logrotate/files/patch-logrotate.8 head/sysutils/logrotate/files/patch-logrotate.c head/sysutils/logrotate/pkg-plist Modified: head/sysutils/logrotate/Makefile ============================================================================== --- head/sysutils/logrotate/Makefile Thu May 14 07:50:23 2015 (r386300) +++ head/sysutils/logrotate/Makefile Thu May 14 07:51:09 2015 (r386301) @@ -2,13 +2,15 @@ # $FreeBSD$ PORTNAME= logrotate -PORTVERSION= 3.8.8 +PORTVERSION= 3.8.9 CATEGORIES= sysutils MASTER_SITES= https://fedorahosted.org/releases/l/o/logrotate/ MAINTAINER= js@iksz.hu COMMENT= Daemon to rotate, compress, remove, and mail system log files +LICENSE= GPLv2 + LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt PATCH_STRIP= -p1 @@ -17,9 +19,9 @@ MAKE_ENV= "BASEDIR=${PREFIX}" CPP= ${CC} -E post-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @${SED} -e 's|__PREFIX__|${PREFIX}|' \ < ${FILESDIR}/logrotate.conf.sample > ${STAGEDIR}${PREFIX}/etc/logrotate.conf.sample - @${INSTALL_DATA} ${FILESDIR}/syslog.sample ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${FILESDIR}/syslog.sample ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/sysutils/logrotate/distinfo ============================================================================== --- head/sysutils/logrotate/distinfo Thu May 14 07:50:23 2015 (r386300) +++ head/sysutils/logrotate/distinfo Thu May 14 07:51:09 2015 (r386301) @@ -1,2 +1,2 @@ -SHA256 (logrotate-3.8.8.tar.gz) = 46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f -SIZE (logrotate-3.8.8.tar.gz) = 72014 +SHA256 (logrotate-3.8.9.tar.gz) = 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 +SIZE (logrotate-3.8.9.tar.gz) = 77408 Modified: head/sysutils/logrotate/files/patch-Makefile ============================================================================== --- head/sysutils/logrotate/files/patch-Makefile Thu May 14 07:50:23 2015 (r386300) +++ head/sysutils/logrotate/files/patch-Makefile Thu May 14 07:51:09 2015 (r386301) @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-06-10 13:29:16.000000000 +0200 -+++ Makefile 2014-01-10 15:03:37.479613407 +0100 -@@ -81,6 +81,13 @@ +--- Makefile.orig 2015-02-13 06:11:21 UTC ++++ Makefile +@@ -81,6 +81,13 @@ ifeq ($(OS_NAME),NetBSD) LOADLIBES += -L$(BASEDIR)/lib -Wl,-R,$(BASEDIR)/lib endif @@ -14,7 +14,7 @@ ifneq ($(POPT_DIR),) CFLAGS += -I$(POPT_DIR) LOADLIBES += -L$(POPT_DIR) -@@ -148,9 +155,9 @@ +@@ -155,9 +162,9 @@ install: $(INSTALL) $(MAN) $(PREFIX)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"` 0644 bin bin; \ $(INSTALL) $(MAN5) $(PREFIX)$(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"` 0644 bin bin; \ else if [ "$(OS_NAME)" = FreeBSD ]; then \ Modified: head/sysutils/logrotate/files/patch-config.c ============================================================================== --- head/sysutils/logrotate/files/patch-config.c Thu May 14 07:50:23 2015 (r386300) +++ head/sysutils/logrotate/files/patch-config.c Thu May 14 07:51:09 2015 (r386301) @@ -1,7 +1,7 @@ ---- config.c.orig 2012-11-09 18:58:51.756188812 +0800 -+++ config.c 2012-11-09 19:00:23.064190229 +0800 +--- config.c.orig 2015-02-13 06:11:21 UTC ++++ config.c @@ -1,8 +1,4 @@ - #include + #include "queue.h" -/* Alloca is defined in stdlib.h in NetBSD */ -#ifndef __NetBSD__ -#include Modified: head/sysutils/logrotate/files/patch-config.h ============================================================================== --- head/sysutils/logrotate/files/patch-config.h Thu May 14 07:50:23 2015 (r386300) +++ head/sysutils/logrotate/files/patch-config.h Thu May 14 07:51:09 2015 (r386301) @@ -1,8 +1,6 @@ -diff --git a/config.h b/config.h -index ae7f308..7c0a2b3 100644 ---- a/config.h -+++ b/config.h -@@ -16,6 +16,13 @@ +--- config.h.orig 2015-02-13 06:11:21 UTC ++++ config.h +@@ -23,6 +23,13 @@ #define STATEFILE "/var/log/logrotate.status" #endif Modified: head/sysutils/logrotate/files/patch-logrotate.8 ============================================================================== --- head/sysutils/logrotate/files/patch-logrotate.8 Thu May 14 07:50:23 2015 (r386300) +++ head/sysutils/logrotate/files/patch-logrotate.8 Thu May 14 07:51:09 2015 (r386301) @@ -1,15 +1,15 @@ ---- logrotate.8.orig 2012-11-09 19:10:08.054188039 +0800 -+++ logrotate.8 2012-11-09 19:10:57.749187879 +0800 -@@ -59,7 +59,7 @@ - \fB-s, -\-state \fR +--- logrotate.8.orig 2015-02-13 06:11:21 UTC ++++ logrotate.8 +@@ -59,7 +59,7 @@ and mail it to the recipient. The defaul + \fB\-s\fR, \fB\-\-state \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/var/run/logrotate.status\fR. .TP - \fB-\-usage\fR -@@ -507,10 +507,10 @@ + \fB\-\-usage\fR +@@ -550,10 +550,10 @@ Log files are rotated if the current yea .SH FILES .PD 0 .TP 27 Modified: head/sysutils/logrotate/files/patch-logrotate.c ============================================================================== --- head/sysutils/logrotate/files/patch-logrotate.c Thu May 14 07:50:23 2015 (r386300) +++ head/sysutils/logrotate/files/patch-logrotate.c Thu May 14 07:51:09 2015 (r386301) @@ -1,7 +1,7 @@ ---- logrotate.c.orig 2012-11-09 19:00:58.744187984 +0800 -+++ logrotate.c 2012-11-09 19:01:05.528189740 +0800 +--- logrotate.c.orig 2015-02-13 06:11:21 UTC ++++ logrotate.c @@ -1,8 +1,4 @@ - #include + #include "queue.h" -/* alloca() is defined in stdlib.h in NetBSD */ -#ifndef __NetBSD__ -#include Modified: head/sysutils/logrotate/pkg-plist ============================================================================== --- head/sysutils/logrotate/pkg-plist Thu May 14 07:50:23 2015 (r386300) +++ head/sysutils/logrotate/pkg-plist Thu May 14 07:51:09 2015 (r386301) @@ -1,7 +1,5 @@ sbin/logrotate -@unexec if cmp -s %D/etc/logrotate.conf.sample %D/etc/logrotate.conf; then rm -f %D/etc/logrotate.conf; fi -etc/logrotate.conf.sample -@exec if [ ! -f %D/etc/logrotate.conf ]; then cp -p %D/%F %B/logrotate.conf; fi +@sample etc/logrotate.conf.sample %%EXAMPLESDIR%%/syslog.sample man/man5/logrotate.conf.5.gz man/man8/logrotate.8.gz