Attachment #165299 for bug #205676




# $FreeBSD$

PORTNAME=	giflib
PORTVERSION=	5.1.2
CATEGORIES=	graphics
MASTER_SITES=	SF/${PORTNAME}


.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
EXTRA_PATCHES=	${FILESDIR}/extra-unbundle-reallocarray
.else
EXTRA_PATCHES=	${FILESDIR}/extra-hide-reallocarray
		${WRKSRC}/Makefile.in
.endif

post-install:

Lines 1-2 Link Here

(-)graphics/giflib/distinfo (-2 / +2 lines)
1	SHA256 (giflib-5.1.1.tar.bz2) = 391014aceb21c8b489dc7b0d0b6a917c4e32cc014ce2426d47ca376d02fe2ffc	1	SHA256 (giflib-5.1.2.tar.bz2) = 76c0a084c3b02f9315ff937b8be6096186002fea26f33e2123081ba2be6e2a7c
2	SIZE (giflib-5.1.1.tar.bz2) = 654389	2	SIZE (giflib-5.1.2.tar.bz2) = 638967




--- 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) __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                          
 ******************************************************************************/




--- lib/Makefile.in.orig	2016-01-07 12:54:02 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:

Line 0 Link Here

(-)graphics/giflib/files/patch-lib_gif__lib.h (+12 lines)
	1	--- lib/gif_lib.h.orig 2016-01-07 12:51:53 UTC
	2	+++ lib/gif_lib.h
	3	@@ -244,9 +244,6 @@ extern ColorMapObject *GifUnionColorMap(
	4	GifPixelType ColorTransIn2[]);
	5	extern int GifBitSize(int n);
	6
	7	-extern void *
	8	-reallocarray(void *optr, size_t nmemb, size_t size);
	9	-
	10	/******************************************************************************
	11	Support for the in-core structures allocation (slurp mode).
	12	******************************************************************************/

Return to bug 205676

Lines 2-8 Link Here

(-)graphics/giflib/Makefile (-6 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= giflib	4	PORTNAME= giflib
5	PORTVERSION= 5.1.1	5	PORTVERSION= 5.1.2
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7	MASTER_SITES= SF/${PORTNAME}	7	MASTER_SITES= SF/${PORTNAME}
8		8
Lines 25-37 Link Here
25	.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}	25	.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
26	BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \	26	BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \
27	docbook-xml>0:${PORTSDIR}/textproc/docbook-xml	27	docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
		28	.else
		29	CONFIGURE_ENV+= have_xmlto=no
28	.endif	30	.endif
29		31
30	post-patch:	32	.if ${OSVERSION} >= 1100072
31	.if ! ${PORT_OPTIONS:MDOCBOOK} \|\| ! ${PORT_OPTIONS:MDOCS}	33	EXTRA_PATCHES= ${FILESDIR}/extra-unbundle-reallocarray
32	${REINPLACE_CMD} \	34	.else
33	-e 's\|SUBDIRS = lib util doc pic\|SUBDIRS = lib util pic\|' \	35	EXTRA_PATCHES= ${FILESDIR}/extra-hide-reallocarray
34	${WRKSRC}/Makefile.in
35	.endif	36	.endif
36		37
37	post-install:	38	post-install:

Line 0 Link Here

(-)graphics/giflib/files/extra-hide-reallocarray (+24 lines)
	1	--- lib/dgif_lib.c.orig 2016-01-07 10:44:44 UTC
	2	+++ lib/dgif_lib.c
	3	@@ -41,6 +41,9 @@ static int DGifDecompressInput(GifFileTy
	4	static int DGifBufferedInput(GifFileType GifFile, GifByteType Buf,
	5	GifByteType *NextByte);
	6
	7	+extern void *
	8	+reallocarray(void *optr, size_t nmemb, size_t size) __hidden;
	9	+
	10	/******************************************************************************
	11	Open a new GIF file for read, given by its name.
	12	Returns dynamically allocated GifFileType pointer which serves as the GIF
	13	--- lib/gifalloc.c.orig 2015-07-13 04:05:46 UTC
	14	+++ lib/gifalloc.c
	15	@@ -12,6 +12,9 @@
	16
	17	#define MAX(x, y) (((x) > (y)) ? (x) : (y))
	18
	19	+extern void *
	20	+reallocarray(void *optr, size_t nmemb, size_t size) __hidden;
	21	+
	22	/******************************************************************************
	23	Miscellaneous utility functions
	24	******************************************************************************/

Line 0 Link Here

(-)graphics/giflib/files/extra-unbundle-reallocarray (+27 lines)
	1	--- lib/Makefile.in.orig 2016-01-07 12:54:02 UTC
	2	+++ lib/Makefile.in
	3	@@ -134,7 +134,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
	4	LTLIBRARIES = $(lib_LTLIBRARIES)
	5	libgif_la_LIBADD =
	6	am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \
	7	- gifalloc.lo openbsd-reallocarray.lo gif_err.lo quantize.lo
	8	+ gifalloc.lo gif_err.lo quantize.lo
	9	libgif_la_OBJECTS = $(am_libgif_la_OBJECTS)
	10	AM_V_lt = $(am__v_lt_@AM_V@)
	11	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
	12	@@ -331,7 +331,6 @@ libgif_la_SOURCES = dgif_lib.c \
	13	gif_hash.c \
	14	gif_hash.h \
	15	gifalloc.c \
	16	- openbsd-reallocarray.c \
	17	gif_err.c \
	18	gif_lib_private.h \
	19	quantize.c
	20	@@ -422,7 +421,6 @@ distclean-compile:
	21	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@
	22	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@
	23	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@
	24	-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openbsd-reallocarray.Plo@am__quote@
	25	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@
	26
	27	.c.o: