Index: head/graphics/giflib/Makefile =================================================================== --- head/graphics/giflib/Makefile (revision 501665) +++ head/graphics/giflib/Makefile (revision 501666) @@ -1,51 +1,34 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= giflib -PORTVERSION= 5.1.4 +PORTVERSION= 5.1.8 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= tar:bzip2 libtool -GNU_CONFIGURE= yes +USES= gmake USE_LDCONFIG= yes +CFLAGS+= -DHAVE_REALLOCARRAY +MAKE_ARGS= CC=${CC} LDFLAGS="${LDFLAGS}" MANDIR=${MANPREFIX}/man OFLAGS="${CFLAGS}" -OPTIONS_DEFINE= DOCBOOK DOCS -OPTIONS_SUB= yes -DOCBOOK_DESC= Generate API documentation (requires DOCS) -INSTALL_TARGET= install-strip -TEST_TARGET= check-TESTS +OPTIONS_DEFINE= DOCS +TEST_TARGET= check -.include +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 )" -.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= xmlto:textproc/xmlto \ - docbook-xml>0:textproc/docbook-xml -.else -CONFIGURE_ENV+= have_xmlto=no -.endif - -.if ${OPSYS} == FreeBSD -EXTRA_PATCHES= ${FILESDIR}/extra-patch-unbundle-reallocarray -.elif ${OPSYS} == DragonFly -EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray-dfly -.endif - post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/ -.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR}/ -.endif + ${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 501665) +++ head/graphics/giflib/distinfo (revision 501666) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476601913 -SHA256 (giflib-5.1.4.tar.bz2) = df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5 -SIZE (giflib-5.1.4.tar.bz2) = 639703 +TIMESTAMP = 1553869894 +SHA256 (giflib-5.1.8.tar.gz) = d105a905df34a7822172d13657cdae3d4b0c8e8c7067ccf05e39a40044f8ca53 +SIZE (giflib-5.1.8.tar.gz) = 419065 Index: head/graphics/giflib/files/patch-lib_gif__lib.h =================================================================== --- head/graphics/giflib/files/patch-lib_gif__lib.h (revision 501665) +++ head/graphics/giflib/files/patch-lib_gif__lib.h (nonexistent) @@ -1,12 +0,0 @@ ---- lib/gif_lib.h.orig 2016-04-02 15:35:30 UTC -+++ lib/gif_lib.h -@@ -244,9 +244,6 @@ extern ColorMapObject *GifUnionColorMap( - GifPixelType ColorTransIn2[]); - extern int GifBitSize(int n); - --extern void * --reallocarray(void *optr, size_t nmemb, size_t size); -- - /****************************************************************************** - Support for the in-core structures allocation (slurp mode). - ******************************************************************************/ Property changes on: head/graphics/giflib/files/patch-lib_gif__lib.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly =================================================================== --- head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly (revision 501665) +++ head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly (nonexistent) @@ -1,24 +0,0 @@ ---- lib/dgif_lib.c.orig 2016-01-07 10:44:44 UTC -+++ lib/dgif_lib.c -@@ -41,6 +41,9 @@ static int DGifDecompressInput(GifFileTy - static int DGifBufferedInput(GifFileType *GifFile, GifByteType *Buf, - GifByteType *NextByte); - -+extern void * -+reallocarray(void *optr, size_t nmemb, size_t size) __dso_hidden; -+ - /****************************************************************************** - Open a new GIF file for read, given by its name. - Returns dynamically allocated GifFileType pointer which serves as the GIF ---- lib/gifalloc.c.orig 2015-07-13 04:05:46 UTC -+++ lib/gifalloc.c -@@ -12,6 +12,9 @@ - - #define MAX(x, y) (((x) > (y)) ? (x) : (y)) - -+extern void * -+reallocarray(void *optr, size_t nmemb, size_t size) __dso_hidden; -+ - /****************************************************************************** - Miscellaneous utility functions - ******************************************************************************/ Property changes on: head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/giflib/files/extra-patch-unbundle-reallocarray =================================================================== --- head/graphics/giflib/files/extra-patch-unbundle-reallocarray (revision 501665) +++ head/graphics/giflib/files/extra-patch-unbundle-reallocarray (nonexistent) @@ -1,27 +0,0 @@ ---- lib/Makefile.in.orig 2016-04-02 15:36:45 UTC -+++ lib/Makefile.in -@@ -134,7 +134,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - libgif_la_LIBADD = - am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \ -- gifalloc.lo openbsd-reallocarray.lo gif_err.lo quantize.lo -+ gifalloc.lo gif_err.lo quantize.lo - libgif_la_OBJECTS = $(am_libgif_la_OBJECTS) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -@@ -331,7 +331,6 @@ libgif_la_SOURCES = dgif_lib.c \ - gif_hash.c \ - gif_hash.h \ - gifalloc.c \ -- openbsd-reallocarray.c \ - gif_err.c \ - gif_lib_private.h \ - quantize.c -@@ -422,7 +421,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openbsd-reallocarray.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@ - - .c.o: Property changes on: head/graphics/giflib/files/extra-patch-unbundle-reallocarray ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/giflib/files/patch-Makefile =================================================================== --- head/graphics/giflib/files/patch-Makefile (nonexistent) +++ head/graphics/giflib/files/patch-Makefile (revision 501666) @@ -0,0 +1,46 @@ +--- Makefile.orig 2019-03-17 16:33:02 UTC ++++ Makefile +@@ -9,7 +9,7 @@ + CC = gcc + OFLAGS = -O0 -g + #OFLAGS = -O2 -fwhole-program +-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) \ + gifsponge \ + gifwedge + +-LDLIBS=libgif.a -lm ++LDLIBS=-Wl,-rpath -Wl,$(LIBDIR) -lm + + all: libgif.so libgif.a $(UTILS) + $(MAKE) -C doc + +-$(UTILS):: libgif.a ++$(UTILS):: libgif.so + +-libgif.so: $(OBJECTS) $(HEADERS) +- $(CC) $(CFLAGS) -shared $(OFLAGS) -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: + 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: Property changes on: head/graphics/giflib/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/giflib/files/patch-tests_makefile =================================================================== --- head/graphics/giflib/files/patch-tests_makefile (revision 501665) +++ head/graphics/giflib/files/patch-tests_makefile (revision 501666) @@ -1,24 +1,24 @@ ---- tests/makefile.orig 2014-05-16 10:46:53 UTC +--- tests/makefile.orig 2019-02-10 22:36:27 UTC +++ tests/makefile -@@ -27,7 +27,7 @@ rebuild: render-rebuild \ - UTILS = ../util - PICS = ../pic +@@ -3,6 +3,8 @@ --GIFS := $(shell ls ../pic/*.gif) -+GIFS := `ls ../pic/*.gif` + .SUFFIXES: .gif .rgb - # Test decompression and rendering by unpacking images, - # converting them to RGB, and comparing that result to a check file. -@@ -103,10 +103,10 @@ giffilter-regress: ++export LD_LIBRARY_PATH=$(CURDIR)/.. ++ + # This is what to do by default + test: render-regress \ + gifbuild-regress \ +@@ -103,10 +105,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 501665) +++ head/graphics/giflib/pkg-plist (revision 501666) @@ -1,44 +1,77 @@ 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.0.0 +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 -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif2rgb.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif87.txt -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif89.txt -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gif_lib.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifbg.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifbuild.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifclrmp.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifcolor.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifecho.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/giffix.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifhisto.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifinto.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/giflib.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/giftext.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/giftool.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/gifwedge.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/intro.html -%%DOCBOOK%%%%PORTDOCS%%%%DOCSDIR%%/lzgif.txt +%%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