>Number:         32688
>Category:       pkg
>Synopsis:       [patch] update graphics/libungif to 4.1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Feb 01 06:35:00 +0000 2006
>Originator:     Matthew Luckie
>Release:        NetBSD 2.0.2
>Organization:
	
>Environment:
	
	
System: NetBSD spandex.plunket.luckie.org.nz 2.0.2 NetBSD 2.0.2 (spandex) #4: Mon Aug 29 20:11:26 NZST 2005 root@spandex.plunket.luckie.org.nz:/usr/src/sys/arch/i386/compile/spandex i386
Architecture: i386
Machine: i386
>Description:
	update libungif to 4.1.4
	fix pkglint warnings
>How-To-Repeat:
	N/A
>Fix:
Note: the four patches patch-aa patch-ac patch-ad patch-ae are no
longer required.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libungif/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile	5 Dec 2005 20:50:21 -0000	1.36
+++ Makefile	1 Feb 2006 06:16:19 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.36 2005/12/05 20:50:21 rillig Exp $
 
-DISTNAME=	libungif-4.1.3
-PKGREVISION=	3
+DISTNAME=	libungif-4.1.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libungif/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,7 +14,7 @@ CONFLICTS=	giflib-[0-9]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LTCONFIG_OVERRIDE+=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-x
@@ -24,7 +23,7 @@ CONFIGURE_ENV+=		ac_cv_lib_X11_main=no
 DOCDIR=			${PREFIX}/share/doc/libungif
 HTMLDIR=		${PREFIX}/share/doc/html/libungif
 
-REPLACE_PERL=		util/gifburst
+REPLACE_PERL+=		util/gifburst
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/gif2x11.html
@@ -35,7 +34,7 @@ post-install:
 	  TARGET=`echo $$SOURCE | ${SED} -e s/libungif/libgif/`;	\
 	  ${RM} -f $$TARGET; 						\
 	  if [ $$SOURCE = libungif.la ]; then				\
-	    ${SED} -e s/libungif/libgif/g $$SOURCE >$$TARGET;		\
+	    ${SED} -e 's/libungif/libgif/g' $$SOURCE >$$TARGET;		\
 	    ${CHMOD} 755 $$TARGET;					\
 	  else								\
 	    ${LN} -s $$SOURCE $$TARGET;					\
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/libungif/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo	5 Nov 2005 13:32:36 -0000	1.10
+++ distinfo	1 Feb 2006 06:16:19 -0000
@@ -1,10 +1,6 @@
 $NetBSD: distinfo,v 1.10 2005/11/05 13:32:36 adrianp Exp $
 
-SHA1 (libungif-4.1.3.tar.bz2) = 04aab31b3e9e719a80320667bc23b3ee35505a34
-RMD160 (libungif-4.1.3.tar.bz2) = 287abf7560f5394e62c475f0d722938842ba6786
-Size (libungif-4.1.3.tar.bz2) = 439960 bytes
-SHA1 (patch-aa) = eb2d1f1d21e19adc8bc33dcbd24be5c20560f4fd
+SHA1 (libungif-4.1.4.tar.bz2) = af687ffbcfe6afd1d76e33ea8cf27ffb02ed61fc
+RMD160 (libungif-4.1.4.tar.bz2) = f96782d4e305e393a22acd84317c13dc265a21f3
+Size (libungif-4.1.4.tar.bz2) = 482222 bytes
 SHA1 (patch-ab) = a93e2fe0a93aacda4566e723e681fd316fe2cb2a
