libungif is not relevant any longer since the GIF relevant patents

expired (about 10 years ago).

Unconditionally switch to libgif.

As discussed on tech-pkg without dissent.

Bump PKGREVISION.

58 files changed, 157 insertions, 165 deletions

diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile
index 9e8cd05b33c..912c878ed27 100644
--- a/devel/devIL/Makefile
+++ b/devel/devIL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2014/05/15 14:41:46 adam Exp $
+# $NetBSD: Makefile,v 1.37 2014/05/31 15:56:26 wiz Exp $
 #
 
 DISTNAME=	DevIL-${DEVIL_VERSION}
 PKGNAME=	${DISTNAME:S/D/d/}
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openil/}
 
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--enable-ILUT
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index cc2e7851330..32995667375 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2014/05/15 14:41:46 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2014/05/31 15:56:26 wiz Exp $
 
 BUILDLINK_TREE+=	devIL
 
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/editors/emacs-snapshot/Makefile b/editors/emacs-snapshot/Makefile
index b4ea060b74b..78852bd7bba 100644
--- a/editors/emacs-snapshot/Makefile
+++ b/editors/emacs-snapshot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2014/05/16 07:59:34 tron Exp $
+# $NetBSD: Makefile,v 1.53 2014/05/31 15:56:26 wiz Exp $
 
-PKGREVISION=	5
+PKGREVISION=	6
 CONFLICTS+=	emacs${_EMACS_VERSION_MAJOR}-nox11-[0-9]*
 
 .include "../../editors/emacs-snapshot/Makefile.common"
diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk
index 8c11f638a6f..40e3bffe1ac 100644
--- a/editors/emacs-snapshot/options.mk
+++ b/editors/emacs-snapshot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2013/02/12 04:47:31 minskim Exp $
+# $NetBSD: options.mk,v 1.9 2014/05/31 15:56:26 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+=	--with-png
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 71d9630da90..5434d1edb84 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2014/05/29 23:36:30 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2014/05/31 15:56:26 wiz Exp $
 
-PKGREVISION=	30
+PKGREVISION=	31
 CATEGORIES=	editors
 
 CONFLICTS+=	emacs21-nox11-[0-9]*
diff --git a/editors/emacs21/options.mk b/editors/emacs21/options.mk
index a0d89bf31f5..bd6702f0c59 100644
--- a/editors/emacs21/options.mk
+++ b/editors/emacs21/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/03/09 16:28:21 drochner Exp $
+# $NetBSD: options.mk,v 1.4 2014/05/31 15:56:26 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=		x11
@@ -43,10 +43,7 @@ PKG_OPTIONS+=		xaw
 .  include "../../graphics/tiff/buildlink3.mk"
 .  include "../../graphics/png/buildlink3.mk"
 .  include "../../x11/libXpm/buildlink3.mk"
-
-# Need libungif>=4.1.0b1 (a bug in 4.1.0 can crash Emacs)
-BUILDLINK_API_DEPENDS.libungif+=	libungif>=4.1.0.1
-.  include "../../mk/giflib.buildlink3.mk"
+.  include "../../graphics/giflib/buildlink3.mk"
 
 CONFIGURE_ARGS+=	--with-gif
 CONFIGURE_ARGS+=	--with-jpeg
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index fa2f187b8fb..7b6c5ed68ea 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2014/05/29 23:36:31 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2014/05/31 15:56:26 wiz Exp $
 
-PKGREVISION=	37
+PKGREVISION=	38
 
 CONFLICTS+=	emacs22-nox11-[0-9]*
 
diff --git a/editors/emacs22/options.mk b/editors/emacs22/options.mk
index 088fe30b83f..f85af72b84d 100644
--- a/editors/emacs22/options.mk
+++ b/editors/emacs22/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/03/09 16:28:21 drochner Exp $
+# $NetBSD: options.mk,v 1.4 2014/05/31 15:56:26 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=		x11
@@ -36,10 +36,7 @@ PKG_OPTIONS+=		xaw
 .  include "../../graphics/tiff/buildlink3.mk"
 .  include "../../graphics/png/buildlink3.mk"
 .  include "../../x11/libXpm/buildlink3.mk"
