Date: Thu, 05 Feb 2026 14:43:42 +0000 From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fbefe22c550a - main - devel/git-merge-changelog: Update to 1.0 Message-ID: <6984ac9e.3be97.9cdf4a6@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=fbefe22c550ada685823b185b930e0d6f31b8174 commit fbefe22c550ada685823b185b930e0d6f31b8174 Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2026-02-05 14:29:43 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> 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 <bsd.port.pre.mk> - -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 <bsd.port.post.mk> +.include <bsd.port.mk> 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 hashome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6984ac9e.3be97.9cdf4a6>