git: f99078391254 - 2021Q4 - devel/libcircllhist: Update to g20211005 and unbreak LDFLAGS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 08 Oct 2021 12:47:15 UTC
The branch 2021Q4 has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f99078391254e241970cd881c2775ced5ecb8850
commit f99078391254e241970cd881c2775ced5ecb8850
Author: Robert Clausecker <fuz@fuz.su>
AuthorDate: 2021-10-08 12:24:31 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2021-10-08 12:47:11 +0000
devel/libcircllhist: Update to g20211005 and unbreak LDFLAGS
- take up maintainership of this unmaintained port
- license has changed to APACHE20
- upstream has moved, switch to new upstream
- generate and install documentation
- disable git-based version generation (tries to pick up the ports tree's git)
- regenerate patch
- make portlint and portclippy happy
PR: 258906
(cherry picked from commit ef377af9f77ceebe66727ff620a3723d1748c46d)
---
devel/libcircllhist/Makefile | 29 ++++++++++------
devel/libcircllhist/distinfo | 6 ++--
.../files/patch-buildtools_mkversion.sh | 11 ++++++
devel/libcircllhist/files/patch-configure.ac | 2 +-
devel/libcircllhist/pkg-plist | 39 ++++++++++++++++++++++
5 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/devel/libcircllhist/Makefile b/devel/libcircllhist/Makefile
index 8488dd4c2d25..4a7681b6e314 100644
--- a/devel/libcircllhist/Makefile
+++ b/devel/libcircllhist/Makefile
@@ -1,27 +1,36 @@
# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
PORTNAME= libcircllhist
-PORTVERSION= g20200417
-PORTREVISION= 1
+PORTVERSION= g20211005
CATEGORIES= devel
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= fuz@fuz.su
COMMENT= Circonus log-linear histogram C implementation
-LICENSE= BSD3CLAUSE
-
-BROKEN_aarch64= fails to configure: error: cannot compute sizeof (char)
+LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE
+USES= autoreconf gmake
USE_GITHUB= yes
-GH_ACCOUNT= circonus-labs
-GH_TAGNAME= b7c6248
+GH_ACCOUNT= openhistogram
+GH_TAGNAME= 79fab69ee82597e3940cab017d7b0cd50ef3e9c1
+USE_LDCONFIG= yes
-USES= autoreconf gmake
GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
+ALL_TARGET= all
+
+OPTIONS_DEFINE= DOCS
+DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
+DOCS_ALL_TARGET= docs
post-install:
${LN} -s libcircllhist.so.0.0.1 \
${STAGEDIR}${PREFIX}/lib/libcircllhist.so.0
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/circllhist_print
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcircllhist.so.0.0.1
+
+post-install-DOCS-on:
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/devel/libcircllhist/distinfo b/devel/libcircllhist/distinfo
index 4814f7640c10..9160dfcf4336 100644
--- a/devel/libcircllhist/distinfo
+++ b/devel/libcircllhist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587128311
-SHA256 (circonus-labs-libcircllhist-g20200417-b7c6248_GH0.tar.gz) = 031e50cea34db21828bda678144113b54867204c30833418fd99b93e752a939c
-SIZE (circonus-labs-libcircllhist-g20200417-b7c6248_GH0.tar.gz) = 86689
+TIMESTAMP = 1633445699
+SHA256 (openhistogram-libcircllhist-g20211005-79fab69ee82597e3940cab017d7b0cd50ef3e9c1_GH0.tar.gz) = 4faa404abfc814a575cc0f3b3a29889b4fcc59fe2fbe4a54d411058161350b37
+SIZE (openhistogram-libcircllhist-g20211005-79fab69ee82597e3940cab017d7b0cd50ef3e9c1_GH0.tar.gz) = 106859
diff --git a/devel/libcircllhist/files/patch-buildtools_mkversion.sh b/devel/libcircllhist/files/patch-buildtools_mkversion.sh
new file mode 100644
index 000000000000..fd1d851f425b
--- /dev/null
+++ b/devel/libcircllhist/files/patch-buildtools_mkversion.sh
@@ -0,0 +1,11 @@
+--- buildtools/mkversion.sh.orig 2021-10-05 14:58:58 UTC
++++ buildtools/mkversion.sh
+@@ -1,6 +1,7 @@
+ #!/bin/sh
+
+-STATUS=`git status 2>&1`
++#STATUS=`git status 2>&1`
++false
+ if [ $? -eq 0 ]; then
+ echo "Building version info from git"
+ HASH=`git show --format=%H | head -1`
diff --git a/devel/libcircllhist/files/patch-configure.ac b/devel/libcircllhist/files/patch-configure.ac
index 4ae70265fd66..b1984fa05e80 100644
--- a/devel/libcircllhist/files/patch-configure.ac
+++ b/devel/libcircllhist/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig 2019-10-16 20:36:24 UTC
+--- configure.ac.orig 2020-04-17 12:58:31 UTC
+++ configure.ac
@@ -31,19 +31,19 @@ AC_PATH_PROG(CTFMERGE, ctfmerge)
diff --git a/devel/libcircllhist/pkg-plist b/devel/libcircllhist/pkg-plist
index 836fb35de85a..51af652b4e2d 100644
--- a/devel/libcircllhist/pkg-plist
+++ b/devel/libcircllhist/pkg-plist
@@ -4,4 +4,43 @@ lib/libcircllhist.a
lib/libcircllhist.so
lib/libcircllhist.so.0
lib/libcircllhist.so.0.0.1
+%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
+%%PORTDOCS%%%%DOCSDIR%%/html/bdwn.png
+%%PORTDOCS%%%%DOCSDIR%%/html/circllhist_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/circllhist_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/closed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
+%%PORTDOCS%%%%DOCSDIR%%/html/doc.png
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.svg
+%%PORTDOCS%%%%DOCSDIR%%/html/dynsections.js
+%%PORTDOCS%%%%DOCSDIR%%/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/html/folderclosed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/folderopen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/html/menu.js
+%%PORTDOCS%%%%DOCSDIR%%/html/menudata.js
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_g.png
+%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/html/open.png
+%%PORTDOCS%%%%DOCSDIR%%/html/splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/html/structhist__allocator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/structhist__bucket.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sync_off.png
+%%PORTDOCS%%%%DOCSDIR%%/html/sync_on.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png
+%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
share/lua/5.1/ffi_libcircllhist.lua