Index: head/graphics/giflib/Makefile =================================================================== --- head/graphics/giflib/Makefile (revision 503450) +++ head/graphics/giflib/Makefile (revision 503451) @@ -1,34 +1,34 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= giflib -PORTVERSION= 5.1.8 +PORTVERSION= 5.1.9 PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} MAINTAINER= portmgr@FreeBSD.org COMMENT= Tools and library routines for working with GIF images LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= ghead:sysutils/coreutils USES= gmake USE_LDCONFIG= yes CFLAGS+= -DHAVE_REALLOCARRAY MAKE_ARGS= CC=${CC} LDFLAGS="${LDFLAGS}" MANDIR=${MANPREFIX}/man OFLAGS="${CFLAGS}" PREFIX="${PREFIX}" 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 )" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STRIP_CMD} --strip-unneeded ${STAGEDIR}${PREFIX}/lib/libgif.so.7.1.0 .include Index: head/graphics/giflib/distinfo =================================================================== --- head/graphics/giflib/distinfo (revision 503450) +++ head/graphics/giflib/distinfo (revision 503451) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553869894 -SHA256 (giflib-5.1.8.tar.gz) = d105a905df34a7822172d13657cdae3d4b0c8e8c7067ccf05e39a40044f8ca53 -SIZE (giflib-5.1.8.tar.gz) = 419065 +TIMESTAMP = 1557928206 +SHA256 (giflib-5.1.9.tar.gz) = 36ccab06aa43e5d608cdd74902f89c47fd55c348009798434ba5798967454057 +SIZE (giflib-5.1.9.tar.gz) = 385068 Index: head/graphics/giflib/files/patch-Makefile =================================================================== --- head/graphics/giflib/files/patch-Makefile (revision 503450) +++ head/graphics/giflib/files/patch-Makefile (revision 503451) @@ -1,46 +1,60 @@ ---- Makefile.orig 2019-03-17 16:33:02 UTC +--- Makefile.orig 2019-03-28 18:57:23 UTC +++ Makefile -@@ -9,7 +9,7 @@ - CC = gcc +@@ -8,7 +8,7 @@ + # OFLAGS = -O0 -g - #OFLAGS = -O2 -fwhole-program + OFLAGS = -O2 -CFLAGS = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS) +CFLAGS = -std=gnu99 -fPIC -Wall $(OFLAGS) - LDFLAGS = -g SHELL = /bin/sh -@@ -58,15 +58,21 @@ UTILS = $(INSTALLABLE) \ + TAR = tar +@@ -29,11 +29,11 @@ LIBPOINT=0 + LIBVER=$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) + + SOURCES = dgif_lib.c egif_lib.c gifalloc.c gif_err.c gif_font.c \ +- gif_hash.c openbsd-reallocarray.c ++ gif_hash.c openbsd-reallocarray.c quantize.c + HEADERS = gif_hash.h gif_lib.h gif_lib_private.h + OBJECTS = $(SOURCES:.c=.o) + +-USOURCES = qprintf.c quantize.c getarg.c ++USOURCES = qprintf.c getarg.c + UHEADERS = getarg.h + UOBJECTS = $(USOURCES:.c=.o) + +@@ -60,15 +60,21 @@ UTILS = $(INSTALLABLE) \ gifsponge \ gifwedge -LDLIBS=libgif.a -lm +LDLIBS=-Wl,-rpath -Wl,$(LIBDIR) -lm - all: libgif.so libgif.a $(UTILS) + all: libgif.so libgif.a libutil.so libutil.a $(UTILS) $(MAKE) -C doc --$(UTILS):: libgif.a -+$(UTILS):: libgif.so +-$(UTILS):: libgif.a libutil.a ++$(UTILS):: libgif.so libutil.a -libgif.so: $(OBJECTS) $(HEADERS) -- $(CC) $(CFLAGS) -shared $(OFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) +- $(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) -@@ -92,7 +98,7 @@ install-include: +@@ -100,7 +106,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" install-man: Index: head/graphics/giflib/files/patch-tests_makefile =================================================================== --- head/graphics/giflib/files/patch-tests_makefile (revision 503450) +++ head/graphics/giflib/files/patch-tests_makefile (revision 503451) @@ -1,24 +1,24 @@ ---- tests/makefile.orig 2019-02-10 22:36:27 UTC +--- 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 \ -@@ -103,10 +105,10 @@ giffilter-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." Index: head/graphics/giflib/pkg-plist =================================================================== --- head/graphics/giflib/pkg-plist (revision 503450) +++ head/graphics/giflib/pkg-plist (revision 503451) @@ -1,77 +1,74 @@ bin/gif2rgb bin/gifbuild bin/gifclrmp bin/gifecho bin/giffilter bin/giffix bin/gifinto bin/gifsponge bin/giftext bin/giftool include/gif_lib.h lib/libgif.a lib/libgif.so lib/libgif.so.7 lib/libgif.so.7.1.0 man/man1/gif2rgb.1.gz man/man1/gifbg.1.gz man/man1/gifbuild.1.gz man/man1/gifclrmp.1.gz man/man1/gifcolor.1.gz man/man1/gifecho.1.gz man/man1/giffix.1.gz man/man1/gifhisto.1.gz man/man1/gifinto.1.gz man/man1/giflib.1.gz man/man1/giftext.1.gz man/man1/giftool.1.gz man/man1/gifwedge.1.gz %%PORTDOCS%%%%DOCSDIR%%/00README %%PORTDOCS%%%%DOCSDIR%%/gif2rgb.html -%%PORTDOCS%%%%DOCSDIR%%/gif87.txt -%%PORTDOCS%%%%DOCSDIR%%/gif89.txt %%PORTDOCS%%%%DOCSDIR%%/gif_lib.html %%PORTDOCS%%%%DOCSDIR%%/gifbg.html %%PORTDOCS%%%%DOCSDIR%%/gifbuild.html %%PORTDOCS%%%%DOCSDIR%%/gifclrmp.html %%PORTDOCS%%%%DOCSDIR%%/gifcolor.html %%PORTDOCS%%%%DOCSDIR%%/gifecho.html %%PORTDOCS%%%%DOCSDIR%%/giffix.html %%PORTDOCS%%%%DOCSDIR%%/gifhisto.html %%PORTDOCS%%%%DOCSDIR%%/gifinto.html %%PORTDOCS%%%%DOCSDIR%%/giflib.html %%PORTDOCS%%%%DOCSDIR%%/giftext.html %%PORTDOCS%%%%DOCSDIR%%/giftool.html %%PORTDOCS%%%%DOCSDIR%%/gifwedge.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/intro.html -%%PORTDOCS%%%%DOCSDIR%%/lzgif.txt %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/animation_and_transparency.html %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/bits_and_bytes.html %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/comment_ext.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/gif_file_stream.gif %%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 %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/logical_screen_desc_block.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/lzw_decoding_bytes.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/lzw_encoding_codes.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/lzw_image_data.html %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/lzw_image_data_code_table.html %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_1.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_1_enlarged.gif %%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_green.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation_red.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_animation_yellow.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_green_large.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_green_yellow_diff.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/sample_2_yellow_large.gif %%PORTDOCS%%%%DOCSDIR%%/whatsinagif/trailer_block.gif