[153489] trunk/dports/textproc/cloc

khindenburg at macports.org khindenburg at macports.org
Sun Oct 2 18:40:10 CEST 2016


Revision: 153489
          https://trac.macports.org/changeset/153489
Author:   khindenburg at macports.org
Date:     2016-10-02 09:40:10 -0700 (Sun, 02 Oct 2016)
Log Message:
-----------
cloc: update to 1.70; move to github #52286

Modified Paths:
--------------
    trunk/dports/textproc/cloc/Portfile

Removed Paths:
-------------
    trunk/dports/textproc/cloc/files/patch-cloc.diff

Modified: trunk/dports/textproc/cloc/Portfile
===================================================================
--- trunk/dports/textproc/cloc/Portfile	2016-10-02 16:09:21 UTC (rev 153488)
+++ trunk/dports/textproc/cloc/Portfile	2016-10-02 16:40:10 UTC (rev 153489)
@@ -2,12 +2,11 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           github 1.0
 PortGroup           perl5 1.0
 
-name                cloc
-version             1.64
+github.setup        AlDanial cloc 1.70 v
 perl5.branches      5.24
-revision            2
 categories          textproc devel
 license             GPL-2 Artistic-1
 platforms           darwin
@@ -19,27 +18,28 @@
                     Given two versions of a code base, cloc can compute \
                     differences in blank, comment, and source lines.
 
-homepage            http://cloc.sourceforge.net/
-master_sites        sourceforge:project/cloc/cloc/v${version}
+checksums           rmd160  e0e8e107a4d9e98328e3618a535e1b3d5a592b08 \
+                    sha256  2bcf70281835b12f3ef01b9da6edf69b93b0ea660836ec5b524751718e41da01
 
-checksums           rmd160  025b0347177dcfa245c35789362c5ce0dc8f6634 \
-                    sha256  309701142f54ee5b244307dec2d07848b71af9b9fee01437d3f7440193f975f0
-
 depends_run-append  port:perl${perl5.major} \
                     port:p${perl5.major}-algorithm-diff \
                     port:p${perl5.major}-regexp-common \
                     port:p${perl5.major}-digest-md5
 
-patchfiles          patch-cloc.diff
+patchfiles          patch-Makefile-perl.diff
+
 post-patch {
     reinplace -W ${worksrcpath} \
         "s|^#!/usr/bin/env perl|#!${perl5.bin}|" \
-         cloc sqlite_formatter
+         cloc
+    reinplace -W ${worksrcpath} \
+        "s|__PERL__|${perl5.bin}|" \
+         Makefile
 }
 
+worksrcdir          ${distname}/Unix
+
 use_configure       no
 build               {}
 
 destroot.args-append prefix=${prefix}
-
-livecheck.regex     ${name}-(\\d+(?:\\.\\d+)*)\.pl

Deleted: trunk/dports/textproc/cloc/files/patch-cloc.diff
===================================================================
--- trunk/dports/textproc/cloc/files/patch-cloc.diff	2016-10-02 16:09:21 UTC (rev 153488)
+++ trunk/dports/textproc/cloc/files/patch-cloc.diff	2016-10-02 16:40:10 UTC (rev 153489)
@@ -1,70 +0,0 @@
---- cloc.orig
-+++ cloc
-@@ -1281,8 +1281,8 @@
-                 $not_Filters_by_Language_Lang_LR = 1;
-             }
-         } else {
--            if (!defined(@{$Filters_by_Language{$Lang_L} }) or
--                !defined(@{$Filters_by_Language{$Lang_R} })) {
-+            if (!(@{$Filters_by_Language{$Lang_L} }) or
-+                !(@{$Filters_by_Language{$Lang_R} })) {
-                 $not_Filters_by_Language_Lang_LR = 1;
-             }
-         }
-@@ -1618,7 +1618,7 @@
-         $Ignored{$file} = "--exclude-lang=$Language{$file}";
-         next;
-     }
--    my $Filters_by_Language_Language_file = !defined @{$Filters_by_Language{$Language{$file}} };
-+    my $Filters_by_Language_Language_file = !@{$Filters_by_Language{$Language{$file}} };
-     if ($Filters_by_Language_Language_file) {
-         if ($Language{$file} eq "(unknown)") {
-             $Ignored{$file} = "language unknown (#1)";
-@@ -1759,7 +1759,7 @@
-                     if ($PERL_516) {
-                         next unless         @{$rhaa_Filters_by_Language->{$1}};
-                     } else {
--                        next unless defined @{$rhaa_Filters_by_Language->{$1}};
-+                        next unless @{$rhaa_Filters_by_Language->{$1}};
-                     }
-                     # above test necessary to avoid trying to sum reports
-                     # of reports (which have no language breakdown).
-@@ -3259,7 +3259,7 @@
- } # 1}}}
- sub print_language_filters {                 # {{{1
-     my ($language,) = @_;
--    if (!defined @{$Filters_by_Language{$language}}) {
-+    if (!@{$Filters_by_Language{$language}}) {
-         warn "Unknown language: $language\n";
-         warn "Use --show-lang to list all defined languages.\n";
-         return;
-@@ -4623,7 +4623,7 @@
- 
-   open (FILE, $file);
-   while (<FILE>) {
--    if (m/^\\begin{code}/) { close FILE; return 2; }
-+    if (m/^\\begin\{code}/) { close FILE; return 2; }
-     if (m/^>\s/) { close FILE; return 1; }
-   }
- 
-@@ -4652,9 +4652,9 @@
-             if (!s/^>//) { s/.*//; }
-         } elsif ($literate == 2) {
-             if ($inlitblock) {
--                if (m/^\\end{code}/) { s/.*//; $inlitblock = 0; }
-+                if (m/^\\end\{code}/) { s/.*//; $inlitblock = 0; }
-             } elsif (!$inlitblock) {
--                if (m/^\\begin{code}/) { s/.*//; $inlitblock = 1; }
-+                if (m/^\\begin\{code}/) { s/.*//; $inlitblock = 1; }
-                 else { s/.*//; }
-             }
-         }
-@@ -6582,7 +6582,7 @@
-         my $language = $rh_Language_by_Extension->{$ext};
-         next if defined $extension_collisions{$language};
-         next if $seen_it{$language};
--        if (!defined @{$rhaa_Filters_by_Language->{$language}}) {
-+        if (!@{$rhaa_Filters_by_Language->{$language}}) {
-             $OK = 0;
-             warn "Missing language filter for $language\n";
-         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161002/0ead1b7c/attachment-0002.html>


More information about the macports-changes mailing list