[pkgsrc/trunk]: pkgsrc/editors Fix options framework abuse in emacs22*.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70f7f687ed8d
branches:  trunk
changeset: 356414:70f7f687ed8d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 30 22:25:46 2016 +0000

description:
Fix options framework abuse in emacs22*.

Packages do not build for me on -current, so not build-tested.

diffstat:

 editors/emacs22-nox11/Makefile  |  7 ++-----
 editors/emacs22/Makefile        |  5 ++++-
 editors/emacs22/Makefile.common |  9 +++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diffs (70 lines):

diff -r 7641268a0dfc -r 70f7f687ed8d editors/emacs22-nox11/Makefile
--- a/editors/emacs22-nox11/Makefile    Fri Dec 30 22:18:55 2016 +0000
+++ b/editors/emacs22-nox11/Makefile    Fri Dec 30 22:25:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/02/24 01:25:30 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2016/12/30 22:25:46 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/emacs/emacs22/:S/-/-nox11-/}
 PKGREVISION=   4
@@ -12,8 +12,5 @@
 # This needs to be set before including bsd.prefs.mk.
 SETGIDGAME=            yes
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS.emacs+=    -x11 -gtk -motif -xaw
-
 .include "../../editors/emacs22/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff -r 7641268a0dfc -r 70f7f687ed8d editors/emacs22/Makefile
--- a/editors/emacs22/Makefile  Fri Dec 30 22:18:55 2016 +0000
+++ b/editors/emacs22/Makefile  Fri Dec 30 22:25:46 2016 +0000
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.53 2016/08/03 10:22:40 adam Exp $
+# $NetBSD: Makefile,v 1.54 2016/12/30 22:25:46 wiz Exp $
 
 PKGREVISION=   43
 
 CONFLICTS+=    emacs22-nox11-[0-9]*
 
+.include "options.mk"
+
 .include "../../editors/emacs22/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
diff -r 7641268a0dfc -r 70f7f687ed8d editors/emacs22/Makefile.common
--- a/editors/emacs22/Makefile.common   Fri Dec 30 22:18:55 2016 +0000
+++ b/editors/emacs22/Makefile.common   Fri Dec 30 22:25:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2014/12/03 13:58:57 joerg Exp $
+# $NetBSD: Makefile.common,v 1.7 2016/12/30 22:25:46 wiz Exp $
 #
 # used by editors/emacs22/Makefile
 # used by editors/emacs22-nox11/Makefile
@@ -23,8 +23,6 @@
 
 SETGIDGAME=            yes
 
-.include "options.mk"
-
 MAKEFLAGS+=            EMACSLOADPATH=${WRKSRC}/lisp
 
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
@@ -53,6 +51,8 @@
                        ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q}
 SPECIAL_PERMS+=                libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
 
+.include "../../mk/bsd.prefs.mk"
+
 .if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
 CPPFLAGS+=             -DDFLY_CRT_USRLIB
 .endif
@@ -89,8 +89,5 @@
        ${CHMOD} 755 ${DESTDIR}${PREFIX}/share/emacs/${PKGVERSION_NOREV}/${file}
 .endfor
 
-
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"