Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_148313674644080"
MIME-Version: 1.0
Date: Fri, 30 Dec 2016 22:25:46 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/editors
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20161230222546.DE888FBA6@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_148313674644080
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri Dec 30 22:25:46 UTC 2016

Modified Files:
	pkgsrc/editors/emacs22: Makefile Makefile.common
	pkgsrc/editors/emacs22-nox11: Makefile

Log Message:
Fix options framework abuse in emacs22*.

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


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/editors/emacs22/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/emacs22/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/editors/emacs22-nox11/Makefile

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


--_----------=_148313674644080
Content-Disposition: inline
Content-Length: 2623
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/editors/emacs22/Makefile
diff -u pkgsrc/editors/emacs22/Makefile:1.53 pkgsrc/editors/emacs22/Makefile:1.54
--- pkgsrc/editors/emacs22/Makefile:1.53	Wed Aug  3 10:22:40 2016
+++ pkgsrc/editors/emacs22/Makefile	Fri Dec 30 22:25:46 2016
@@ -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"

Index: pkgsrc/editors/emacs22/Makefile.common
diff -u pkgsrc/editors/emacs22/Makefile.common:1.6 pkgsrc/editors/emacs22/Makefile.common:1.7
--- pkgsrc/editors/emacs22/Makefile.common:1.6	Wed Dec  3 13:58:57 2014
+++ pkgsrc/editors/emacs22/Makefile.common	Fri Dec 30 22:25:46 2016
@@ -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 @@ INFO_FILES=		yes
 
 SETGIDGAME=		yes
 
-.include "options.mk"
-
 MAKEFLAGS+=		EMACSLOADPATH=${WRKSRC}/lisp
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
@@ -53,6 +51,8 @@ CONF_FILES_PERMS+=	/dev/null ${VARBASE}/
 			${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 @@ post-install:
 	${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"

Index: pkgsrc/editors/emacs22-nox11/Makefile
diff -u pkgsrc/editors/emacs22-nox11/Makefile:1.9 pkgsrc/editors/emacs22-nox11/Makefile:1.10
--- pkgsrc/editors/emacs22-nox11/Makefile:1.9	Sun Feb 24 01:25:30 2013
+++ pkgsrc/editors/emacs22-nox11/Makefile	Fri Dec 30 22:25:46 2016
@@ -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 @@ PKGDIR=		${.CURDIR}/../../editors/emacs2
 # 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"


--_----------=_148313674644080--