-
-# Need libungif>=4.1.0b1 (a bug in 4.1.0 can crash Emacs)
-BUILDLINK_API_DEPENDS.libungif+=	libungif>=4.1.0.1
-.  include "../../mk/giflib.buildlink3.mk"
+.  include "../../graphics/giflib/buildlink3.mk"
 
 CONFIGURE_ARGS+=	--with-gif
 CONFIGURE_ARGS+=	--with-jpeg
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index 9ced7894ce6..c6862970d0e 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2014/05/16 07:59:34 tron Exp $
+# $NetBSD: Makefile,v 1.15 2014/05/31 15:56:26 wiz Exp $
 
 CONFLICTS+=	emacs23-nox11-[0-9]*
 
 .include "../../editors/emacs23/Makefile.common"
-PKGREVISION=	25
+PKGREVISION=	26
 
 .include "options.mk"
 
diff --git a/editors/emacs23/options.mk b/editors/emacs23/options.mk
index cd0ea1d0f85..c64b7d4718c 100644
--- a/editors/emacs23/options.mk
+++ b/editors/emacs23/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2013/02/17 04:59:42 dholland Exp $
+# $NetBSD: options.mk,v 1.2 2014/05/31 15:56:26 wiz Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--with-png
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index bd286504d6c..acce2ee6541 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2014/05/16 07:59:34 tron Exp $
+# $NetBSD: Makefile,v 1.27 2014/05/31 15:56:26 wiz Exp $
 
 CONFLICTS+=	emacs24-nox11-[0-9]*
-PKGREVISION=	12
+PKGREVISION=	13
 
 .include "../../editors/emacs24/Makefile.common"
 
diff --git a/editors/emacs24/options.mk b/editors/emacs24/options.mk
index 0c5b1aa1edb..5c77c7e6d40 100644
--- a/editors/emacs24/options.mk
+++ b/editors/emacs24/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2014/02/07 08:56:52 obache Exp $
+# $NetBSD: options.mk,v 1.5 2014/05/31 15:56:26 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=	dbus xft2 svg xml gnutls
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+=	--with-png
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 5f7b4a8103e..fed871ec8af 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2014/05/25 09:27:38 obache Exp $
+# $NetBSD: Makefile,v 1.115 2014/05/31 15:56:26 wiz Exp $
 
 DISTNAME=		vice-2.4
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 MASTER_SITES+=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
@@ -53,6 +53,6 @@ CPPFLAGS+=		-DHAVE_STDINT_H
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6243aa3c396..1d3b0dc1f94 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2014/05/15 14:41:47 adam Exp $
+# $NetBSD: Makefile,v 1.47 2014/05/31 15:56:26 wiz Exp $
 
 DISTNAME=	wine-1.7.11
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--enable-win64
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/emulators/wine-devel/buildlink3.mk b/emulators/wine-devel/buildlink3.mk
index d01d935e726..14a785d6db3 100644
--- a/emulators/wine-devel/buildlink3.mk
+++ b/emulators/wine-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2014/05/15 14:41:47 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2014/05/31 15:56:26 wiz Exp $
 
 BUILDLINK_TREE+=	wine
 
@@ -17,7 +17,7 @@ pkgbase:= wine
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .endif
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .endif # WINE_BUILDLINK3_MK
 
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index fbf92fdcf69..30801a3280b 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.182 2014/05/15 14:41:47 adam Exp $
+# $NetBSD: Makefile,v 1.183 2014/05/31 15:56:26 wiz Exp $
 
 DISTNAME=	wine-1.6.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--enable-win64
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index 4f4441f1024..09be462f6ae 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2014/05/15 14:41:47 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2014/05/31 15:56:26 wiz Exp $
 
 BUILDLINK_TREE+=	wine
 
@@ -17,7 +17,7 @@ pkgbase:= wine
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .endif
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .endif # WINE_BUILDLINK3_MK
 
diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index 79cec99929d..3ec16cd30ae 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2014/05/25 09:24:21 obache Exp $
+# $NetBSD: Makefile,v 1.93 2014/05/31 15:56:26 wiz Exp $
 
 DISTNAME=	fontforge_full-20120731-b
 PKGNAME=	${DISTNAME:S/_full//:S/-b//}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	fonts editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fontforge/}
 EXTRACT_SUFX=	.tar.bz2
@@ -37,6 +37,6 @@ BROKEN_GETTEXT_DETECTION=	yes
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 3175730d974..7b6aa6fc58c 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.66 2014/05/15 14:41:50 adam Exp $
+# $NetBSD: Makefile,v 1.67 2014/05/31 15:56:26 wiz Exp $
 
 VERSION=	1.9.2
 DISTNAME=	gdal-${VERSION}
 PKGNAME=	gdal-lib-${VERSION}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/gdal/
 
@@ -48,7 +48,7 @@ INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man1 share/gdal
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk
index 185da417c50..ca6cdb0a199 100644
--- a/geography/gdal-lib/buildlink3.mk
+++ b/geography/gdal-lib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.35 2014/05/15 14:41:50 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.36 2014/05/31 15:56:26 wiz Exp $
 
 BUILDLINK_TREE+=	gdal-lib
 
@@ -25,7 +25,7 @@ pkgbase := gdal-lib
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 95db3f4ee3c..cdb4423e992 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2014/05/25 08:54:18 obache Exp $
+# $NetBSD: Makefile,v 1.73 2014/05/31 15:56:26 wiz Exp $
 
 VERSION=		4.0.1
 PKGNAME=		camlimages-${VERSION}
-PKGREVISION=		37
+PKGREVISION=		38
 CATEGORIES=		graphics
 MASTER_SITES=		https://bitbucket.org/camlspotter/camlimages/get/
 DISTNAME=		v${VERSION}
@@ -46,7 +46,7 @@ BUILDLINK_API_DEPENDS.ocaml+=	ocaml>=3.11.0
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
diff --git a/graphics/evas-gif/Makefile b/graphics/evas-gif/Makefile
index f4f43fb4a24..3766b0e760f 100644
--- a/graphics/evas-gif/Makefile
+++ b/graphics/evas-gif/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2014/05/15 14:41:51 adam Exp $
+# $NetBSD: Makefile,v 1.17 2014/05/31 15:56:27 wiz Exp $
 
 PKGNAME=	evas-gif-${EVAS_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	Evas GIF image loader
 
 EVAS_IMAGE_LOADERS=	gif
@@ -15,5 +15,5 @@ MAKE_FLAGS+=	module_la_LIBADD="\$${evas_image_loader_gif_libs} \$${EINA_LIBS} ${
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/evas-gif/buildlink3.mk b/graphics/evas-gif/buildlink3.mk
index 42605436172..c31dad98672 100644
--- a/graphics/evas-gif/buildlink3.mk
+++ b/graphics/evas-gif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/05/15 14:41:51 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2014/05/31 15:56:27 wiz Exp $
 
 BUILDLINK_TREE+=	evas-gif
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.evas-gif?=	../../graphics/evas-gif
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 
 .endif # EVAS_GIF_BUILDLINK3_MK
 
diff --git a/graphics/giflib-util/Makefile b/graphics/giflib-util/Makefile
index d36950bb164..db779979212 100644
--- a/graphics/giflib-util/Makefile
+++ b/graphics/giflib-util/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/05/15 14:16:11 adam Exp $
+# $NetBSD: Makefile,v 1.9 2014/05/31 15:56:27 wiz Exp $
 
 .include "../../graphics/giflib/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-util-/}
+PKGREVISION=	1
 
 COMMENT=	GIF image format utility
 
@@ -20,8 +21,5 @@ post-install:
 	cd ${WRKSRC}/doc/whatsinagif && ${INSTALL_DATA} *.html *.gif \
 		${DESTDIR}${PREFIX}/${HTMLDIR}/whatsinagif
 
-.include "../../mk/giflib.buildlink3.mk"
-.if ${GIFLIB_IMPLEMENTATION} == "libungif"
-PKG_FAIL_REASON= "please use graphics/libungif"
-.endif
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 41e896c8d9e..125c75e98e0 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.118 2014/05/15 14:41:51 adam Exp $
+# $NetBSD: Makefile,v 1.119 2014/05/31 15:56:27 wiz Exp $
 
 DISTNAME=	imlib-1.9.15
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/imlib/1.9/}
 EXTRACT_SUFX=	.tar.bz2
@@ -60,7 +60,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index 55762286109..f544070f5f7 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2014/05/15 14:41:51 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2014/05/31 15:56:27 wiz Exp $
 
 BUILDLINK_TREE+=	imlib
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 057b81247fb..af92ce0839f 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2014/05/17 09:25:01 adam Exp $
+# $NetBSD: Makefile,v 1.70 2014/05/31 15:56:27 wiz Exp $
 
 DISTNAME=	imlib2-1.4.6
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 EXTRACT_SUFX=	.tar.bz2
@@ -42,7 +43,7 @@ SUBST_VARS.rpath=	COMPILER_RPATH_FLAG
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index c26b047ce1c..9924f2cf3e2 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2014/05/20 20:20:43 adam Exp $
+# $NetBSD: Makefile,v 1.72 2014/05/31 15:56:27 wiz Exp $
 
 DISTNAME=	libgdiplus-2.10.9
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.mono-project.com/sources/libgdiplus/
 EXTRACT_SUFX=	.tar.bz2
@@ -28,7 +29,7 @@ BUILDLINK_TRANSFORM+=		rm:-Werror
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index cc4d6dad701..80fe5c324fd 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.48 2014/05/15 14:41:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.49 2014/05/31 15:56:27 wiz Exp $
 
 BUILDLINK_TREE+=	libgdiplus
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .endif # LIBGDIPLUS_BUILDLINK3_MK
diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile
index fd5200fdf9b..8b2935ab6cf 100644
--- a/graphics/magicpoint/Makefile
+++ b/graphics/magicpoint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2014/05/29 23:36:39 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2014/05/31 15:56:27 wiz Exp $
 
 DISTNAME=		magicpoint-1.13a
-PKGREVISION=		23
+PKGREVISION=		24
 CATEGORIES=		x11 graphics
 MASTER_SITES=		ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
 
@@ -71,7 +71,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${DESTDIR}${PREFIX}/${EGDIR}
 .endfor
 
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index 9521b655a2a..7d884af3115 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2014/05/25 08:55:52 obache Exp $
+# $NetBSD: Makefile,v 1.41 2014/05/31 15:56:27 wiz Exp $
 #
 
 DISTNAME=	mgl2-alpha-020
 PKGNAME=	mgl-0.2.0a
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	http://at.sakura.ne.jp/~suz/arc/
 
@@ -122,7 +122,7 @@ post-install:
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 92fb10dbbb3..86cc2702afa 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2014/05/25 09:02:43 obache Exp $
+# $NetBSD: Makefile,v 1.26 2014/05/31 15:56:27 wiz Exp $
 
 OIIOVER=	1.3.13
 DISTNAME=	oiio-Release-${OIIOVER}
 PKGNAME=	${DISTNAME:S/oiio-Release/openimageio/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	-https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz
 
@@ -48,7 +48,7 @@ CXXFLAGS+=	-Wno-deprecated-register
 .include "../../graphics/openjpeg15/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 BUILDLINK_DEPMETHOD.qt4-tools=	build
 .include "../../x11/qt4-tools/buildlink3.mk"
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 993eafd07d9..4ab400329f6 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2014/05/15 14:41:52 adam Exp $
+# $NetBSD: Makefile,v 1.47 2014/05/31 15:56:27 wiz Exp $
 
 DISTNAME=	OpenSceneGraph-3.0.1
 PKGNAME=	osg-3.0.1
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PKGVERSION_NOREV}/source/
 EXTRACT_SUFX=	.zip
@@ -35,7 +35,7 @@ PLIST.x11=	yes
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .endif
 
diff --git a/graphics/osg/buildlink3.mk b/graphics/osg/buildlink3.mk
index 4e7f32b5fe8..4e9cd6ddc6b 100644
--- a/graphics/osg/buildlink3.mk
+++ b/graphics/osg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2014/05/15 14:41:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2014/05/31 15:56:27 wiz Exp $
 
 BUILDLINK_TREE+=	osg
 
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.osg?=	../../graphics/osg
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 66329277b40..8c7ffc18e72 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2014/05/15 14:41:53 adam Exp $
+# $NetBSD: Makefile,v 1.24 2014/05/31 15:56:27 wiz Exp $
 
 DISTNAME=		simage-1.7.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		https://bitbucket.org/Coin3D/coin/downloads/
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-xwd --with-mpeg2enc
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk
index 8abc01ecea1..5825d791aea 100644
--- a/graphics/simage/buildlink3.mk
+++ b/graphics/simage/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2014/05/15 14:41:53 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2014/05/31 15:56:27 wiz Exp $
 
 BUILDLINK_TREE+=	simage
 
@@ -15,7 +15,7 @@ BUILDLINK_PKGSRCDIR.simage?=	../../graphics/simage
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .endif # SIMAGE_BUILDLINK3_MK
 
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile
index ea3c4148c56..ca455476b90 100644
--- a/lang/kaffe-x11/Makefile
+++ b/lang/kaffe-x11/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.43 2014/05/25 09:20:49 obache Exp $
+# $NetBSD: Makefile,v 1.44 2014/05/31 15:56:27 wiz Exp $
 #
 
 .include "../../lang/kaffe/Makefile.common"
 
 PKGNAME=    	${DISTNAME:S/kaffe/kaffe-x11/}
-PKGREVISION=	27
+PKGREVISION=	28
 
 COMMENT+=   (AWT support through X11)
 
@@ -35,7 +35,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/kaffe/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 572b0a85f14..2b9892e0596 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2014/05/25 08:51:05 obache Exp $
+# $NetBSD: Makefile,v 1.31 2014/05/31 15:56:27 wiz Exp $
 
 DISTNAME=	spamprobe-1.4d
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=spamprobe/}
 
diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk
index a583aa0e32e..2f556b1ab52 100644
--- a/mail/spamprobe/options.mk
+++ b/mail/spamprobe/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2011/03/27 00:59:53 hubertf Exp $
+# $NetBSD: options.mk,v 1.10 2014/05/31 15:56:27 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.spamprobe
 PKG_SUPPORTED_OPTIONS=		bdb gif png jpeg
@@ -14,7 +14,7 @@ CONFIGURE_ARGS+=	--with-db=${BDBBASE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mgif)
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mpng)
diff --git a/misc/root/Makefile b/misc/root/Makefile
index c793b4bea57..bf97ae041f4 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2014/05/25 09:23:11 obache Exp $
+# $NetBSD: Makefile,v 1.55 2014/05/31 15:56:27 wiz Exp $
 
 DISTNAME=		root_v5.26.00b.source
 PKGNAME=		root-5.26
-PKGREVISION=		14
+PKGREVISION=		15
 CATEGORIES=		misc
 MASTER_SITES=		ftp://root.cern.ch/root/
 
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--disable-xml
 #CONFIGURE_ARGS+=	--disable-asimage
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../math/gsl/buildlink3.mk"
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 69e96391bb6..5b693f2cf2c 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2014/05/15 14:41:56 adam Exp $
+# $NetBSD: Makefile,v 1.86 2014/05/31 15:56:27 wiz Exp $
 #
 
 DISTNAME=		gnash-0.8.10
