From nobody Thu Feb 5 14:43:42 2026 X-Original-To: dev-commits-ports-main@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 4f6KjB4qpHz6QdMb for ; Thu, 05 Feb 2026 14:43:42 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6KjB467Nz3JfQ for ; Thu, 05 Feb 2026 14:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ci1jGLnMY1KCqNcpjOkdTk6k/b4jBnT/y2hqtyZAXVU=; b=Ye/Gl823RphBer3DiA8Jf12XQy60o9gxDAFpcELLzFfuRSERL6S2ODnDVOJn5HlnbvBTfV /6JFoYFou0sNfa5FJ+Cx2PvM9Vzvt4U4Pl3pnG5hoZFgFbeVdeM3x0aBJkYXSEuandNo9L aAsIYk84ejdCxN1nKlJOL3v6OFFzCq9QGK9kPsNtrkYk5LerM6kYLlfiH79cA3B9lh7BeB qS5h3+Qx1bi5ySeYX65pRQT3v6pyC0v8Zfdb8rHY9xsZZ3jhE8t7Sf6ngpq45xn2KZh1zX QmJaefHNJmKg7R8TbF2TKybgeWOmF8e71qGbiNz1qNeCBNmoRU6nwxxrittiwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302622; a=rsa-sha256; cv=none; b=g2nq3dna/pp+B/3By278tfqT9iK5Ee+ihAKm3z2HssQKFLfZWJSloJGIRoYlAmI8SdjKsA hhMS+8rQPcWqWmomvDcAfPfujJx9zTeEdCATHMmchx3/ctVHLZjEAnREoY8G8Cmp2w+ATa OcPAKp3/TmGF8WKsDw+0njz9Yxy+6jHaD6e1rdGXw1uT4WkOZVL+FFTL2XK8fy5oQuOMsc Prd5goXv7+xBNTL4Jv9gDdS7EPX/y5as4gkDG3yo2XpeUiPFfLbFIfgBjKDisv3JCk04uB QyBrlab1JD0uEo5ti9tLDvlGUl04JEoZzkY/7iTXBeJktrzGaNpYSWlKjfktsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ci1jGLnMY1KCqNcpjOkdTk6k/b4jBnT/y2hqtyZAXVU=; b=xrM9ZrhllSNFtJ7zwNvQKfM/83ER/CrJG7rhDcKn9ESpRLUD3wuLIv3bYzCQ4vD7Vdt306 LOyGlKxGn+0DNSycfYMvpjOP2ri/L1xG9No37LjTvM+9uzyYhNExQ61U/MxjR9XvnOpVbT zNOLjtaHM751NToNqNe/IqCt0r41RQGEOnbbUNWn6UW9YODyKkSKaUqqBrbWqyIp1cx1Bp /TO7315HlgSB6dS2E68JsJ08wXJXfb6X15fXSzhSDawFHk4CfZD+nfW074pKQ/H0RpyhyH nu7V6KmlShKwiG6YIESJ8qG4EFRmvWDGB03Ivuam0yBIu4M0vGB6pcSQTveKLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6KjB2wHTzb4f for ; Thu, 05 Feb 2026 14:43:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be97 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:43:42 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: fbefe22c550a - main - devel/git-merge-changelog: Update to 1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbefe22c550ada685823b185b930e0d6f31b8174 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:43:42 +0000 Message-Id: <6984ac9e.3be97.9cdf4a6@gitrepo.freebsd.org> The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbefe22c550ada685823b185b930e0d6f31b8174 commit fbefe22c550ada685823b185b930e0d6f31b8174 Author: Gleb Popov AuthorDate: 2026-02-05 14:29:43 +0000 Commit: Gleb Popov CommitDate: 2026-02-05 14:42:53 +0000 devel/git-merge-changelog: Update to 1.0 --- devel/git-merge-changelog/Makefile | 31 +++++----------------- devel/git-merge-changelog/distinfo | 3 +++ devel/git-merge-changelog/files/patch-test-errno.c | 13 --------- 3 files changed, 9 insertions(+), 38 deletions(-) diff --git a/devel/git-merge-changelog/Makefile b/devel/git-merge-changelog/Makefile index c797f34cd10d..aad85751c926 100644 --- a/devel/git-merge-changelog/Makefile +++ b/devel/git-merge-changelog/Makefile @@ -1,36 +1,17 @@ PORTNAME= git-merge-changelog -PORTVERSION= ${GNULIB_PORTVERSION} -PORTREVISION= ${GNULIB_PORTREVISION} -PORTEPOCH= ${GNULIB_PORTEPOCH} +PORTVERSION= 1.0 +PORTEPOCH= 1 CATEGORIES= devel -MASTER_SITES= # none -DISTFILES= # none +MASTER_SITES= https://ftp.gnu.org/gnu/vc-changelog/ MAINTAINER= ports@FreeBSD.org COMMENT= Git "merge" driver for GNU style ChangeLog files +WWW= https://www.gnu.org/software/vc-changelog/ -EXTRACT_DEPENDS= ${GNULIB_DIR}/lib/${PORTNAME}.c:${GNULIB_PORT} \ - automake>=1.15:devel/automake \ - autoconf>=2.69:devel/autoconf +LICENSE= GPLv3+ GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= bin/${PORTNAME} -BROKEN_aarch64= Fails to compile: error: bit-field _gl_verify_error_if_negative has negative width (-1) - -.include - -GNULIB_DIR= ${LOCALBASE}/share/gnulib -GNULIB_PORT= devel/gnulib -GNULIB_PORTDIR= ${PORTSDIR}/${GNULIB_PORT} -GNULIB_PORTVERSION!= cd ${GNULIB_PORTDIR} && ${MAKE} -V PORTVERSION -GNULIB_PORTREVISION!= cd ${GNULIB_PORTDIR} && ${MAKE} -V PORTREVISION -GNULIB_PORTEPOCH!= cd ${GNULIB_PORTDIR} && ${MAKE} -V PORTEPOCH - -do-extract: - ${MKDIR} ${WRKDIR} - cd ${GNULIB_DIR}; ./gnulib-tool --create-testdir --dir="${WRKSRC}" ${PORTNAME} - -.include +.include diff --git a/devel/git-merge-changelog/distinfo b/devel/git-merge-changelog/distinfo new file mode 100644 index 000000000000..6ebddd26b91c --- /dev/null +++ b/devel/git-merge-changelog/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1770300626 +SHA256 (git-merge-changelog-1.0.tar.gz) = 65b7c98eed59f90f51510ff44641ca82e880be8e88f7d7906740a30e105c90c0 +SIZE (git-merge-changelog-1.0.tar.gz) = 1207734 diff --git a/devel/git-merge-changelog/files/patch-test-errno.c b/devel/git-merge-changelog/files/patch-test-errno.c deleted file mode 100644 index 92ffcb48ce07..000000000000 --- a/devel/git-merge-changelog/files/patch-test-errno.c +++ /dev/null @@ -1,13 +0,0 @@ ---- gltests/test-errno.c.orig 2013-08-05 11:25:41.000000000 +0900 -+++ gltests/test-errno.c 2013-09-18 16:47:59.374921027 +0900 -@@ -98,8 +98,8 @@ - int e116 = ESTALE; - int e122 = EDQUOT; - int e125 = ECANCELED; --int e130 = EOWNERDEAD; --int e131 = ENOTRECOVERABLE; -+/* int e130 = EOWNERDEAD; */ -+/* int e131 = ENOTRECOVERABLE; */ - - /* Don't verify that these errno values are all different, except for possibly - EWOULDBLOCK == EAGAIN. Even Linux/x86 does not pass this check: it has