CVS commit: pkgsrc/editors/emacs21-nox11

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec 30 22:18:56 UTC 2016

Modified Files:
        pkgsrc/editors/emacs21-nox11: Makefile

Log Message:
Fix options framework abuse by emacs21-nox11.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/editors/emacs21-nox11/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/emacs21-nox11/Makefile
diff -u pkgsrc/editors/emacs21-nox11/Makefile:1.11 pkgsrc/editors/emacs21-nox11/Makefile:1.12
--- pkgsrc/editors/emacs21-nox11/Makefile:1.11  Sun Apr 26 05:54:30 2015
+++ pkgsrc/editors/emacs21-nox11/Makefile       Fri Dec 30 22:18:55 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2015/04/26 05:54:30 mef Exp $
+# $NetBSD: Makefile,v 1.12 2016/12/30 22:18:55 wiz Exp $
 
 PKGNAME=       emacs21-nox11-${EMACSVERSION}a
 PKGREVISION=   13
@@ -7,13 +7,5 @@ COMMENT_EXTRA= : non-X11 version
 
 CONFLICTS+=    emacs21-[0-9]*
 
-.include "../../mk/bsd.prefs.mk"
-
-# Forcibly remove any "x11" options.
-PKG_OPTIONS.emacs+=    -x11 -xaw3d -motif -xaw
-
-.include "../../editors/emacs21/options.mk"
-
 .include "../../editors/emacs21/Makefile.common"
-
 .include "../../mk/bsd.pkg.mk"