From nobody Sat Apr 27 18:53:51 2024 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 4VRdzN1NRpz5Jg04; Sat, 27 Apr 2024 18:53:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VRdzM4XS6z4n6t; Sat, 27 Apr 2024 18:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714244031; 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=vF3C0h3Wir0zMMpuilb2tofVOWcpejXmiSwfIrowlpw=; b=BE4HEqkloJqtj0+cxLSyssIqJcXFcz2BtnZSP7FMwOcb8aqsqYqCmj25UYfrZdBmdLU/Kr QM1e3wPg/lqcEqMPrmmJaZKOCsZ3TeaHoTMkX8cOdWYm9ZhmUg3roaq4gVSz/ou3vApSL4 lDu4Q2McMNlQ3FkTRW4Yc04P89Jz9x4Yz+VzT8+12ZD65kQNXWjpIwlqI/Ssz1NSD50kva Um3watpopzG8RkehnNJXcJ9G65ddh8Y+hAMgvdhiiNluvf3RIH397V3hwXKWYwgsvXGdCj /b5hTuU6XX+TtxQ/Ojcxh3O/j0d8/AJKBCHAbc4f+cNiXoNF3MLuHxXgrvqX3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714244031; a=rsa-sha256; cv=none; b=qGD62GcvM2LTtFG8mT3mPze/lG8gkQkyyZqoSNdMjv06EJNYNP4gFwJABtrhI93Uolo+EG w2GzzabTPFlDjQQsYFo9FncBfYTm6r7mDbjLccuqw5u42X9Iix7aUUQdpRxE7DZtcoGdEc vpYSEBebfPetk9EX51cNuVZJC7gROUnBxpNk1zbsT4aakgddayoDNTRo0vhrZfXdslpAEz 2vQTmBhAoAsDJ3oa7UBTsVaNXWVIfRym5QPQzDq+2LKHvcw7opwpsFI7aepZoWtIKZ6glH 6n7WT5zDtcvehu/GD09mVhj8Gfrm0jLsWTsKroB7qaQQdwM/WmolGLiDGZ3fmg== 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=1714244031; 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=vF3C0h3Wir0zMMpuilb2tofVOWcpejXmiSwfIrowlpw=; b=Y9x8DDpgVXGfoTgk3hbqvW5KTow3hduPESy0k3iWe9QLqinhbeDxu76EYvV6wt0S0cYEuQ nk0OMBluXurfQNSOlczFqE4G/jCTUDn8/yvAC5RokkB23gqCeyCEKdiax+6uWtwaPW+46s KRGj3TsrZNDpmS1CjgyTuP9Ww2/9O8Y4A6+wgCzOVFOlO01/8Wg8ze2sMRxVL3KH/u1t+j m5reCUg6C+AGhdfA9e+nlBhrD+EvCkfh9S/8Cacxju12egetXOU5ZabdaFjGuHOUGuo3Dd CXdMUDEBbyvXVWa0Q+HSq6Xy4NpOsbDm4lhk4cP6IXEI5CWUuG1hNAfUJez++A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VRdzM3sjYzsVN; Sat, 27 Apr 2024 18:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43RIrpRR037979; Sat, 27 Apr 2024 18:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43RIrp7k037976; Sat, 27 Apr 2024 18:53:51 GMT (envelope-from git) Date: Sat, 27 Apr 2024 18:53:51 GMT Message-Id: <202404271853.43RIrp7k037976@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 17bfc9d343da - main - graphics/giflib: Update to 5.2.2 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17bfc9d343da40ef6b9eeed818c1c2dd14785878 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=17bfc9d343da40ef6b9eeed818c1c2dd14785878 commit 17bfc9d343da40ef6b9eeed818c1c2dd14785878 Author: Tijl Coosemans AuthorDate: 2024-04-27 15:38:15 +0000 Commit: Tijl Coosemans CommitDate: 2024-04-27 18:42:38 +0000 graphics/giflib: Update to 5.2.2 Pet portclippy and portfmt. --- graphics/giflib/Makefile | 20 ++++++--- graphics/giflib/distinfo | 6 +-- graphics/giflib/files/patch-Makefile | 71 ++++++++++++------------------ graphics/giflib/files/patch-tests_makefile | 24 ---------- graphics/giflib/pkg-plist | 26 +++++------ 5 files changed, 57 insertions(+), 90 deletions(-) diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index a0b0bc141753..1d9754c2dad6 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -1,6 +1,5 @@ PORTNAME= giflib -PORTVERSION= 5.2.1 -PORTREVISION= 1 +PORTVERSION= 5.2.2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} @@ -14,19 +13,28 @@ LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= ghead:sysutils/coreutils USES= cpe gmake +CPE_VENDOR= giflib_project USE_LDCONFIG= yes + +MAKE_ARGS= CC=${CC} \ + LDFLAGS="${LDFLAGS}" \ + OFLAGS="${CFLAGS}" \ + PREFIX="${PREFIX}" +TEST_TARGET= check + CFLAGS+= -DHAVE_REALLOCARRAY -MAKE_ARGS= CC=${CC} LDFLAGS="${LDFLAGS}" MANDIR=${PREFIX}/share/man OFLAGS="${CFLAGS}" PREFIX="${PREFIX}" -CPE_VENDOR= giflib_project CONFLICTS_INSTALL= giftool +BINARY_ALIAS= head ghead + OPTIONS_DEFINE= DOCS -TEST_TARGET= check do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! ( -name Makefile -o -name *\.1 -o -name *\.in -o -name *\.xml )" + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ + "! ( -name Makefile -o -name *\.[17] -o -name *\.xml )" + ${MV} ${STAGEDIR}${DOCSDIR}/index.html.in ${STAGEDIR}${DOCSDIR}/index.html post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo index e08801a17a47..6cefa7643dcb 100644 --- a/graphics/giflib/distinfo +++ b/graphics/giflib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1573114002 -SHA256 (giflib-5.2.1.tar.gz) = 31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd -SIZE (giflib-5.2.1.tar.gz) = 444187 +TIMESTAMP = 1714225271 +SHA256 (giflib-5.2.2.tar.gz) = be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb +SIZE (giflib-5.2.2.tar.gz) = 447175 diff --git a/graphics/giflib/files/patch-Makefile b/graphics/giflib/files/patch-Makefile index aa972cb0e90f..4fc7a7f5c3df 100644 --- a/graphics/giflib/files/patch-Makefile +++ b/graphics/giflib/files/patch-Makefile @@ -1,46 +1,33 @@ ---- Makefile.orig 2019-06-24 16:08:57 UTC +--- Makefile.orig 2024-02-19 01:01:50 UTC +++ Makefile -@@ -8,7 +8,7 @@ - # - OFLAGS = -O0 -g - OFLAGS = -O2 --CFLAGS = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS) -+CFLAGS = -std=gnu99 -fPIC -Wall $(OFLAGS) +@@ -64,13 +64,14 @@ MANUAL_PAGES = \ + LDLIBS=libgif.a -lm - SHELL = /bin/sh - TAR = tar -@@ -59,15 +59,21 @@ UTILS = $(INSTALLABLE) \ - gifsponge \ - gifwedge + MANUAL_PAGES = \ +- doc/gif2rgb.xml \ +- doc/gifbuild.xml \ +- doc/gifclrmp.xml \ +- doc/giffix.xml \ +- doc/giflib.xml \ +- doc/giftext.xml \ +- doc/giftool.xml ++ doc/gif2rgb.1 \ ++ doc/gifbuild.1 \ ++ doc/gifclrmp.1 \ ++ doc/giffix.1 \ ++ doc/giftext.1 \ ++ doc/giftool.1 ++MAN7_PAGES= \ ++ doc/giflib.7 --LDLIBS=libgif.a -lm -+LDLIBS=-Wl,-rpath -Wl,$(LIBDIR) -lm - - all: libgif.so libgif.a libutil.so libutil.a $(UTILS) - $(MAKE) -C doc - --$(UTILS):: libgif.a libutil.a -+$(UTILS):: libgif.so libutil.a - --libgif.so: $(OBJECTS) $(HEADERS) -- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) -+libgif.so.$(LIBVER): $(OBJECTS) $(HEADERS) -+ $(CC) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o $@ $(OBJECTS) -+ -+libgif.so.$(LIBMAJOR): libgif.so.$(LIBVER) -+ ln -s $< $@ -+ -+libgif.so: libgif.so.$(LIBMAJOR) -+ ln -s $< $@ - - libgif.a: $(OBJECTS) $(HEADERS) - $(AR) rcs libgif.a $(OBJECTS) -@@ -99,7 +105,7 @@ install-include: - install-lib: - $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" -- $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" -+ $(INSTALL) -m 755 libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" - ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" - ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" + SOEXTENSION = so + LIBGIFSO = libgif.$(SOEXTENSION) +@@ -150,6 +151,8 @@ install-man: install-man: + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1" ++ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man7" ++ $(INSTALL) -m 644 $(MAN7_PAGES) "$(DESTDIR)$(MANDIR)/man7" + uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin + uninstall-bin: + cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE) diff --git a/graphics/giflib/files/patch-tests_makefile b/graphics/giflib/files/patch-tests_makefile deleted file mode 100644 index d8ceec702425..000000000000 --- a/graphics/giflib/files/patch-tests_makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- tests/makefile.orig 2019-03-28 17:05:25 UTC -+++ tests/makefile -@@ -3,6 +3,8 @@ - - .SUFFIXES: .gif .rgb - -+export LD_LIBRARY_PATH=$(CURDIR)/.. -+ - # This is what to do by default - test: render-regress \ - gifbuild-regress \ -@@ -104,10 +106,10 @@ giffilter-regress: - - giffix-rebuild: - @echo "Rebuilding giffix test." -- @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico -+ @ghead --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico - giffix-regress: - @echo "giffix: Testing giffix behavior" -- @head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | diff -u giffixed.ico - -+ @ghead --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | diff -u giffixed.ico - - - gifinto-regress: - @echo "gifinto: Checking behavior on short files." diff --git a/graphics/giflib/pkg-plist b/graphics/giflib/pkg-plist index 8ffea031d789..d36ad8b139db 100644 --- a/graphics/giflib/pkg-plist +++ b/graphics/giflib/pkg-plist @@ -9,19 +9,6 @@ lib/libgif.a lib/libgif.so lib/libgif.so.7 lib/libgif.so.7.2.0 -share/man/man1/gif2rgb.1.gz -share/man/man1/gifbg.1.gz -share/man/man1/gifbuild.1.gz -share/man/man1/gifclrmp.1.gz -share/man/man1/gifcolor.1.gz -share/man/man1/gifecho.1.gz -share/man/man1/giffix.1.gz -share/man/man1/gifhisto.1.gz -share/man/man1/gifinto.1.gz -share/man/man1/giflib.1.gz -share/man/man1/giftext.1.gz -share/man/man1/giftool.1.gz -share/man/man1/gifwedge.1.gz %%PORTDOCS%%%%DOCSDIR%%/00README %%PORTDOCS%%%%DOCSDIR%%/gif2rgb.html %%PORTDOCS%%%%DOCSDIR%%/gif_lib.html @@ -30,10 +17,13 @@ share/man/man1/gifwedge.1.gz %%PORTDOCS%%%%DOCSDIR%%/gifclrmp.html %%PORTDOCS%%%%DOCSDIR%%/gifcolor.html %%PORTDOCS%%%%DOCSDIR%%/gifecho.html +%%PORTDOCS%%%%DOCSDIR%%/giffilter.html %%PORTDOCS%%%%DOCSDIR%%/giffix.html %%PORTDOCS%%%%DOCSDIR%%/gifhisto.html %%PORTDOCS%%%%DOCSDIR%%/gifinto.html +%%PORTDOCS%%%%DOCSDIR%%/giflib-logo.gif %%PORTDOCS%%%%DOCSDIR%%/giflib.html +%%PORTDOCS%%%%DOCSDIR%%/gifsponge.html %%PORTDOCS%%%%DOCSDIR%%/gifstandard/GIF89a.html %%PORTDOCS%%%%DOCSDIR%%/gifstandard/LZW-and-GIF-explained.html %%PORTDOCS%%%%DOCSDIR%%/gifstandard/gif-1over100.png @@ -56,8 +46,6 @@ share/man/man1/gifwedge.1.gz %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/global_color_table.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/graphic_control_ext.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/header_block.gif -%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/highlight_green.gif -%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/highlight_purple.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/image_data_block.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/image_descriptor_block.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/index.html @@ -71,6 +59,7 @@ share/man/man1/gifwedge.1.gz %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_1_trans.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_1_trans_blue.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_1_trans_red.gif +%%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation_green.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation_red.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation_yellow.gif @@ -78,3 +67,10 @@ share/man/man1/gifwedge.1.gz %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_green_yellow_diff.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_yellow_large.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/trailer_block.gif +share/man/man1/gif2rgb.1.gz +share/man/man1/gifbuild.1.gz +share/man/man1/gifclrmp.1.gz +share/man/man1/giffix.1.gz +share/man/man1/giftext.1.gz +share/man/man1/giftool.1.gz +share/man/man7/giflib.7.gz