-PKGREVISION=		34
+PKGREVISION=		35
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_GNU:=gnash/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=		.tar.bz2
@@ -49,7 +49,7 @@ CXXFLAGS+=	-std=c++11
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/multimedia/ming/Makefile b/multimedia/ming/Makefile
index aedc377190e..dd65315c22a 100644
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2014/05/29 23:37:01 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2014/05/31 15:56:27 wiz Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	multimedia
 
 MAINTAINER=	obache@NetBSD.org
@@ -36,6 +36,6 @@ INSTALL_DIRS=	. docs/man
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk
index 848f86df77e..e3230583c17 100644
--- a/multimedia/ming/buildlink3.mk
+++ b/multimedia/ming/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2014/05/15 14:41:56 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2014/05/31 15:56:27 wiz Exp $
 
 BUILDLINK_TREE+=	ming
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.ming?=	../../multimedia/ming
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .endif # MING_BUILDLINK3_MK
 
diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile
index b0de94b9a69..c8a0bbdb7ba 100644
--- a/multimedia/mplayer-share/Makefile
+++ b/multimedia/mplayer-share/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2014/04/20 02:27:52 ryoon Exp $
+# $NetBSD: Makefile,v 1.42 2014/05/31 15:56:27 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	mplayer-share-${MPLAYER_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 COMMENT=	Documentation used by mplayer and gmplayer
 
 DEPENDS+=	mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index 5d2768cc2c4..ee1214cfb8b 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.49 2013/01/16 18:07:08 riastradh Exp $
