Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Feb 2023 15:35:34 GMT
From:      "Jason W. Bacon" <jwb@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5fee60fc3c92 - main - biology/vcflib: Update to 1.0.7
Message-ID:  <202302091535.319FZYs1051061@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jwb:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5fee60fc3c922a534c2200372385de54590122a9

commit 5fee60fc3c922a534c2200372385de54590122a9
Author:     Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2023-02-09 15:33:16 +0000
Commit:     Jason W. Bacon <jwb@FreeBSD.org>
CommitDate: 2023-02-09 15:35:32 +0000

    biology/vcflib: Update to 1.0.7
    
    Fixes regression in 1.0.6
    
    Made Zig language support a default off option
    Zig is experimental and problematic
    
    Reported by:    portscout
---
 biology/vcflib/Makefile  | 21 +++++++++++++++++----
 biology/vcflib/distinfo  |  6 +++---
 biology/vcflib/pkg-plist |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/biology/vcflib/Makefile b/biology/vcflib/Makefile
index 76e01dc75cbb..aa44ead39385 100644
--- a/biology/vcflib/Makefile
+++ b/biology/vcflib/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=		vcflib
 DISTVERSIONPREFIX=	v
-DISTVERSION=		1.0.6
-PORTREVISION=		1
+DISTVERSION=		1.0.7
 CATEGORIES=		biology
 
 MAINTAINER=	jwb@FreeBSD.org
@@ -10,8 +9,7 @@ WWW=		https://github.com/vcflib/vcflib
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	zig>0:lang/zig \
-		pybind11>=0:devel/pybind11
+BUILD_DEPENDS=	pybind11>0:devel/pybind11
 LIB_DEPENDS=	libhts.so:biology/htslib \
 		libcurl.so:ftp/curl \
 		libwfa2.so:biology/wfa2-lib
@@ -31,14 +29,29 @@ GH_TUPLE=	ekg:fastahack:bb33265:fastahack/contrib/fastahack \
 		vcflib:tabixpp:v1.1.2:tabixpp/contrib/tabixpp
 SHEBANG_FILES=	scripts/*
 
+# FIXME: Add Zig option + lang/zig dep
+OPTIONS_DEFINE=		ZIG
+OPTIONS_DEFAULT=
+OPTIONS_SUB=		yes
+
+ZIG_DESC=		Include Zig language support
+
+ZIG_BUILD_DEPENDS=	zig>0:lang/zig
+
 CMAKE_ARGS+=	-DWFA_GITMODULE=OFF -DWFALIB=${LOCALBASE}/lib/libwfa2.so
+ZIG_CMAKE_OFF=	-DZIG=OFF
 
 # Clang and GCC disable sse2 by default on i386, but it's required for vcflib
 CFLAGS_i386=	-msse2
 
 CONFLICTS_INSTALL=	filevercmp libdisorder # include/disorder.h include/filevercmp.h include/pdflib.hpp
 
+.include <bsd.port.options.mk>
+
 post-stage:
+	${MV} ${STAGEDIR}${PREFIX}/bin/libvcflib.a ${STAGEDIR}${PREFIX}/lib
+.if ${PORT_OPTIONS:MZIG}
 	${MV} ${STAGEDIR}/usr/lib/libzig.a ${STAGEDIR}${PREFIX}/lib
+.endif
 
 .include <bsd.port.mk>
diff --git a/biology/vcflib/distinfo b/biology/vcflib/distinfo
index b31324e88085..b8b4cf640ce0 100644
--- a/biology/vcflib/distinfo
+++ b/biology/vcflib/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1675089755
-SHA256 (ekg-vcflib-v1.0.6_GH0.tar.gz) = 3598d1a9f6c936c58be6a567f249c1df879a49b57dc5a967b83a7856a16ceeb6
-SIZE (ekg-vcflib-v1.0.6_GH0.tar.gz) = 23545077
+TIMESTAMP = 1675907454
+SHA256 (ekg-vcflib-v1.0.7_GH0.tar.gz) = 37ddf471c5fec2c7fa5d1c2c2e80b3e9d30e401ee3b82156f6ae994652950a38
+SIZE (ekg-vcflib-v1.0.7_GH0.tar.gz) = 23546536
 SHA256 (ekg-fastahack-bb33265_GH0.tar.gz) = f671609e1a8d7cacb00065bf307c90c46116af8e5cea939b06edcdbcc6d4bc2a
 SIZE (ekg-fastahack-bb33265_GH0.tar.gz) = 18760
 SHA256 (ekg-filevercmp-df20dcc_GH0.tar.gz) = d34bec614be638e05eb6fa419c936b9e7de58d50b1a096a5ca02aadb7db6b059
diff --git a/biology/vcflib/pkg-plist b/biology/vcflib/pkg-plist
index b5b53667909c..297ee6aaa750 100644
--- a/biology/vcflib/pkg-plist
+++ b/biology/vcflib/pkg-plist
@@ -157,7 +157,7 @@ include/vcf-c-api.h
 include/vec128int.h
 include/veclib_types.h
 lib/libvcflib.a
-lib/libzig.a
+%%ZIG%%lib/libzig.a
 lib/pyvcflib%%PYTHON_EXT_SUFFIX%%.so
 man/man1/abba-baba.1.gz
 man/man1/bFst.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302091535.319FZYs1051061>