<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d7f381e67d72febbd685194ab4b05cd936ad3ed8">https://github.com/macports/macports-ports/commit/d7f381e67d72febbd685194ab4b05cd936ad3ed8</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d7f381e67d7 ohcount: Update to 3.1.1
</span>d7f381e67d7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d7f381e67d72febbd685194ab4b05cd936ad3ed8
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Feb 6 16:33:11 2025 -0600
<span style='display:block; white-space:pre;color:#404040;'> ohcount: Update to 3.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/57066
</span>---
textproc/ohcount/Portfile | 45 +++++++++---------
.../files/ohcount_hash_parser_from_language.patch | 26 +++++++++++
textproc/ohcount/files/patch-build.diff | 53 ++++++++++++++++++----
3 files changed, 92 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/ohcount/Portfile b/textproc/ohcount/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 146c42a848d..4dd356644c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/ohcount/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/ohcount/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup blackducksoftware ohcount 3.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6e9e9f35e9ced6b83d5c5fb350b46044f00e0348 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4be27e54ac0fb5016fe2f09c2f54ec0139e67d9e2d9ee2e8569f8dfb4e56f59f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1282124
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name ohcount
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span> categories textproc devel
license GPL-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers nomaintainer
description Ohcount is a source code line counter.
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,33 +18,29 @@ long_description \
</span> and prepares total counts of code and comments. It can operate on single files \
or entire directory trees. Ohcount can produce line-by-line analysis of files \
for detailed debugging.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://sourceforge.net/projects/ohcount
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 08f97d01adde8b45635abfe93f8a717a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 5c1357b3094881ff9804fbf3002c9aaa16494cce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 64d79b11f7b0e91761fa396a042155fb87720e3a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:ruby \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ragel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-ruby \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.mkdir yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:gperf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ragel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libmagic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-build.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append ohcount_hash_parser_from_language.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@@PREFIX@@:${prefix}:" ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@@CC@@:${configure.cc}:" ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CC@|${configure.cc} [get_canonical_archflags cc]|g;s|@PREFIX@|${prefix}|g" ${worksrcpath}/build
</span> }
use_configure no
build.cmd ./build ohcount && ./build shared
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.cmd ./build tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -m 0755 -W ${worksrcpath} bin/${name} ${destroot}${prefix}/bin
xinstall -m 0755 -W ${worksrcpath} src/lib${name}.dylib ${destroot}${prefix}/lib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${name}-(\\d+(?:\\.\\d+)+)${extract.suffix}"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/ohcount/files/ohcount_hash_parser_from_language.patch b/textproc/ohcount/files/ohcount_hash_parser_from_language.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1f00ff0b474
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/ohcount/files/ohcount_hash_parser_from_language.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: conflicting types for 'ohcount_hash_parser_from_language'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/blackducksoftware/ohcount/commit/e5f6d25a9cd7c721fea67f35d371405e87fc8144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/languages.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/languages.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,6 +126,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // For gperf.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct LanguageMap { const char *key; const char *name; const char *nice_name; int category; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct LanguageMap *ohcount_hash_language_from_name(register const char *str, register unsigned int len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct LanguageMap *ohcount_hash_language_from_name(register const char *str, register size_t len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/parser.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/parser.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "log.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "hash/parser_hash.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct ParserMap * ohcount_hash_parser_from_language (register const char *str, register unsigned int len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++struct ParserMap * ohcount_hash_parser_from_language (register const char *str, register size_t len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ohcount_parse(SourceFile *sourcefile, int count,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void (*callback) (const char *, const char *, int, int,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/ohcount/files/patch-build.diff b/textproc/ohcount/files/patch-build.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 646bad35d35..3e2a41b3a6d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/ohcount/files/patch-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/ohcount/files/patch-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,55 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.orig 2010-03-08 03:57:10.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build 2010-03-08 03:58:28.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,8 +26,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build.orig 2018-05-10 11:17:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build 2025-02-06 16:44:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,18 +4,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Change these for your system configuration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INC_DIR=@PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_DIR=@PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ `uname` != "Darwin" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INC_DIR=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_DIR=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ `uname` == "FreeBSD" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INC_DIR=/usr/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_DIR=/usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # You shouldn't have to change the following.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-O3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARN="-Wall -Wno-pointer-to-int-cast -Wno-parentheses"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,20 +16,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RB_SHARED=-shared
</span> RB_SHARED_NAME=ohcount.so
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mac OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Mac OSX
</span> - INC_DIR=/opt/local/include
- LIB_DIR=/opt/local/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INC_DIR=@@PREFIX@@/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIB_DIR=@@PREFIX@@/lib
</span> # You shouldn't have to change the following.
CFLAGS="-fno-common -g"
WARN="-Wall -Wno-parentheses"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SHARED="-dynamiclib -L$LIB_DIR -lpcre"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHARED_NAME=libohcount.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SHARED="-dynamiclib -install_name $LIB_DIR/$SHARED_NAME"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RB_SHARED="-dynamic -bundle -lruby"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RB_SHARED_NAME=ohcount.bundle
</span> fi
# C compiler and flags
-cc="gcc -fPIC -g $CFLAGS $WARN -I$INC_DIR -L$LIB_DIR"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+cc="@@CC@@ -fPIC -g $CFLAGS $WARN -I$INC_DIR -L$LIB_DIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cc="@CC@ -fPIC -g $CFLAGS $WARN -I$INC_DIR -L$LIB_DIR"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ARCHITECTURE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch=`ruby/print_arch`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ! -z `find src/*.{h,c} -newer src/$SHARED_NAME` ]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Building shared library"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sh -c "$cc $SHARED $files -o src/$SHARED_NAME" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sh -c "$cc $SHARED $files -o src/$SHARED_NAME -lpcre -lmagic" || exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ohcount source files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files="src/sourcefile.c \
</span></pre><pre style='margin:0'>
</pre>