+# $NetBSD: options.mk,v 1.50 2014/05/31 15:56:27 wiz Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -216,7 +216,7 @@ CONFIGURE_ARGS+=	--disable-ggi
 
 .if !empty(PKG_OPTIONS:Mgif)
 CONFIGURE_ARGS+=	--enable-gif
-.  include "../../mk/giflib.buildlink3.mk"
+.  include "../../graphics/giflib/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-gif
 .endif
diff --git a/multimedia/py-ming/Makefile b/multimedia/py-ming/Makefile
index 792da02509a..a4b23fdd009 100644
--- a/multimedia/py-ming/Makefile
+++ b/multimedia/py-ming/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2014/05/15 14:41:57 adam Exp $
+# $NetBSD: Makefile,v 1.24 2014/05/31 15:56:28 wiz Exp $
 
 .include "../../multimedia/ming/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		multimedia
 
 MAINTAINER=		obache@NetBSD.org
@@ -17,15 +17,14 @@ EGG_NAME=		${DISTNAME:S/ming/mingc/}
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34
 
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../multimedia/ming/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
-.if defined(GIFLIB_IMPLEMENTATION) && ${GIFLIB_IMPLEMENTATION} != "libungif"
 SUBST_CLASSES+=		giflib
 SUBST_STAGE.giflib=	pre-configure
 SUBST_FILES.giflib=	py_ext/setup.py
 SUBST_SED.giflib=	-e 's/ungif/gif/g'
-.endif
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../multimedia/ming/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/ruby-ming/Makefile b/multimedia/ruby-ming/Makefile
index 7138f3cbcf2..cd89f82c637 100644
--- a/multimedia/ruby-ming/Makefile
+++ b/multimedia/ruby-ming/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2014/05/15 14:41:57 adam Exp $
+# $NetBSD: Makefile,v 1.24 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=	ming-ruby-${VER}
 PKGNAME=	${RUBY_PKGPREFIX}-ming-${VER}
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	multimedia
 MASTER_SITES=	http://rubyforge.org/frs/download.php/44137/
 
@@ -23,6 +23,11 @@ CONFIGURE_ARGS+=	--siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE}
 CONFIGURE_ARGS+=	--siterubyver=${PREFIX}/${RUBY_VENDORLIB}
 CONFIGURE_ARGS+=	--siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB}
 
+SUBST_CLASSES+=		giflib
+SUBST_STAGE.giflib=	pre-configure
+SUBST_FILES.giflib=	ext/ming/mingc/extconf.rb
+SUBST_SED.giflib=	-e 's/ungif/gif/g'
+
 INSTALLATION_DIRS+=	${RUBY_EG}/ming
 
 pre-configure:
@@ -38,12 +43,6 @@ post-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/ming/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
-.if defined(GIFLIB_IMPLEMENTATION) && ${GIFLIB_IMPLEMENTATION} != "libungif"
-SUBST_CLASSES+=		giflib
-SUBST_STAGE.giflib=	pre-configure
-SUBST_FILES.giflib=	ext/ming/mingc/extconf.rb
-SUBST_SED.giflib=	-e 's/ungif/gif/g'
-.endif
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile
index cacbc56c360..1a0e0a33b98 100644
--- a/net/driftnet/Makefile
+++ b/net/driftnet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2014/05/20 19:11:07 adam Exp $
+# $NetBSD: Makefile,v 1.31 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=	driftnet-0.1.6
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	net graphics
 MASTER_SITES=	http://www.ex-parrot.com/~chris/driftnet/
 
