4 files changed, 80 insertions, 74 deletions

diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 1e61cf0bfaa3..5bdad1781f64 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	giflib
+# New ports collection makefile for:	libungif
 # Version required:	4.1.0
 # Date created:		03 May 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
@@ -6,24 +6,33 @@
 # $FreeBSD$
 #
 
-DISTNAME=	giflib-4.1.0
+DISTNAME=	libungif-4.1.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	libs/giflib
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		ftp://prtr-13.ucsc.edu/pub/libungif/
+MASTER_SITE_SUBDIR=	libs/graphics
+
+PATCH_SITES=	http://www.arrakeen.demon.co.uk/giflib/
+PATCHFILES=	libungif-4.1.0-19990224.patch.gz \
+		libungif-4.1.0-19990305.patch.gz \
+		libungif-4.1.0-19990322.patch.gz \
+		libungif-4.1.0-19990523.patch.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_XLIB=	yes
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
+DOCDIR=		${PREFIX}/share/doc/libungif
+
 post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/giflib
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/giflib
-	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${PREFIX}/share/doc/giflib
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/giflib
+	@${MKDIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/UNCOMPRESSED_GIF ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/libungif/distinfo b/graphics/libungif/distinfo
index 3e4f0c07ac60..8acbcef677d8 100644
--- a/graphics/libungif/distinfo
+++ b/graphics/libungif/distinfo
@@ -1 +1,5 @@
-MD5 (giflib-4.1.0.tar.gz) = f70e8fe2dd57815bd2740aa88aa32f2c
+MD5 (libungif-4.1.0.tar.gz) = 35427da9b40e06faae0db531c41c7eb6
+MD5 (libungif-4.1.0-19990224.patch.gz) = 78c3c753fb992ff7c544335f34108029
+MD5 (libungif-4.1.0-19990305.patch.gz) = 20cd29f816fee2826f65b4b0def9c1b5
+MD5 (libungif-4.1.0-19990322.patch.gz) = 2bdc1cc32fcabb45772490523fb4b203
+MD5 (libungif-4.1.0-19990523.patch.gz) = 6ee8ed587bb831f7d7ef402150e3616c
diff --git a/graphics/libungif/pkg-descr b/graphics/libungif/pkg-descr
index 7f5e101ddb0f..94901ec2180c 100644
--- a/graphics/libungif/pkg-descr
+++ b/graphics/libungif/pkg-descr
@@ -1,14 +1,7 @@
-The tools include programs to clip, rotate, scale, and position
-GIF images.  It includes an X11 viewer, and code to dump GIFs to an
-Epson-compatible printer in graphics mode, and several conversion utilities.
+GIF loading and saving shared library.  (Saving uses an uncompressed gif
+algorithm that does not use LZW compression.)
 
-The library includes program-callable entry points for reading and writing
-GIF files, an 8x8 utility font for embedding text in GIFs, and an error
-handler.  GIF manipulation can be done at a relatively low level by
-sequential I/O (which automatically does/undoes image compression) or at
-a higher level by slurping an entire GIF into allocated core.
+See /usr/local/share/doc/libungif directory for more information
+on libungif's capabilities.
 
-See /usr/local/share/doc/giflib directory for more information
-on GIFLIB's capabilities.
-
-WWW: http://prtr-13.ucsc.edu/~badger/software/giflib.shtml
+WWW: http://prtr-13.ucsc.edu/~badger/software/libungif/
diff --git a/graphics/libungif/pkg-plist b/graphics/libungif/pkg-plist
index ead5013ee061..4376dd78ec5a 100644
--- a/graphics/libungif/pkg-plist
+++ b/graphics/libungif/pkg-plist
@@ -4,9 +4,13 @@ bin/gif2rgb
 bin/gif2x11
 bin/gifasm
 bin/gifbg
+bin/gifburst
 bin/gifclip
 bin/gifclrmp
+bin/gifcolor
 bin/gifcomb
+bin/gifcompose
+bin/giffiltr
 bin/giffix
 bin/gifflip
 bin/gifhisto
@@ -16,61 +20,57 @@ bin/gifovly
 bin/gifpos
 bin/gifrotat
 bin/gifrsize
+bin/gifspnge
 bin/giftext
 bin/gifwedge
+bin/icon2gif
 bin/raw2gif
 bin/rgb2gif
 bin/text2gif
-bin/gifspnge
-bin/giffiltr
-bin/icon2gif
-bin/gifcolor
-bin/gifcompose
-bin/gifburst
 include/gif_lib.h
-lib/libgif.a
-lib/libgif.so
-lib/libgif.so.5
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
+lib/libungif.a
+lib/libungif.so
+lib/libungif.so.5
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-share/doc/giflib/gif2bgi.html
-share/doc/giflib/gif2epsn.html
-share/doc/giflib/gif2herc.html
-share/doc/giflib/gif2iris.html
-share/doc/giflib/gif2ps.html
-share/doc/giflib/gif2rgb.html
-share/doc/giflib/gif2rle.html
-share/doc/giflib/gif2x11.html
-share/doc/giflib/gif89.txt
-share/doc/giflib/gif_lib.html
-share/doc/giflib/gifasm.html
-share/doc/giflib/gifbg.html
-share/doc/giflib/gifburst.html
-share/doc/giflib/gifclip.html
-share/doc/giflib/gifclrmp.html
-share/doc/giflib/gifcolor.html
-share/doc/giflib/gifcomb.html
-share/doc/giflib/gifcompose.html
-share/doc/giflib/giffiltr.html
-share/doc/giflib/giffix.html
-share/doc/giflib/gifflip.html
-share/doc/giflib/gifhisto.html
-share/doc/giflib//GifFileType.png
-share/doc/giflib/gifinter.html
-share/doc/giflib/gifinto.html
-share/doc/giflib/gifovly.html
-share/doc/giflib/gifpos.html
-share/doc/giflib/gifrotat.html
-share/doc/giflib/gifrsize.html
-share/doc/giflib/gifspnge.html
-share/doc/giflib/giftext.html
-share/doc/giflib/gifwedge.html
-share/doc/giflib/icon2gif.html
-share/doc/giflib/index.html
-share/doc/giflib/liberror.html
-share/doc/giflib/lzgif.txt
-share/doc/giflib/raw2gif.html
-share/doc/giflib/rgb2gif.html
-share/doc/giflib/rle2gif.html
-share/doc/giflib/text2gif.html
-@dirrm share/doc/giflib
+share/doc/libungif/GifFileType.png
+share/doc/libungif/UNCOMPRESSED_GIF
+share/doc/libungif/gif2bgi.html
+share/doc/libungif/gif2epsn.html
+share/doc/libungif/gif2herc.html
+share/doc/libungif/gif2iris.html
+share/doc/libungif/gif2ps.html
+share/doc/libungif/gif2rgb.html
+share/doc/libungif/gif2rle.html
+share/doc/libungif/gif2x11.html
+share/doc/libungif/gif89.txt
+share/doc/libungif/gif_lib.html
+share/doc/libungif/gifasm.html
+share/doc/libungif/gifbg.html
+share/doc/libungif/gifburst.html
+share/doc/libungif/gifclip.html
+share/doc/libungif/gifclrmp.html
+share/doc/libungif/gifcolor.html
+share/doc/libungif/gifcomb.html
+share/doc/libungif/gifcompose.html
+share/doc/libungif/giffiltr.html
+share/doc/libungif/giffix.html
+share/doc/libungif/gifflip.html
+share/doc/libungif/gifhisto.html
+share/doc/libungif/gifinter.html
+share/doc/libungif/gifinto.html
+share/doc/libungif/gifovly.html
+share/doc/libungif/gifpos.html
+share/doc/libungif/gifrotat.html
+share/doc/libungif/gifrsize.html
+share/doc/libungif/gifspnge.html
+share/doc/libungif/giftext.html
+share/doc/libungif/gifwedge.html
+share/doc/libungif/icon2gif.html
+share/doc/libungif/index.html
+share/doc/libungif/liberror.html
+share/doc/libungif/lzgif.txt
+share/doc/libungif/raw2gif.html
+share/doc/libungif/rgb2gif.html
+share/doc/libungif/rle2gif.html
+share/doc/libungif/text2gif.html