summaryrefslogtreecommitdiff
path: root/editors/emacs21
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-05-31 15:56:26 +0000
committerwiz <wiz@pkgsrc.org>2014-05-31 15:56:26 +0000
commit87f9e97623230bbd9ac765c6c0841e541a9dc7a9 (patch)
treec486917512ae39520b306c206df4396abb1a4e0e /editors/emacs21
parent8642a708c3c0a48ff5fe3c46c258fa9669c5b291 (diff)
downloadpkgsrc-87f9e97623230bbd9ac765c6c0841e541a9dc7a9.tar.gz
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.
Diffstat (limited to 'editors/emacs21')
-rw-r--r--editors/emacs21/Makefile4
-rw-r--r--editors/emacs21/options.mk7
2 files changed, 4 insertions, 7 deletions
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