aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Clausecker <fuz@FreeBSD.org>2026-02-28 14:52:28 +0000
committerRobert Clausecker <fuz@FreeBSD.org>2026-03-08 22:24:48 +0000
commit16eb147bebc3b183c83c7ea32e1d576b727655a5 (patch)
tree375ca55bd3c7240c17cf0c8225f03e1f6860f7aa
parent640c21fb2c067900811fd3c00420126fc289f660 (diff)
textproc/comparator: update to 2.14
This fixes a bug discovered on FreeBSD. Changelog: https://gitlab.com/esr/comparator/-/blob/master/NEWS.adoc?ref_type=heads
-rw-r--r--textproc/comparator/Makefile6
-rw-r--r--textproc/comparator/distinfo6
-rw-r--r--textproc/comparator/files/patch-Makefile21
3 files changed, 12 insertions, 21 deletions
diff --git a/textproc/comparator/Makefile b/textproc/comparator/Makefile
index f48f1e7ab45e..2b5b5f48e0c7 100644
--- a/textproc/comparator/Makefile
+++ b/textproc/comparator/Makefile
@@ -1,5 +1,5 @@
PORTNAME= comparator
-DISTVERSION= 2.13
+DISTVERSION= 2.14
CATEGORIES= textproc devel
MAINTAINER= fuz@FreeBSD.org
@@ -9,14 +9,16 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor
+TEST_DEPENDS= gmake:devel/gmake
USES= python shebangfix
USE_GITLAB= yes
GL_ACCOUNT= esr
-CFLAGS+= -DLARGEFILES
MAKE_ARGS= VERSION=${DISTVERSION}
TEST_TARGET= check
+DO_MAKE_TEST= ${SETENVI} ${WRK_ENV} ${TEST_ENV} ${GMAKE} ${MAKE_FLAGS} \
+ ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}
SHEBANG_FILES= hashgen.py filterator
.include <bsd.port.mk>
diff --git a/textproc/comparator/distinfo b/textproc/comparator/distinfo
index 10900e2bfc87..e2764430408f 100644
--- a/textproc/comparator/distinfo
+++ b/textproc/comparator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1770728200
-SHA256 (comparator-2.13.tar.bz2) = f591cd8400bfefec6636bd6c018127bb9b4b341bf3ede21fb43f2c1ebe1f7ede
-SIZE (comparator-2.13.tar.bz2) = 41704
+TIMESTAMP = 1772290044
+SHA256 (comparator-2.14.tar.bz2) = 304ae1ff4a13d91bd366052e32468f21610d5b05859cb60db056a9a976008147
+SIZE (comparator-2.14.tar.bz2) = 41597
diff --git a/textproc/comparator/files/patch-Makefile b/textproc/comparator/files/patch-Makefile
index 9d1343fd0847..1c6f30d76325 100644
--- a/textproc/comparator/files/patch-Makefile
+++ b/textproc/comparator/files/patch-Makefile
@@ -1,22 +1,11 @@
---- Makefile.orig 2026-02-10 12:32:33 UTC
+--- Makefile.orig 2026-02-28 14:41:28 UTC
+++ Makefile
-@@ -15,8 +15,8 @@ SOURCES = $(CODE) $(SCRIPTS) $(DOCS) $(EXTRAS) $(TEST)
+@@ -15,7 +15,7 @@ SOURCES = $(CODE) $(SCRIPTS) $(DOCS) $(EXTRAS) $(TEST)
EXTRAS = shredtree.py shredcompare.py
TEST = test
SOURCES = $(CODE) $(SCRIPTS) $(DOCS) $(EXTRAS) $(TEST) Makefile
--CFLAGS = -O3
--LDFLAGS =
-+CFLAGS ?= -O3
-+LDFLAGS ?=
+-CFLAGS = -O3 -Wall -Wextra -Werror -fstack-protector-strong -fno-strict-aliasing -DLARGEFILES
++CFLAGS += -O3 -Wall -Wextra -fstack-protector-strong -fno-strict-aliasing -DLARGEFILES
+ LDFLAGS =
VERSION=$(shell sed -n <NEWS.adoc '/^[0-9]/s/:.*//p' | head -1)
-
-@@ -40,7 +40,7 @@ main.o: main.c shred.h hash.h
- all: comparator comparator.1
-
- main.o: main.c shred.h hash.h
-- $(CC) -DVERSIONION=\"$(VERSION)\" -c $(CFLAGS) main.c
-+ $(CC) -DVERSION=\"$(VERSION)\" -c $(CFLAGS) main.c
- linebyline.o: linebyline.c
- $(CC) -c $(CFLAGS) linebyline.c
- hash.o: hash.c hash.h hashtab.h