summaryrefslogtreecommitdiff
path: root/editors/emacs/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'editors/emacs/Makefile')
-rw-r--r--editors/emacs/Makefile39
1 files changed, 3 insertions, 36 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 11b45aa86cb..8a866244f9a 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,46 +1,13 @@
-# $NetBSD: Makefile,v 1.103 2007/02/22 19:26:25 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2007/06/11 13:57:15 markd Exp $
-DISTNAME= emacs-${EMACSVERSION}a
-PKGREVISION= 10
+DISTNAME= emacs-${EMACSVERSION}
CATEGORIES= editors
COMMENT= GNU editing macros (editor)
.include "../../editors/emacs/Makefile.common"
-USE_TOOLS+= imake
-
CONFLICTS+= emacs-nox11-[0-9]*
-CONFIGURE_ARGS+= --with-x
-CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q}
-
-.include "../../x11/libXpm/buildlink3.mk"
-CONFIGURE_ARGS+= --with-xpm
-.include "../../graphics/jpeg/buildlink3.mk"
-CONFIGURE_ARGS+= --with-jpeg
-.include "../../graphics/tiff/buildlink3.mk"
-CONFIGURE_ARGS+= --with-tiff
-# need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs)
-BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1
-.include "../../graphics/libungif/buildlink3.mk"
-CONFIGURE_ARGS+= --with-gif
-.include "../../graphics/png/buildlink3.mk"
-CONFIGURE_ARGS+= --with-png
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.emacs
-PKG_OPTIONS_OPTIONAL_GROUPS= toolkit
-PKG_OPTIONS_GROUP.toolkit= emacs-xaw3d motif
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mmotif)
-.include "../../mk/motif.buildlink3.mk"
-CONFIGURE_ARGS+= --with-x-toolkit=motif
-.elif !empty(PKG_OPTIONS:Memacs-xaw3d)
-.include "../../x11/Xaw3d/buildlink3.mk"
-CONFIGURE_ARGS+= --with-x-toolkit=athena
-.else
-.include "../../x11/libXaw/buildlink3.mk"
-CONFIGURE_ARGS+= --with-x-toolkit=athena
-.endif
+.include "options.mk"
.include "../../mk/bsd.pkg.mk"