Index: head/graphics/giflib/Makefile =================================================================== --- head/graphics/giflib/Makefile (revision 424273) +++ head/graphics/giflib/Makefile (revision 424274) @@ -1,51 +1,55 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= giflib -PORTVERSION= 5.1.3 +PORTVERSION= 5.1.4 PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} MAINTAINER= portmgr@FreeBSD.org COMMENT= Tools and library routines for working with GIF images -CONFLICTS= libungif-[0-9]* +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING +TEST_DEPENDS= ghead:sysutils/coreutils + USES= tar:bzip2 libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes OPTIONS_DEFINE= DOCBOOK DOCS OPTIONS_SUB= yes DOCBOOK_DESC= Generate API documentation (requires DOCS) INSTALL_TARGET= install-strip +TEST_TARGET= check-TESTS .include .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 . if ${OSVERSION} >= 1100072 EXTRA_PATCHES= ${FILESDIR}/extra-patch-unbundle-reallocarray . else EXTRA_PATCHES= ${FILESDIR}/extra-patch-hide-reallocarray . endif .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 .include Index: head/graphics/giflib/distinfo =================================================================== --- head/graphics/giflib/distinfo (revision 424273) +++ head/graphics/giflib/distinfo (revision 424274) @@ -1,2 +1,3 @@ -SHA256 (giflib-5.1.3.tar.bz2) = 5096d27805283599b01074d487ad3f8e02bd26b84d759b9017be876ca3d5b81d -SIZE (giflib-5.1.3.tar.bz2) = 639420 +TIMESTAMP = 1476601913 +SHA256 (giflib-5.1.4.tar.bz2) = df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5 +SIZE (giflib-5.1.4.tar.bz2) = 639703 Index: head/graphics/giflib/files/extra-patch-hide-reallocarray =================================================================== --- head/graphics/giflib/files/extra-patch-hide-reallocarray (revision 424273) +++ head/graphics/giflib/files/extra-patch-hide-reallocarray (revision 424274) @@ -1,24 +1,24 @@ ---- lib/dgif_lib.c.orig 2016-01-07 10:44:44 UTC +--- lib/dgif_lib.c.orig 2016-04-02 15:34:00 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) __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) __hidden; + /****************************************************************************** Miscellaneous utility functions ******************************************************************************/ Index: head/graphics/giflib/files/extra-patch-unbundle-reallocarray =================================================================== --- head/graphics/giflib/files/extra-patch-unbundle-reallocarray (revision 424273) +++ head/graphics/giflib/files/extra-patch-unbundle-reallocarray (revision 424274) @@ -1,27 +1,27 @@ ---- lib/Makefile.in.orig 2016-01-07 12:54:02 UTC +--- 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: Index: head/graphics/giflib/files/patch-lib_gif__lib.h =================================================================== --- head/graphics/giflib/files/patch-lib_gif__lib.h (revision 424273) +++ head/graphics/giflib/files/patch-lib_gif__lib.h (revision 424274) @@ -1,12 +1,12 @@ ---- lib/gif_lib.h.orig 2016-01-07 12:51:53 UTC +--- 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). ******************************************************************************/ Index: head/graphics/giflib/files/patch-tests_makefile =================================================================== --- head/graphics/giflib/files/patch-tests_makefile (nonexistent) +++ head/graphics/giflib/files/patch-tests_makefile (revision 424274) @@ -0,0 +1,24 @@ +--- tests/makefile.orig 2014-05-16 10:46:53 UTC ++++ tests/makefile +@@ -27,7 +27,7 @@ rebuild: render-rebuild \ + UTILS = ../util + PICS = ../pic + +-GIFS := $(shell ls ../pic/*.gif) ++GIFS := `ls ../pic/*.gif` + + # 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: + + 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." Property changes on: head/graphics/giflib/files/patch-tests_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