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.

7 files changed, 27 insertions, 29 deletions

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"