Index: head/graphics/giflib/Makefile =================================================================== --- head/graphics/giflib/Makefile (revision 410034) +++ head/graphics/giflib/Makefile (revision 410035) @@ -1,47 +1,51 @@ # Created by: Thomas Gellekum # $FreeBSD$ PORTNAME= giflib PORTVERSION= 5.1.2 PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME} MAINTAINER= portmgr@FreeBSD.org COMMENT= Tools and library routines for working with GIF images CONFLICTS= libungif-[0-9]* 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 .include .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \ docbook-xml>0:${PORTSDIR}/textproc/docbook-xml .else CONFIGURE_ENV+= have_xmlto=no .endif -.if ${OSVERSION} >= 1100072 +.if ${OPSYS} == FreeBSD +. if ${OSVERSION} >= 1100072 EXTRA_PATCHES= ${FILESDIR}/extra-patch-unbundle-reallocarray -.else +. 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/files/extra-patch-hide-reallocarray-dfly =================================================================== --- head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly (nonexistent) +++ head/graphics/giflib/files/extra-patch-hide-reallocarray-dfly (revision 410035) @@ -0,0 +1,24 @@ +--- 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 ___________________________________________________________________ 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