Attachment #187180 for bug #223017

View | Details | Raw Unified | Return to bug 223017
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/sysutils/logrotate/Makefile 412349 2016-04-01 14:25:16Z mat $	2	# $FreeBSD: head/sysutils/logrotate/Makefile 412349 2016-04-01 14:25:16Z mat $
3		3
4	PORTNAME= logrotate	4	PORTNAME= logrotate
5	PORTVERSION= 3.9.2	5	PORTVERSION= 3.13.0
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7		7
8	MAINTAINER= js@iksz.hu	8	MAINTAINER= js@iksz.hu

Lines 1-2 Link Here

(-)b/distinfo (-2 / +3 lines)
1	SHA256 (logrotate-logrotate-3.9.2_GH0.tar.gz) = 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009	1	TIMESTAMP = 1508013010
2	SIZE (logrotate-logrotate-3.9.2_GH0.tar.gz) = 80711	2	SHA256 (logrotate-logrotate-3.13.0_GH0.tar.gz) = fb1ff8502e7ae4aedaa3d0da8d3740a6a0f44b72e34666af724e9094b166c942
		3	SIZE (logrotate-logrotate-3.13.0_GH0.tar.gz) = 82436




--- 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
 
+# FreeBSD
+ifeq ($(OS_NAME),FreeBSD)
+    LOADLIBES += -L${LOCALBASE}/lib
+    CFLAGS += -I${LOCALBASE}/include
+    PREFIX=
+endif
+
 ifneq ($(POPT_DIR),)
     CFLAGS += -I$(POPT_DIR)
     LOADLIBES += -L$(POPT_DIR)
