From nobody Fri Oct 08 12:47:15 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0A82812D5111; Fri, 8 Oct 2021 12:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HQnyW63QKz4R1J; Fri, 8 Oct 2021 12:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABA4727158; Fri, 8 Oct 2021 12:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 198ClFvI034665; Fri, 8 Oct 2021 12:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 198ClFJd034664; Fri, 8 Oct 2021 12:47:15 GMT (envelope-from git) Date: Fri, 8 Oct 2021 12:47:15 GMT Message-Id: <202110081247.198ClFJd034664@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mikael Urankar Subject: git: f99078391254 - 2021Q4 - devel/libcircllhist: Update to g20211005 and unbreak LDFLAGS List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: f99078391254e241970cd881c2775ced5ecb8850 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=f99078391254e241970cd881c2775ced5ecb8850 commit f99078391254e241970cd881c2775ced5ecb8850 Author: Robert Clausecker AuthorDate: 2021-10-08 12:24:31 +0000 Commit: Mikael Urankar 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 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 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