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.

5 files changed, 14 insertions, 14 deletions

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"