Ticket #53930: 0001-logrotate-update-to-3.11.0-etc.patch

sysutils/logrotate/Portfile

@@ -1 +1 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
+PortGroup           github 1.0
 
-name                logrotate
-version             3.8.6
-revision            2
+github.setup        logrotate logrotate 3.11.0
+
+github.tarball_from releases
+use_xz              yes
+checksums           rmd160  507dc354394daead333744886c7038a2a8b85759 \
+                    sha256  18ae0f2ec1f14d9550c9f6bd9a2b6a18440e6a0fd7d5923a6e3fcb7d45946261
 categories          sysutils
 platforms           darwin
 license             GPL-2
@@ -12 +16 @@
 
 description         Rotates, compresses, and mails system logs
 
-long_description    The logrotate utility is designed to simplify the administration of log files \
-                    on a system which generates a lot of log files. Logrotate allows for the \
-                    automatic rotation compression, removal and mailing of log files. Logrotate \
-                    can be set to handle a log file \daily, weekly, monthly or when the log file \
-                    gets to a certain size.
-
-homepage            https://fedorahosted.org/logrotate/
-master_sites        https://fedorahosted.org/releases/l/o/logrotate/
+long_description    The logrotate utility is designed to simplify the administration of logs \
+                    on a system which generates a lot of log files. Logrotate provides \
+                    automatic rotation, compression (gzip by default), removal and mailing \
+                    of log files. Logrotate can be set to handle a log file daily, weekly, \
+                    monthly or when the log file exceeds a certain size.
 
-checksums           rmd160  4cba4954c99896ea036d57190fc11a8307b2765e \
-                    sha256  0e0ef0609afe9ef2a2ef6cae307b5ca618ddd349923ccce6e064513afd4e9d92
+homepage            https://github.com/logrotate/logrotate
 
 depends_lib         port:popt
 
-depends_run         port:gettext
+depends_run         port:gettext \
+                    port:gzip
+
+# See https://github.com/logrotate/logrotate/issues/117
+patchfiles-append   patch-missing_include.diff
+# set up so we can reinplace our desired compressor
+patchfiles-append   patch-configs.diff
 
-patch.pre_args      -p1
-patchfiles          patch-Makefile.diff
+set compress        ${prefix}/bin/gzip
+set compress_ext    .gz
+set uncompress      ${prefix}/bin/gunzip
 
 post-extract {
     touch ${worksrcpath}/.depend
@@ -46 +53 @@
         ${worksrcpath}/logrotate.conf.example
     reinplace "s|@PREFIX@|${prefix}|g" \
         ${worksrcpath}/org.macports.logrotate.plist.example
+    reinplace "s|@COMPRESS@|${compress}|g" \
+        ${worksrcpath}/config.h
+    reinplace "s|@COMPRESS_EXT@|${compress_ext}|g" \
+        ${worksrcpath}/config.h
+    reinplace "s|@UNCOMPRESS@|${uncompress}|g" \
+        ${worksrcpath}/config.h
 }
 
-use_configure       no
+use_autoreconf      yes
+autoreconf.args-append \
+                    --force
+configure.args-append \
+                    --disable-silent-rules\
+                    --with-state-file-path=${prefix}/var/run/logrotate/logrotate.status
 
-variant universal {}
+universal_variant   no
 
-build.env-append    CC="${configure.cc} [get_canonical_archflags cc]" \
-                    CXX="${configure.cxx} [get_canonical_archflags cxx]" \
-                    CPP="${configure.cpp}" \
-                    BASEDIR="${prefix}" \
-                    POPT_DIR="${prefix}" \
-                    STATEFILE="${prefix}/var/run/logrotate/logrotate.status" \
-                    DEFAULT_MAIL_COMMAND="/usr/bin/mail"
-
-destroot.args       INSTALL="install" \
-                    BINDIR="${destroot}${prefix}/sbin" \
-                    MANDIR="${destroot}${prefix}/share/man"
 destroot.keepdirs   ${destroot}${prefix}/etc/logrotate.d \
                     ${destroot}${prefix}/var/run/logrotate
 post-destroot {
     xinstall -d ${destroot}${prefix}/share/${name}
-        xinstall -m 644 -W ${worksrcpath} CHANGES COPYING \
+        xinstall -m 644 -W ${worksrcpath} ChangeLog.md COPYING \
             logrotate.conf.example org.macports.logrotate.plist.example \
                 ${destroot}${prefix}/share/${name}
 
-    # The startupitem.install keyword does not exist in MacPorts < 2.1.
-    if {![info exists startupitem.install]} {
-
-        set startupitem.install yes
-    }
     if {[variant_isset startupitem]
     && ${startupitem.install} != "no"
     && [getuid] == 0} {
@@ -96 +98 @@
     }
 }
 
