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.

10 files changed, 20 insertions, 26 deletions

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"