5 files changed, 61 insertions, 74 deletions

diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 5858e32cb96a..ad087a2ac321 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	libungif
-PORTVERSION=	4.1.0b1
-PORTREVISION=	1
+PORTVERSION=	4.1.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://prtr-13.ucsc.edu/pub/libungif/ \
-		ftp://ftp.ayamura.org/pub/graphics/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools and library routines for working with GIF images
 
+CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
-
-USE_LIBTOOL_VER=13
+USE_BZIP2=	yes
+USE_LIBTOOL_VER=15
 
 .ifdef (WITHOUT_X11)
 PLIST_SUB+=	X11='@comment '
@@ -28,15 +28,13 @@ USE_XLIB=	yes
 PLIST_SUB+=	X11=''
 .endif
 
-DOCDIR=		${PREFIX}/share/doc/libungif
-
 post-install:
 .if !defined(NOPORTDOCS)
-	@${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}
+	@${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}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/giflib/distinfo b/graphics/giflib/distinfo
index 20c976f5a3db..97931c11e291 100644
--- a/graphics/giflib/distinfo
+++ b/graphics/giflib/distinfo
@@ -1,2 +1,2 @@
-MD5 (libungif-4.1.0b1.tar.gz) = 20d96eb90cf818a1da093614c44ad3e5
-SIZE (libungif-4.1.0b1.tar.gz) = 351757
+MD5 (libungif-4.1.2.tar.bz2) = 4f8e368b242a7cf73a9dc49887117d10
+SIZE (libungif-4.1.2.tar.bz2) = 424078
diff --git a/graphics/giflib/files/patch-configure b/graphics/giflib/files/patch-configure
deleted file mode 100644
index 12620c252929..000000000000
--- a/graphics/giflib/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Fri Jul 18 08:47:31 2003
-+++ configure	Fri Jul 18 08:48:20 2003
-@@ -3247,7 +3247,7 @@
- fi
- done
- 
--for ac_hdr in varargs.h
-+for ac_hdr in
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/graphics/giflib/pkg-descr b/graphics/giflib/pkg-descr
index 94901ec2180c..d371f89d18f1 100644
--- a/graphics/giflib/pkg-descr
+++ b/graphics/giflib/pkg-descr
@@ -1,7 +1,6 @@
-GIF loading and saving shared library.  (Saving uses an uncompressed gif
-algorithm that does not use LZW compression.)
+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.
 
-See /usr/local/share/doc/libungif directory for more information
-on libungif's capabilities.
-
-WWW: http://prtr-13.ucsc.edu/~badger/software/libungif/
+WWW: http://sourceforge.net/projects/libungif/
diff --git a/graphics/giflib/pkg-plist b/graphics/giflib/pkg-plist
index 56e27856ad19..3ebd5060a57b 100644
--- a/graphics/giflib/pkg-plist
+++ b/graphics/giflib/pkg-plist
@@ -30,47 +30,48 @@ bin/rgb2gif
 bin/text2gif
 include/gif_lib.h
 lib/libungif.a
+lib/libungif.la
 lib/libungif.so
 lib/libungif.so.5
