diff --git a/devel/gettext-tiny/Makefile b/devel/gettext-tiny/Makefile index 3d81106187b5..b63c0b6a6165 100644 --- a/devel/gettext-tiny/Makefile +++ b/devel/gettext-tiny/Makefile @@ -1,31 +1,31 @@ PORTNAME= gettext-tiny -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 CATEGORIES= devel MASTER_SITES= https://ftp.barfooze.de/pub/sabotage/tarballs/ \ http://ftp.barfooze.de/pub/sabotage/tarballs/ MAINTAINER= bapt@FreeBSD.org COMMENT= Replacements for tools typically used from the GNU gettext suite WWW= https://github.com/sabotage-linux/gettext-tiny LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= tar:xz TOOLS= msgfmt msgmerge -SCRIPTS= xgettext +SCRIPTS= xgettext autopoint PLIST_FILES= ${TOOLS:C,^,bin/tiny-,} \ ${SCRIPTS:C,^,bin/tiny-,} MAKE_ARGS= prefix=${PREFIX} do-install: .for t in ${TOOLS} ${INSTALL_PROGRAM} ${WRKSRC}/$t ${STAGEDIR}${PREFIX}/bin/tiny-$t .endfor .for s in ${SCRIPTS} ${INSTALL_SCRIPT} ${WRKSRC}/$s ${STAGEDIR}${PREFIX}/bin/tiny-$s .endfor .include diff --git a/devel/gettext-tiny/distinfo b/devel/gettext-tiny/distinfo index efcf84a6fde0..bfa1cb231ee9 100644 --- a/devel/gettext-tiny/distinfo +++ b/devel/gettext-tiny/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1618476901 -SHA256 (gettext-tiny-0.3.2.tar.xz) = a9a72cfa21853f7d249592a3c6f6d36f5117028e24573d092f9184ab72bbe187 -SIZE (gettext-tiny-0.3.2.tar.xz) = 48836 +TIMESTAMP = 1767867908 +SHA256 (gettext-tiny-0.3.3.tar.xz) = 6715234941fed4f3694d6b56c18f3f20053fe344fce15ab148906036caa24dc7 +SIZE (gettext-tiny-0.3.3.tar.xz) = 49336 diff --git a/devel/gettext-tiny/files/patch-Makefile b/devel/gettext-tiny/files/patch-Makefile index 7e83facbc976..5f60d8fb254f 100644 --- a/devel/gettext-tiny/files/patch-Makefile +++ b/devel/gettext-tiny/files/patch-Makefile @@ -1,102 +1,56 @@ ---- Makefile.orig 2020-04-06 10:43:29 UTC +--- Makefile.orig 2026-01-07 17:32:48 UTC +++ Makefile -@@ -7,17 +7,13 @@ datarootdir=$(prefix)/share +@@ -7,17 +7,9 @@ acdir=$(datarootdir)/aclocal datadir=$(datarootdir)/gettext-tiny acdir=$(datarootdir)/aclocal -ifeq ($(LIBINTL), MUSL) - LIBSRC = libintl/libintl-musl.c - HEADERS = -else ifeq ($(LIBINTL), NONE) - LIBSRC = - HEADERS = -else - LIBSRC = libintl/libintl.c - HEADERS = libintl.h -endif -PROGSRC = $(sort $(wildcard src/*.c)) +LIBSRC = +HEADERS = -+PROGSRC = \ -+ src/StringEscape.c \ -+ src/msgfmt.c \ -+ src/msgmerge.c \ -+ src/poparser.c ++PROGSRC!= ls src/*.c - PARSEROBJS = src/poparser.o src/StringEscape.o + PARSEROBJS = src/poparser.o src/poparser_sysdep.o src/StringEscape.o PROGOBJS = $(PROGSRC:.c=.o) -@@ -25,25 +21,56 @@ LIBOBJS = $(LIBSRC:.c=.o) +@@ -25,12 +17,9 @@ ALL_INCLUDES = $(HEADERS) OBJS = $(PROGOBJS) $(LIBOBJS) ALL_INCLUDES = $(HEADERS) -ifneq ($(LIBINTL), NONE) -ALL_LIBS=libintl.a -endif ALL_TOOLS=msgfmt msgmerge xgettext autopoint -ALL_M4S=$(sort $(wildcard m4/*.m4)) -ALL_DATA=$(sort $(wildcard data/*)) -+ALL_M4S= \ -+ m4/ansi-c++.m4 \ -+ m4/codeset.m4 \ -+ m4/configheader.m4 \ -+ m4/fcntl-o.m4 \ -+ m4/gettext.m4 \ -+ m4/glibc2.m4 \ -+ m4/glibc21.m4 \ -+ m4/iconv.m4 \ -+ m4/intdiv0.m4 \ -+ m4/intl.m4 \ -+ m4/intldir.m4 \ -+ m4/intlmacosx.m4 \ -+ m4/intmax.m4 \ -+ m4/inttypes-pri.m4 \ -+ m4/inttypes_h.m4 \ -+ m4/lcmessage.m4 \ -+ m4/lib-ld.m4 \ -+ m4/lib-link.m4 \ -+ m4/lib-prefix.m4 \ -+ m4/lock.m4 \ -+ m4/longlong.m4 \ -+ m4/nls.m4 \ -+ m4/po.m4 \ -+ m4/printf-posix.m4 \ -+ m4/progtest.m4 \ -+ m4/size_max.m4 \ -+ m4/stdint_h.m4 \ -+ m4/threadlib.m4 \ -+ m4/uintmax_t.m4 \ -+ m4/visibility.m4 \ -+ m4/wchar_t.m4 \ -+ m4/wint_t.m4 \ -+ m4/xsize.m4 ++ALL_M4S!= ls m4/*.m4 ++ALL_DATA!= ls data/* --CFLAGS=-O0 -fPIC -+ALL_DATA= \ -+ data/Makevars.template \ -+ data/autopoint_Makefile.in + CFLAGS ?= -O0 -fPIC -+CFLAGS ?=-O0 -fPIC -+ - AR ?= $(CROSS_COMPILE)ar - RANLIB ?= $(CROSS_COMPILE)ranlib - CC ?= $(CROSS_COMPILE)cc +@@ -42,7 +31,7 @@ -include config.mak - INSTALL ?= ./install.sh + -include config.mak ---include config.mak +-LDLIBS:=$(shell echo "int main(){}" | $(CC) $(CFLAGS) $(LDFLAGS) -liconv -x c - >/dev/null 2>&1 && printf %s -liconv) +LDLIBS= --LDLIBS:=$(shell echo "int main(){}" | $(CC) -liconv -x c - >/dev/null 2>&1 && printf %s -liconv) -- BUILDCFLAGS=$(CFLAGS) - all: $(ALL_LIBS) $(ALL_TOOLS) -@@ -73,7 +100,7 @@ xgettext: +@@ -73,7 +62,7 @@ autopoint: src/autopoint.in cp src/xgettext.sh ./xgettext autopoint: src/autopoint.in - cat $< | sed 's,@datadir@,$(datadir),' > $@ -+ cat $> | sed 's,@datadir@,$(datadir),' > $@ ++ sed 's,@datadir@,$(datadir),' src/autopoint.in > $@ $(DESTDIR)$(libdir)/%.a: %.a $(INSTALL) -D -m 755 $< $@