5 files changed, 16 insertions, 27 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 4671cefd6ef8..1377ef2e703e 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,13 +1,12 @@
-# New ports collection makefile for:	libungif
+# New ports collection makefile for:	giflib
 # Date created:		03 May 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libungif
-PORTVERSION=	4.1.4
-PORTREVISION=	5
+PORTNAME=	giflib
+PORTVERSION=	4.1.6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	giflib
@@ -28,12 +27,13 @@ NOX11SUFFIX=	-nox11
 .else
 USE_XORG=	sm x11
 PLIST_SUB+=	X11=''
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/UNCOMPRESSED_GIF ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCSDIR}
diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo
index 482ea0b218d5..bf1db8f42326 100644
--- a/graphics/giflib/distinfo
+++ b/graphics/giflib/distinfo
@@ -1,3 +1,3 @@
-MD5 (libungif-4.1.4.tar.bz2) = 76865bc1bed90ecb5992a1edcc4d6c15
-SHA256 (libungif-4.1.4.tar.bz2) = 708a7eac218d3fd8e8dfb13f1089d4e1e98246985180a17d6ecfca5a6bd4d332
-SIZE (libungif-4.1.4.tar.bz2) = 482222
+MD5 (giflib-4.1.6.tar.bz2) = 7125644155ae6ad33dbc9fc15a14735f
+SHA256 (giflib-4.1.6.tar.bz2) = e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed
+SIZE (giflib-4.1.6.tar.bz2) = 506050
diff --git a/graphics/giflib/files/patch-util_giftext.c b/graphics/giflib/files/patch-util_giftext.c
deleted file mode 100644
index 6227d274d74f..000000000000
--- a/graphics/giflib/files/patch-util_giftext.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- util/giftext.c.orig	Mon Oct 10 08:08:51 2005
-+++ util/giftext.c	Mon Aug 28 17:01:18 2006
-@@ -136,5 +136,5 @@
- 	printf("\tColorResolution = %d, BitsPerPixel = %d, BackGround = %d.\n",
- 	       GifFile->SColorResolution,
--	       GifFile->SColorMap->BitsPerPixel,
-+	       GifFile->SColorMap?GifFile->SColorMap->BitsPerPixel:0,
- 	       GifFile->SBackGroundColor);
- 	if (GifFile->SColorMap)
diff --git a/graphics/giflib/pkg-descr b/graphics/giflib/pkg-descr
index d371f89d18f1..79a4734578e7 100644
--- a/graphics/giflib/pkg-descr
+++ b/graphics/giflib/pkg-descr
@@ -1,6 +1,5 @@
-A library for reading and writing gif images.  The save functionality
-uses an uncompressed gif algorithm to avoid the Unisys LZW patent.
-This library is based on Eric Raymond's giflib and implements a
-superset of that library's API.
+giflib is a library for reading and writing gif images.
+It is API and ABI compatible with libungif which was in wide use
+while the LZW compression algorithm was patented
 
-WWW: http://sourceforge.net/projects/libungif/
+WWW: http://sourceforge.net/projects/giflib/
diff --git a/graphics/giflib/pkg-plist b/graphics/giflib/pkg-plist
index 3ebd5060a57b..e1b6dcc382dc 100644
--- a/graphics/giflib/pkg-plist
+++ b/graphics/giflib/pkg-plist
@@ -29,12 +29,11 @@ bin/raw2gif
 bin/rgb2gif
 bin/text2gif
 include/gif_lib.h
-lib/libungif.a
-lib/libungif.la
-lib/libungif.so
-lib/libungif.so.5
+lib/libgif.a
+lib/libgif.la
+lib/libgif.so
+lib/libgif.so.5
 %%PORTDOCS%%%%DOCSDIR%%/GifFileType.png
-%%PORTDOCS%%%%DOCSDIR%%/UNCOMPRESSED_GIF
 %%PORTDOCS%%%%DOCSDIR%%/gif2bgi.html
 %%PORTDOCS%%%%DOCSDIR%%/gif2epsn.html
 %%PORTDOCS%%%%DOCSDIR%%/gif2herc.html