[84926] trunk/dports/sysutils/logrotate

[pixilla at macports.org]

Revision: 84926
          http://trac.macports.org/changeset/84926
Author:   pixilla at macports.org
Date:     2011-10-04 12:51:08 -0700 (Tue, 04 Oct 2011)
Log Message:
-----------
sysutils/logrotate:
- Upgrade version to 3.8.1.
- Change master_sites to fedora.
- Update patches.
- Fix livecheck.

Modified Paths:
--------------
    trunk/dports/sysutils/logrotate/Portfile
    trunk/dports/sysutils/logrotate/files/patch-Makefile.diff

Removed Paths:
-------------
    trunk/dports/sysutils/logrotate/files/patch-config.c.diff

Modified: trunk/dports/sysutils/logrotate/Portfile
===================================================================
--- trunk/dports/sysutils/logrotate/Portfile	2011-10-04 19:37:54 UTC (rev 84925)
+++ trunk/dports/sysutils/logrotate/Portfile	2011-10-04 19:51:08 UTC (rev 84926)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                logrotate
-version             3.8.0
-revision            1
+version             3.8.1
 categories          sysutils
 maintainers         pixilla openmaintainer
 platforms           darwin
@@ -19,13 +18,13 @@
                     gets to a certain size.
 
 homepage            https://fedorahosted.org/logrotate/
-master_sites        gentoo
-checksums           sha1    a79c500c4ce45177b47bb473a6bff4021af7121e \
-                    rmd160  7e1e24f53db5230eee2e1db8d90fe3a33692ca01
+master_sites        https://fedorahosted.org/releases/l/o/logrotate/
 
+checksums           rmd160  cec3bc6a4cb4226b31696977935818695027b0f8 \
+                    sha256  c12471e70ae8bc923bd5c4f25e8fd6483b68c6301f3cd79f7cfe37bc5b370169
+
 patch.pre_args      -p1
-patchfiles          patch-config.c.diff \
-                    patch-Makefile.diff
+patchfiles          patch-Makefile.diff
 
 depends_run         port:popt port:gettext
 
@@ -49,8 +48,8 @@
                     DEFAULT_MAIL_COMMAND="/usr/sbin/mail"
 
 destroot.args       INSTALL="install" \
-                    BASEDIR=[string trimleft ${destroot}${prefix} /] \
-                    MANDIR="${prefix}/share/man"
+                    BINDIR="${destroot}${prefix}/sbin" \
+                    MANDIR="${destroot}${prefix}/share/man"
 destroot.keepdirs   ${destroot}${prefix}/etc/logrotate.d \
                     ${destroot}${prefix}/var/run/logrotate
 post-destroot {
@@ -138,9 +137,9 @@
     variant_set     gzip
 }
 
+livecheck.url       $homepage
 livecheck.type      regex
-livecheck.url       ${master_sites}
-livecheck.regex     ${name}-(\\d+\\.\\d+(\\.\\d+)?)${extract.suffix}
+livecheck.regex     "(?!${name}).*${name}-((?!${extract.suffix}).*)${extract.suffix}"
 
 notes \
 "

Modified: trunk/dports/sysutils/logrotate/files/patch-Makefile.diff
===================================================================
--- trunk/dports/sysutils/logrotate/files/patch-Makefile.diff	2011-10-04 19:37:54 UTC (rev 84925)
+++ trunk/dports/sysutils/logrotate/files/patch-Makefile.diff	2011-10-04 19:51:08 UTC (rev 84926)
@@ -1,11 +1,9 @@
---- a/Makefile	2011-08-11 14:18:53.000000000 -0700
-+++ b/Makefile	2011-08-11 19:22:02.000000000 -0700
-@@ -82,8 +82,24 @@
+--- a/Makefile	2011-10-04 10:35:54.000000000 -0700
++++ b/Makefile	2011-10-04 10:38:40.000000000 -0700
+@@ -80,6 +80,22 @@
      CFLAGS += -DSTATEFILE=\"$(STATEFILE)\"
  endif
  
--BINDIR = $(BASEDIR)/sbin
--MANDIR = $(BASEDIR)/man
 +ifneq ($(COMPRESS_COMMAND),)
 +    CFLAGS += -DCOMPRESS_COMMAND=\"$(COMPRESS_COMMAND)\"
 +endif
@@ -22,8 +20,6 @@
 +    CFLAGS += -DDEFAULT_MAIL_COMMAND=\"$(DEFAULT_MAIL_COMMAND)\"
 +endif
 +
-+BINDIR := $(BASEDIR)/sbin
-+MANDIR := $(BASEDIR)/man
+ BINDIR = $(BASEDIR)/sbin
+ MANDIR ?= $(BASEDIR)/man
  
- #--------------------------------------------------------------------------
- 

Deleted: trunk/dports/sysutils/logrotate/files/patch-config.c.diff
===================================================================
--- trunk/dports/sysutils/logrotate/files/patch-config.c.diff	2011-10-04 19:37:54 UTC (rev 84925)
+++ trunk/dports/sysutils/logrotate/files/patch-config.c.diff	2011-10-04 19:51:08 UTC (rev 84926)
@@ -1,32 +0,0 @@
---- a/config.c	2011-08-11 14:18:53.000000000 -0700
-+++ b/config.c	2011-08-11 14:19:23.000000000 -0700
-@@ -74,6 +74,29 @@
- 
- #endif
- 
-+#if !defined(strndup)
-+char *strndup(const char *s, size_t n)
-+{
-+       size_t nAvail;
-+       char *p;
-+
-+       if(!s)
-+               return NULL;
-+
-+       /* min() */
-+       nAvail = strlen(s) + 1;
-+       if ( (n + 1) < nAvail)
-+               nAvail = n + 1;
-+
-+       p = malloc(nAvail);
-+       if (!p)
-+               return NULL;
-+       memcpy(p, s, nAvail);
-+       p[nAvail - 1] = 0;
-+       return p;
-+}
-+#endif
-+
- enum {
- 	STATE_DEFAULT = 2,
- 	STATE_SKIP_LINE = 4,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111004/c39cad17/attachment.html>