-variant bzip2 conflicts gzip description {Use bzip2 compression by default} {
-    build.env-append \
-                    COMPRESS_COMMAND="${prefix}/bin/bzip2" \
-                    COMPRESS_EXT=".bz2" \
-                    UNCOMPRESS_COMMAND="${prefix}/bin/bunzip2"
-    depends_run-append \
-                    port:bzip2
-}
-
-variant gzip conflicts bzip2 description {Use gzip compression by default} {
-    build.pre_args-append \
-                    COMPRESS_COMMAND="${prefix}/bin/gzip" \
-                    COMPRESS_EXT=".gz" \
-                    UNCOMPRESS_COMMAND="${prefix}/bin/gunzip"
-    depends_run-append \
-                    port:gzip
-}
-
-variant startupitem description {Install launchd plist} {
+variant bzip2 description {Use bzip2 compression by default} {
+    set compress    ${prefix}/bin/bzip2
+    set compress_ext .bz2
+    set uncompress   ${prefix}/bin/bunzip2
+    depends_run-replace \
+                    port:gzip port:bzip2
 }
 
-if {![variant_isset bzip2]} {
-    default_variants-append \
-                    +gzip
-    variant_set     gzip
+variant startupitem description {Run logrotate daily} {
 }
 
-livecheck.url       $homepage
+livecheck.url       https://github.com/logrotate/logrotate/releases
 livecheck.type      regex
 livecheck.regex     "(?!${name}).*${name}-((?!${extract.suffix}).*)${extract.suffix}"
 
-notes \
-"
-
+notes "
 To use logrotate:
 
-  * If ${prefix}/etc/logrotate.conf does not exist copy the example into place.
+  * See 'man logrotate' for configuration options.
 
-    \$ sudo cp ${prefix}/share/${name}/logrotate.conf.example ${prefix}/etc/logrotate.conf
-
-  * With the startupitem variant (+startupitem) you can activate a scheduled log 
+  * The startupitem variant (+startupitem) provides for daily log
     rotation with this command.
 
     \$ sudo port load logrotate
@@ -148 +130 @@
     \$ sudo cp ${prefix}/share/${name}/org.macports.logrotate.plist.example /Library/LaunchDaemons/org.macports.logrotate.plist
 
     \$ sudo launchctl load -w /Library/LaunchDaemons/org.macports.logrotate.plist
-    
 "

deleted file sysutils/logrotate/files/patch-Makefile.diff

@@ -1 @@
---- a/Makefile  2013-08-18 10:39:54.000000000 -0700
-+++ b/Makefile  2013-08-18 10:40:08.000000000 -0700
-@@ -82,14 +82,30 @@
- endif
- 
- ifneq ($(POPT_DIR),)
--    CFLAGS += -I$(POPT_DIR)
--    LOADLIBES += -L$(POPT_DIR)
-+    CFLAGS += -I$(POPT_DIR)/include
-+    LOADLIBES += -L$(POPT_DIR)/lib
- endif
- 
- ifneq ($(STATEFILE),)
-     CFLAGS += -DSTATEFILE=\"$(STATEFILE)\"
- endif
- 
-+ifneq ($(COMPRESS_COMMAND),)
-+    CFLAGS += -DCOMPRESS_COMMAND=\"$(COMPRESS_COMMAND)\"
-+endif
-+
-+ifneq ($(COMPRESS_EXT),)
-+    CFLAGS += -DCOMPRESS_EXT=\"$(COMPRESS_EXT)\"
-+endif
-+
-+ifneq ($(UNCOMPRESS_COMMAND),)
-+    CFLAGS += -DUNCOMPRESS_COMMAND=\"$(UNCOMPRESS_COMMAND)\"
-+endif
-+
-+ifneq ($(DEFAULT_MAIL_COMMAND),)
-+    CFLAGS += -DDEFAULT_MAIL_COMMAND=\"$(DEFAULT_MAIL_COMMAND)\"
-+endif
-+
- BINDIR = $(BASEDIR)/sbin
- MANDIR ?= $(BASEDIR)/man
- 
-@@ -133,7 +149,7 @@
-        echo "$(TEST_ACL)" > ./test/test.ACL ;
-        echo "$(TEST_SELINUX)" > ./test/test.SELINUX ;
- 
--.PHONY : test
-+.PHONY: all clean depend pretest test install co svntag create-archive archive
- test: $(TARGET)
-        (cd test; ./test)
- 

new file sysutils/logrotate/files/patch-configs.diff

@@ +1 @@
+--- config.h.orig       2017-04-17 18:24:58.000000000 -0400
++++ config.h    2017-04-17 18:33:22.000000000 -0400
+@@ -24,8 +24,10 @@
+ #endif
+ 
+ #if defined(__APPLE__) && defined(__MACH__)
+-#define COMPRESS_COMMAND "/usr/bin/gzip"
+-#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
++#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"
++#define COMPRESS_COMMAND "@COMPRESS@"
++#define COMPRESS_EXT "@COMPRESS_EXT@"
++#define UNCOMPRESS_COMMAND "@UNCOMPRESS@"
+ #endif
+ 
+ /*

new file sysutils/logrotate/files/patch-missing_include.diff

@@ +1 @@
+--- config.c.orig       2017-04-17 16:25:49.000000000 -0400
++++ config.c    2017-04-17 16:26:23.000000000 -0400
+@@ -24,6 +24,7 @@
+ #include <fnmatch.h>
+ #include <sys/mman.h>
+ 
++#include <libgen.h>
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"