-%%PORTDOCS%%share/doc/libungif/GifFileType.png
-%%PORTDOCS%%share/doc/libungif/UNCOMPRESSED_GIF
-%%PORTDOCS%%share/doc/libungif/gif2bgi.html
-%%PORTDOCS%%share/doc/libungif/gif2epsn.html
-%%PORTDOCS%%share/doc/libungif/gif2herc.html
-%%PORTDOCS%%share/doc/libungif/gif2iris.html
-%%PORTDOCS%%share/doc/libungif/gif2ps.html
-%%PORTDOCS%%share/doc/libungif/gif2rgb.html
-%%PORTDOCS%%share/doc/libungif/gif2rle.html
-%%PORTDOCS%%share/doc/libungif/gif2x11.html
-%%PORTDOCS%%share/doc/libungif/gif89.txt
-%%PORTDOCS%%share/doc/libungif/gif_lib.html
-%%PORTDOCS%%share/doc/libungif/gifasm.html
-%%PORTDOCS%%share/doc/libungif/gifbg.html
-%%PORTDOCS%%share/doc/libungif/gifburst.html
-%%PORTDOCS%%share/doc/libungif/gifclip.html
-%%PORTDOCS%%share/doc/libungif/gifclrmp.html
-%%PORTDOCS%%share/doc/libungif/gifcolor.html
-%%PORTDOCS%%share/doc/libungif/gifcomb.html
-%%PORTDOCS%%share/doc/libungif/gifcompose.html
-%%PORTDOCS%%share/doc/libungif/giffiltr.html
-%%PORTDOCS%%share/doc/libungif/giffix.html
-%%PORTDOCS%%share/doc/libungif/gifflip.html
-%%PORTDOCS%%share/doc/libungif/gifhisto.html
-%%PORTDOCS%%share/doc/libungif/gifinter.html
-%%PORTDOCS%%share/doc/libungif/gifinto.html
-%%PORTDOCS%%share/doc/libungif/gifovly.html
-%%PORTDOCS%%share/doc/libungif/gifpos.html
-%%PORTDOCS%%share/doc/libungif/gifrotat.html
-%%PORTDOCS%%share/doc/libungif/gifrsize.html
-%%PORTDOCS%%share/doc/libungif/gifspnge.html
-%%PORTDOCS%%share/doc/libungif/giftext.html
-%%PORTDOCS%%share/doc/libungif/gifwedge.html
-%%PORTDOCS%%share/doc/libungif/icon2gif.html
-%%PORTDOCS%%share/doc/libungif/index.html
-%%PORTDOCS%%share/doc/libungif/liberror.html
-%%PORTDOCS%%share/doc/libungif/lzgif.txt
-%%PORTDOCS%%share/doc/libungif/raw2gif.html
-%%PORTDOCS%%share/doc/libungif/rgb2gif.html
-%%PORTDOCS%%share/doc/libungif/rle2gif.html
-%%PORTDOCS%%share/doc/libungif/text2gif.html
-%%PORTDOCS%%@dirrm share/doc/libungif
+%%PORTDOCS%%%%DOCSDIR%%/GifFileType.png
+%%PORTDOCS%%%%DOCSDIR%%/UNCOMPRESSED_GIF
+%%PORTDOCS%%%%DOCSDIR%%/gif2bgi.html
+%%PORTDOCS%%%%DOCSDIR%%/gif2epsn.html
+%%PORTDOCS%%%%DOCSDIR%%/gif2herc.html
+%%PORTDOCS%%%%DOCSDIR%%/gif2iris.html
+%%PORTDOCS%%%%DOCSDIR%%/gif2ps.html
+%%PORTDOCS%%%%DOCSDIR%%/gif2rgb.html
+%%PORTDOCS%%%%DOCSDIR%%/gif2rle.html
+%%PORTDOCS%%%%DOCSDIR%%/gif2x11.html
+%%PORTDOCS%%%%DOCSDIR%%/gif89.txt
+%%PORTDOCS%%%%DOCSDIR%%/gif_lib.html
+%%PORTDOCS%%%%DOCSDIR%%/gifasm.html
+%%PORTDOCS%%%%DOCSDIR%%/gifbg.html
+%%PORTDOCS%%%%DOCSDIR%%/gifburst.html
+%%PORTDOCS%%%%DOCSDIR%%/gifclip.html
+%%PORTDOCS%%%%DOCSDIR%%/gifclrmp.html
+%%PORTDOCS%%%%DOCSDIR%%/gifcolor.html
+%%PORTDOCS%%%%DOCSDIR%%/gifcomb.html
+%%PORTDOCS%%%%DOCSDIR%%/gifcompose.html
+%%PORTDOCS%%%%DOCSDIR%%/giffiltr.html
+%%PORTDOCS%%%%DOCSDIR%%/giffix.html
+%%PORTDOCS%%%%DOCSDIR%%/gifflip.html
+%%PORTDOCS%%%%DOCSDIR%%/gifhisto.html
+%%PORTDOCS%%%%DOCSDIR%%/gifinter.html
+%%PORTDOCS%%%%DOCSDIR%%/gifinto.html
+%%PORTDOCS%%%%DOCSDIR%%/gifovly.html
+%%PORTDOCS%%%%DOCSDIR%%/gifpos.html
+%%PORTDOCS%%%%DOCSDIR%%/gifrotat.html
+%%PORTDOCS%%%%DOCSDIR%%/gifrsize.html
+%%PORTDOCS%%%%DOCSDIR%%/gifspnge.html
+%%PORTDOCS%%%%DOCSDIR%%/giftext.html
+%%PORTDOCS%%%%DOCSDIR%%/gifwedge.html
+%%PORTDOCS%%%%DOCSDIR%%/icon2gif.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/liberror.html
+%%PORTDOCS%%%%DOCSDIR%%/lzgif.txt
+%%PORTDOCS%%%%DOCSDIR%%/raw2gif.html
+%%PORTDOCS%%%%DOCSDIR%%/rgb2gif.html
+%%PORTDOCS%%%%DOCSDIR%%/rle2gif.html
+%%PORTDOCS%%%%DOCSDIR%%/text2gif.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%