@@ -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 \
-	$(BSD_INSTALL_PROGRAM) $(PROG) $(BINDIR); \
-	$(BSD_INSTALL_MAN) $(MAN) $(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
-	$(BSD_INSTALL_MAN) $(MAN5) $(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"`/$(MAN5); \
+	$(BSD_INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR); \
+	$(BSD_INSTALL_MAN) $(MAN) $(DESTDIR)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
+	$(BSD_INSTALL_MAN) $(MAN5) $(DESTDIR)$(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"`/$(MAN5); \
 	else \
 	$(INSTALL) -m 755 $(PROG) $(PREFIX)$(BINDIR); \
 	$(INSTALL) -m 644 $(MAN) $(PREFIX)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \




--- config.c.orig	2017-10-12 15:19:41.000000000 +0000
+++ config.c	2017-10-14 21:59:41.716559000 +0000
@@ -1,6 +1,6 @@
 #include "queue.h"
 /* Alloca is defined in stdlib.h in NetBSD */
-#ifndef __NetBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
 #include <alloca.h>
 #endif
 #include <limits.h>
 #include <ctype.h>
 #include <dirent.h>




--- config.h.orig	2015-02-13 06:11:21 UTC
+++ config.h
@@ -23,6 +23,13 @@
 #define STATEFILE "/var/log/logrotate.status"
 #endif
 
+#ifdef __FreeBSD__
+    #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx"
+    #define COMPRESS_COMMAND "/usr/bin/gzip"
+    #define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
+    #define STATEFILE "/var/run/logrotate.status"
+#endif
+
 /*
  * Default settings for Linux - leave these last.
  */




--- 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 <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/var/run/logrotate.status\fR.
 
 .TP
 \fB\-\-usage\fR
@@ -550,10 +550,10 @@ Log files are rotated if the current yea
 .SH FILES
 .PD 0
 .TP 27
-\fI/var/lib/logrotate.status\fR
+\fI/var/run/logrotate.status\fR
 Default state file.
 .TP 27
-\fI/etc/logrotate.conf\fR
+\fI/usr/local/etc/logrotate.conf\fR
 Configuration options.
 
 .SH SEE ALSO




--- logrotate.c.orig	2017-10-12 15:19:41.000000000 +0000
+++ logrotate.c	2017-10-14 22:00:57.613844000 +0000
@@ -1,6 +1,6 @@
 #include "queue.h"
 /* alloca() is defined in stdlib.h in NetBSD */
-#ifndef __NetBSD__
+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
 #include <alloca.h>
 #endif
 #include <limits.h>
 #include <ctype.h>
 #include <dirent.h>

Return to bug 223017

Removed Link Here

(-)a/files/patch-Makefile (-29 lines)
1	--- Makefile.orig 2015-02-13 06:11:21 UTC
2	+++ Makefile
3	@@ -81,6 +81,13 @@ ifeq ($(OS_NAME),NetBSD)
4	LOADLIBES += -L$(BASEDIR)/lib -Wl,-R,$(BASEDIR)/lib
5	endif
6
7	+# FreeBSD
8	+ifeq ($(OS_NAME),FreeBSD)
9	+ LOADLIBES += -L${LOCALBASE}/lib
10	+ CFLAGS += -I${LOCALBASE}/include
11	+ PREFIX=
12	+endif
13	+
14	ifneq ($(POPT_DIR),)
15	CFLAGS += -I$(POPT_DIR)
16	LOADLIBES += -L$(POPT_DIR)
17	@@ -155,9 +162,9 @@ install:
18	$(INSTALL) $(MAN) $(PREFIX)$(MANDIR)/man`echo $(MAN) \| sed "s/.*\.//"` 0644 bin bin; \
19	$(INSTALL) $(MAN5) $(PREFIX)$(MANDIR)/man`echo $(MAN5) \| sed "s/.*\.//"` 0644 bin bin; \
20	else if [ "$(OS_NAME)" = FreeBSD ]; then \
21	- $(BSD_INSTALL_PROGRAM) $(PROG) $(BINDIR); \
22	- $(BSD_INSTALL_MAN) $(MAN) $(MANDIR)/man`echo $(MAN) \| sed "s/.*\.//"`/$(MAN); \
23	- $(BSD_INSTALL_MAN) $(MAN5) $(MANDIR)/man`echo $(MAN5) \| sed "s/.*\.//"`/$(MAN5); \
24	+ $(BSD_INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR); \
25	+ $(BSD_INSTALL_MAN) $(MAN) $(DESTDIR)$(MANDIR)/man`echo $(MAN) \| sed "s/.*\.//"`/$(MAN); \
26	+ $(BSD_INSTALL_MAN) $(MAN5) $(DESTDIR)$(MANDIR)/man`echo $(MAN5) \| sed "s/.*\.//"`/$(MAN5); \
27	else \
28	$(INSTALL) -m 755 $(PROG) $(PREFIX)$(BINDIR); \
29	$(INSTALL) -m 644 $(MAN) $(PREFIX)$(MANDIR)/man`echo $(MAN) \| sed "s/.*\.//"`/$(MAN); \

Lines 1-11 Link Here

(-)b/files/patch-config.c (-8 / +7 lines)
1	--- config.c.orig 2015-02-13 06:11:21 UTC	1	--- config.c.orig 2017-10-12 15:19:41.000000000 +0000
2	+++ config.c	2	+++ config.c 2017-10-14 21:59:41.716559000 +0000
3	@@ -1,8 +1,4 @@	3	@@ -1,6 +1,6 @@
4	#include "queue.h"	4	#include "queue.h"
5	-/* Alloca is defined in stdlib.h in NetBSD */	5	/* Alloca is defined in stdlib.h in NetBSD */
6	-#ifndef __NetBSD__	6	-#ifndef __NetBSD__
7	-#include <alloca.h>	7	+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
8	-#endif	8	#include <alloca.h>
		9	#endif
9	#include <limits.h>	10	#include <limits.h>
10	#include <ctype.h>
11	#include <dirent.h>

Removed Link Here

(-)a/files/patch-config.h (-16 lines)
1	--- config.h.orig 2015-02-13 06:11:21 UTC
2	+++ config.h
3	@@ -23,6 +23,13 @@
4	#define STATEFILE "/var/log/logrotate.status"
5	#endif
6
7	+#ifdef __FreeBSD__
8	+ #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx"
9	+ #define COMPRESS_COMMAND "/usr/bin/gzip"
10	+ #define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
11	+ #define STATEFILE "/var/run/logrotate.status"
12	+#endif
13	+
14	/*
15	* Default settings for Linux - leave these last.
16	*/

Removed Link Here

(-)a/files/patch-logrotate.8 (-24 lines)
1	--- logrotate.8.orig 2015-02-13 06:11:21 UTC
2	+++ logrotate.8
3	@@ -59,7 +59,7 @@ and mail it to the recipient. The defaul
4	\fB\-s\fR, \fB\-\-state <statefile>\fR
5	Tells \fBlogrotate\fR to use an alternate state file. This is useful
6	if logrotate is being run as a different user for various sets of
7	-log files. The default state file is \fI/var/lib/logrotate.status\fR.
8	+log files. The default state file is \fI/var/run/logrotate.status\fR.
9
10	.TP
11	\fB\-\-usage\fR
12	@@ -550,10 +550,10 @@ Log files are rotated if the current yea
13	.SH FILES
14	.PD 0
15	.TP 27
16	-\fI/var/lib/logrotate.status\fR
17	+\fI/var/run/logrotate.status\fR
18	Default state file.
19	.TP 27
20	-\fI/etc/logrotate.conf\fR
21	+\fI/usr/local/etc/logrotate.conf\fR
22	Configuration options.
23
24	.SH SEE ALSO

Lines 1-11 Link Here

(-)b/files/patch-logrotate.c (-8 / +7 lines)
1	--- logrotate.c.orig 2015-02-13 06:11:21 UTC	1	--- logrotate.c.orig 2017-10-12 15:19:41.000000000 +0000
2	+++ logrotate.c	2	+++ logrotate.c 2017-10-14 22:00:57.613844000 +0000
3	@@ -1,8 +1,4 @@	3	@@ -1,6 +1,6 @@
4	#include "queue.h"	4	#include "queue.h"
5	-/* alloca() is defined in stdlib.h in NetBSD */	5	/* alloca() is defined in stdlib.h in NetBSD */
6	-#ifndef __NetBSD__	6	-#ifndef __NetBSD__
7	-#include <alloca.h>	7	+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
8	-#endif	8	#include <alloca.h>
		9	#endif
9	#include <limits.h>	10	#include <limits.h>
10	#include <ctype.h>
11	#include <dirent.h>