-SHA1 (patch-ac) = 58985225879ea2d60a1eb9e8a17595f8a0ed95a5
-SHA1 (patch-ad) = dc5e0123b950674abe46be6508f3f8bb1a69641d
-SHA1 (patch-ae) = 43b271ae9ec6eddd8341526e6b8636c503cd209c
--- patches/patch-aa	2005-03-20 23:07:33.000000000 +1200
+++ /dev/null	2006-02-01 19:10:14.000000000 +1300
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/03/20 11:07:33 schwarz Exp $
-
---- util/gif2iris.c.orig	2005-03-19 17:50:38.000000000 +0100
-+++ util/gif2iris.c	2005-03-19 18:06:18.000000000 +0100
-@@ -30,6 +30,9 @@
- #include "gl.h"
- #include "device.h"
- 
-+#ifndef __MSDOS__
-+#include <stdlib.h>
-+#endif
- #include <stdio.h>
- #include <ctype.h>
- #include <string.h>
-@@ -229,8 +232,8 @@
-     BackGround = GifFile->SBackGroundColor;
-     ColorMap = (GifFile->Image.ColorMap ? GifFile->Image.ColorMap :
- 				       GifFile->SColorMap);
--    ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.BitsPerPixel :
--				                GifFile->SBitsPerPixel);
-+    ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->BitsPerPixel :
-+				                GifFile->SColorMap->BitsPerPixel);
-     GifQprintf("\n");
-     Screen2Iris(ScreenBuffer, GifFile->SWidth, GifFile->SHeight);
- 
--- patches/patch-ac	2005-11-06 02:32:36.000000000 +1300
+++ /dev/null	2006-02-01 19:10:14.000000000 +1300
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2005/11/05 13:32:36 adrianp Exp $
-
---- lib/gifalloc.c.orig	2004-05-29 19:59:59.000000000 +0100
-+++ lib/gifalloc.c
-@@ -420,8 +420,10 @@ FreeSavedImages(GifFileType * GifFile) {
-     }
-     for (sp = GifFile->SavedImages;
-          sp < GifFile->SavedImages + GifFile->ImageCount; sp++) {
--        if (sp->ImageDesc.ColorMap)
-+      if (sp->ImageDesc.ColorMap) {
-             FreeMapObject(sp->ImageDesc.ColorMap);
-+	    sp->ImageDesc.ColorMap = NULL;
-+      }
- 
-         if (sp->RasterBits)
-             free((char *)sp->RasterBits);
--- patches/patch-ad	2005-11-06 02:32:36.000000000 +1300
+++ /dev/null	2006-02-01 19:10:14.000000000 +1300
@@ -1,63 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/11/05 13:32:36 adrianp Exp $
-
---- lib/dgif_lib.c.orig	2004-05-29 19:59:59.000000000 +0100
-+++ lib/dgif_lib.c
-@@ -263,6 +263,7 @@ DGifGetScreenDesc(GifFileType * GifFile)
-         for (i = 0; i < GifFile->SColorMap->ColorCount; i++) {
-             if (READ(GifFile, Buf, 3) != 3) {
-                 FreeMapObject(GifFile->SColorMap);
-+		GifFile->SColorMap = NULL;
-                 _GifError = D_GIF_ERR_READ_FAILED;
-                 return GIF_ERROR;
-             }
-@@ -363,6 +364,7 @@ DGifGetImageDesc(GifFileType * GifFile) 
-         for (i = 0; i < GifFile->Image.ColorMap->ColorCount; i++) {
-             if (READ(GifFile, Buf, 3) != 3) {
-                 FreeMapObject(GifFile->Image.ColorMap);
-+		GifFile->Image.ColorMap = NULL;
-                 _GifError = D_GIF_ERR_READ_FAILED;
-                 return GIF_ERROR;
-             }
-@@ -923,6 +925,12 @@ DGifDecompressInput(GifFileType * GifFil
-         0x0fff
-     };
- 
-+    /* The image can't contain more than LZ_BITS per code. */
-+    if (Private->RunningBits > LZ_BITS) {
-+        _GifError = D_GIF_ERR_IMAGE_DEFECT;
-+        return GIF_ERROR;
-+    }    
-+
-     while (Private->CrntShiftState < Private->RunningBits) {
-         /* Needs to get more bytes from input stream for next code: */
-         if (DGifBufferedInput(GifFile, Private->Buf, &NextByte) == GIF_ERROR) {
-@@ -938,8 +946,12 @@ DGifDecompressInput(GifFileType * GifFil
-     Private->CrntShiftState -= Private->RunningBits;
- 
-     /* If code cannot fit into RunningBits bits, must raise its size. Note
--     * however that codes above 4095 are used for special signaling.  */
--    if (++Private->RunningCode > Private->MaxCode1 &&
-+     * however that codes above 4095 are used for special signaling.
-+     * If we're using LZ_BITS bits already and we're at the max code, just
-+     * keep using the table as it is, don't increment Private->RunningCode.
-+     */
-+    if (Private->RunningCode < LZ_MAX_CODE + 2 &&
-+	++Private->RunningCode > Private->MaxCode1 &&
-         Private->RunningBits < LZ_BITS) {
-         Private->MaxCode1 <<= 1;
-         Private->RunningBits++;
-@@ -964,6 +976,14 @@ DGifBufferedInput(GifFileType * GifFile,
-             _GifError = D_GIF_ERR_READ_FAILED;
-             return GIF_ERROR;
-         }
-+        /* There shouldn't be any empty data blocks here as the LZW spec
-+         * says the LZW termination code should come first.  Therefore we
-+         * shouldn't be inside this routine at that point.
-+         */
-+        if (Buf[0] == 0) {
-+            _GifError = D_GIF_ERR_IMAGE_DEFECT;
-+            return GIF_ERROR;
-+        }
-         if (READ(GifFile, &Buf[1], Buf[0]) != Buf[0]) {
-             _GifError = D_GIF_ERR_READ_FAILED;
-             return GIF_ERROR;
--- patches/patch-ae	2005-11-06 02:32:36.000000000 +1300
+++ /dev/null	2006-02-01 19:10:14.000000000 +1300
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/11/05 13:32:36 adrianp Exp $
-
---- lib/egif_lib.c.orig	2004-05-29 22:53:36.000000000 +0100
-+++ lib/egif_lib.c
-@@ -712,10 +712,14 @@ EGifCloseFile(GifFileType * GifFile) {
-     Buf = ';';
-     WRITE(GifFile, &Buf, 1);
- 
--    if (GifFile->Image.ColorMap)
-+    if (GifFile->Image.ColorMap) {
-         FreeMapObject(GifFile->Image.ColorMap);
--    if (GifFile->SColorMap)
-+	GifFile->Image.ColorMap = NULL;
-+    }
-+    if (GifFile->SColorMap) {
-         FreeMapObject(GifFile->SColorMap);
-+	GifFile->SColorMap = NULL;
-+    }
-     if (Private) {
-         free((char *)Private);
-     }

>Unformatted: