5 files changed, 43 insertions, 58 deletions

diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index 47134e4e751a..9b373ee23b59 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		logrotate
-PORTVERSION=		3.6.5
+PORTVERSION=		3.7
 PORTREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_DEBIAN_POOL}
@@ -15,7 +15,7 @@ DISTNAME=		${PORTNAME}_${PORTVERSION}.orig
 
 PATCH_SITES=		${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=		${PORTNAME}_${PORTVERSION}-2.diff.gz
+PATCHFILES=		${PORTNAME}_${PORTVERSION}-1.diff.gz
 
 MAINTAINER=		js@iksz.hu
 COMMENT=		Daemon to rotate, compress, remove and mail system log files
diff --git a/sysutils/logrotate/distinfo b/sysutils/logrotate/distinfo
index f74e6e52fc90..ddad60503ac9 100644
--- a/sysutils/logrotate/distinfo
+++ b/sysutils/logrotate/distinfo
@@ -1,4 +1,4 @@
-MD5 (logrotate_3.6.5-2.diff.gz) = 6cce85b7af50e3c2a226d6f0539abe08
-SIZE (logrotate_3.6.5-2.diff.gz) = 10766
-MD5 (logrotate_3.6.5.orig.tar.gz) = 1c707f826f783ffc461a32b34cba5056
-SIZE (logrotate_3.6.5.orig.tar.gz) = 32086
+MD5 (logrotate_3.7.orig.tar.gz) = bf0de3a495294300f32e71f136119c41
+SIZE (logrotate_3.7.orig.tar.gz) = 35737
+MD5 (logrotate_3.7-1.diff.gz) = 3d74ebcb63731d2afa4f97438af5f4bb
+SIZE (logrotate_3.7-1.diff.gz) 12739
diff --git a/sysutils/logrotate/files/patch-Makefile b/sysutils/logrotate/files/patch-Makefile
index a6f6f8094f13..7bdd71397d65 100644
--- a/sysutils/logrotate/files/patch-Makefile
+++ b/sysutils/logrotate/files/patch-Makefile
@@ -1,39 +1,31 @@
---- logrotate-3.6.5/Makefile.orig	Sat Aug  3 11:47:41 2002
-+++ logrotate-3.6.5/Makefile	Sat Feb 28 23:09:20 2004
-@@ -8,6 +8,11 @@
- MAN = logrotate.8
- LOADLIBES = -lpopt
+diff -ruN logrotate-3.7-orig/Makefile logrotate-3.7/Makefile
+--- logrotate-3.7-orig/Makefile	Mon Oct 27 10:36:37 2003
++++ logrotate-3.7/Makefile	Mon May 24 08:10:46 2004
+@@ -50,6 +50,12 @@
+     BASEDIR = /usr
+ endif
  
 +ifeq ($(OS_NAME),FreeBSD)
 +    LOADLIBES += -L${LOCALBASE}/lib
 +    CFLAGS += -I${LOCALBASE}/include
++    PREFIX=
 +endif
 +
- # HP-UX using GCC
- ifeq ($(OS_NAME),HP-UX)
-     ifeq ($(RPM_OPT_FLAGS),)
-@@ -78,9 +83,9 @@
- 	(cd test; ./test)
- 
- install:
--	[ -d $(PREFIX)/$(BINDIR) ] || mkdir -p $(PREFIX)/$(BINDIR)
--	[ -d $(PREFIX)/$(MANDIR) ] || mkdir -p $(PREFIX)/$(MANDIR)
--	[ -d $(PREFIX)/$(MANDIR)/man8 ] || mkdir -p $(PREFIX)/$(MANDIR)/man8
-+	[ -d $(BINDIR) ] || mkdir -p $(BINDIR)
-+	[ -d $(MANDIR) ] || mkdir -p $(MANDIR)
-+	[ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8
- 
+ ifneq ($(POPT_DIR),)
+     CFLAGS += -I$(POPT_DIR)
+     LOADLIBES += -L$(POPT_DIR)
+@@ -102,10 +108,13 @@
  	if [ "$(OS_NAME)" = HP-UX ]; then \
  	$(INSTALL) $(PROG) $(PREFIX)/$(BINDIR) 0755 bin bin; \
-@@ -90,6 +95,11 @@
- 	if [ "$(OS_NAME)" = Linux ]; then \
- 	$(INSTALL) -m 755 $(PROG) $(PREFIX)/$(BINDIR); \
- 	$(INSTALL) -m 644 $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
-+	fi
-+
-+	if [ "$(OS_NAME)" = FreeBSD ]; then \
+ 	$(INSTALL) $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"` 0644 bin bin; \
++	else if [ "$(OS_NAME)" = FreeBSD ]; then \
 +	$(BSD_INSTALL_PROGRAM) $(PROG) $(BINDIR); \
 +	$(BSD_INSTALL_MAN) $(MAN) $(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
- 	fi
+ 	else \
+ 	$(INSTALL) -m 755 $(PROG) $(PREFIX)/$(BINDIR); \
+ 	$(INSTALL) -m 644 $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
+-	fi
++	fi; fi
  
  co:
+ 	co RCS/*,v
diff --git a/sysutils/logrotate/files/patch-aa b/sysutils/logrotate/files/patch-aa
index 629b2f059a4e..57196aa95b5c 100644
--- a/sysutils/logrotate/files/patch-aa
+++ b/sysutils/logrotate/files/patch-aa
@@ -1,14 +1,14 @@
-diff -ruN config.c config.c
---- logrotate-3.6.5/config.c	Wed Mar 13 16:59:45 2002
-+++ logrotate-3.6.5/config.c	Wed Feb  4 19:27:37 2004
+diff -ruN logrotate-3.7-orig/config.c logrotate-3.7/config.c
+--- logrotate-3.7-orig/config.c	Mon Sep 22 21:11:12 2003
++++ logrotate-3.7/config.c	Mon May 24 08:09:39 2004
 @@ -1,4 +1,3 @@
 -#include <alloca.h>
  #include <ctype.h>
  #include <dirent.h>
  #include <errno.h>
-diff -ruN logrotate-3.6.5-orig/logrotate.c logrotate-3.6.5/logrotate.c
---- logrotate-3.6.5/logrotate.c	Wed Apr 24 01:29:19 2002
-+++ logrotate-3.6.5/logrotate.c	Wed Feb  4 19:27:37 2004
+diff -ruN logrotate-3.7-orig/logrotate.c logrotate-3.7/logrotate.c
+--- logrotate-3.7-orig/logrotate.c	Thu Feb  5 19:42:13 2004
++++ logrotate-3.7/logrotate.c	Mon May 24 08:09:45 2004
 @@ -1,4 +1,3 @@
 -#include <alloca.h>
  #include <ctype.h>
diff --git a/sysutils/logrotate/files/patch-config.h b/sysutils/logrotate/files/patch-config.h
index f72b3f626373..ad69a7affcb9 100644
--- a/sysutils/logrotate/files/patch-config.h
+++ b/sysutils/logrotate/files/patch-config.h
@@ -1,24 +1,17 @@
-diff -ruN config.h config.h
---- logrotate-3.6.5/config.h	Sat Aug  3 11:47:41 2002
-+++ logrotate-3.6.5/config.h	Wed Mar 17 12:50:04 2004
-@@ -18,7 +18,7 @@
+diff -ruN logrotate-3.7-orig/config.h logrotate-3.7/config.h
+--- logrotate-3.7-orig/config.h	Mon Sep 22 21:11:12 2003
++++ logrotate-3.7/config.h	Mon May 24 08:05:29 2004
+@@ -16,6 +16,13 @@
+     #define STATEFILE "/var/log/logrotate.status"
  #endif
  
- #ifndef COMPRESS_COMMAND
--    #define COMPRESS_COMMAND "/bin/gzip"
++#ifdef __FreeBSD__
++    #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx -s"
 +    #define COMPRESS_COMMAND "/usr/bin/gzip"
- #endif
- 
- #ifndef COMPRESS_OPTIONS
-@@ -30,10 +30,10 @@
- #endif
- 
- #ifndef UNCOMPRESS_COMMAND
--    #define UNCOMPRESS_COMMAND "/bin/gunzip"
 +    #define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
- #endif
- 
- #ifndef STATEFILE
--    #define STATEFILE "/var/lib/logrotate/status"
 +    #define STATEFILE "/var/lib/logrotate.status"
- #endif
++#endif
++
+ /*
+  * Default settings for Linux - leave these last.
+  */