@@ -24,7 +24,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 4607a00f593..60ae63c2115 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2014/05/25 09:25:32 obache Exp $
+# $NetBSD: Makefile,v 1.77 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=		advi-1.10.1
-PKGREVISION=		35
+PKGREVISION=		36
 CATEGORIES=		print
 MASTER_SITES=		http://gallium.inria.fr/advi/
 
@@ -58,7 +58,7 @@ post-install:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../devel/nspr/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/lablgtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/print/img2eps/Makefile b/print/img2eps/Makefile
index 4d1d83ed725..753f7f06eb1 100644
--- a/print/img2eps/Makefile
+++ b/print/img2eps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2014/05/25 09:26:31 obache Exp $
+# $NetBSD: Makefile,v 1.33 2014/05/31 15:56:28 wiz Exp $
 #
 
 DISTNAME=	img2eps-0.2
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	print graphics
 MASTER_SITES=	http://www.nih.at/img2eps/
 
@@ -21,7 +21,7 @@ LDFLAGS.SunOS+=		-lm
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index 966bc0c2efd..b5105b7b8c8 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2014/05/29 23:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=	AfterStep-2.2.11
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/
 EXTRACT_SUFX=	.tar.bz2
@@ -33,7 +33,7 @@ MAKE_ENV+=	EXTRA_LIBRARIES=-lexecinfo
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 31bf2ea632a..d12abbd2f2a 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.107 2014/05/29 23:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=	WindowMaker-0.95.5
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://windowmaker.info/pub/source/release/
 
@@ -96,7 +96,7 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index d2109bb6613..b22168a4565 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2014/05/15 14:41:59 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2014/05/31 15:56:28 wiz Exp $
 
 BUILDLINK_TREE+=	windowmaker
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 41f90e3f2bb..01030051baa 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2014/05/25 09:19:37 obache Exp $
+# $NetBSD: Makefile,v 1.61 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=	gnustep-gui-0.22.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -20,7 +20,7 @@ INSTALLATION_DIRS+=	share/GNUstep/Applications
 .include "../../devel/gnustep-base/buildlink3.mk"
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 1ef390b6131..172b71089ca 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2014/05/15 14:41:59 adam Exp $
+# $NetBSD: Makefile,v 1.70 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -98,7 +98,7 @@ BUILDLINK_API_DEPENDS.shared-desktop-ontologies+=	shared-desktop-ontologies>=0.1
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../misc/attica/buildlink3.mk"
 .include "../../multimedia/phonon/buildlink3.mk"
diff --git a/x11/kdelibs4/buildlink3.mk b/x11/kdelibs4/buildlink3.mk
index bb2d12fdbc4..3d4a53cb21b 100644
--- a/x11/kdelibs4/buildlink3.mk
+++ b/x11/kdelibs4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2014/05/15 14:41:59 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2014/05/31 15:56:28 wiz Exp $
 
 BUILDLINK_TREE+=	kdelibs
 
@@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs4
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../multimedia/phonon/buildlink3.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 1817365bdb5..0e493e0f78e 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2014/05/15 14:41:59 adam Exp $
+# $NetBSD: Makefile,v 1.58 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=		wdm-1.28
-PKGREVISION=		17
+PKGREVISION=		18
 CATEGORIES=		x11 windowmaker
 MASTER_SITES=		http://voins.program.ru/wdm/
 
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--with-winmgr=${wmanager:Q}
 INSTALLATION_DIRS += share/pixmaps/wdm share/examples/wdm
 
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../wm/windowmaker/buildlink3.mk"
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index a5b4f269b89..9d131bfe98f 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2014/05/29 23:38:20 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2014/05/31 15:56:28 wiz Exp $
 
 DISTNAME=	xplanet-1.2.2
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xplanet/}
 
@@ -25,7 +25,7 @@ INSTALLATION_DIRS+=	${XPLANET_DIRS:C,.*,share/xplanet/&,g}
 
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"