Subject: pkg/20883: Make emacs21 gui configureable
To: None <gnats-bugs@gnats.netbsd.org>
From: None <bmeurer@unix-ag.org>
List: netbsd-bugs
Date: 03/25/2003 02:20:20
>Number:         20883
>Category:       pkg
>Synopsis:       Make emacs21 gui configureable
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 24 17:21:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Benedikt Meurer
>Release:        NetBSD 1.6
>Organization:
University Siegen
>Environment:
	
	
System: NetBSD endor.kosmos.all 1.6 NetBSD 1.6 (ENDOR) #0: Fri Feb 21 23:18:27 CET 2003 bmeurer@darkstar.kosmos.all:/usr/src/sys/arch/i386/compile/ENDOR i386
Architecture: i386
Machine: i386
>Description:
Allow the user to choose the gui used by emacs21 (with defaults to the
athena gui toolkit).
>How-To-Repeat:
>Fix:
Apply the following patch:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/editors/emacs21/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	2002/09/24 00:37:01	1.4
+++ Makefile	2003/03/25 01:18:24
@@ -2,7 +2,7 @@
 # FreeBSD Id: Makefile,v 1.30 1997/12/14 02:03:53 asami Exp
 
 DISTNAME=	emacs-21.2
-CATEGORIES=	editors
+CATEGORIES=	editors x11
 MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
 MAINTAINER=	packages@netbsd.org
@@ -17,8 +17,16 @@
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
+.if defined(EMACS_GUI) && ${EMACS_GUI} == motif
+.include "../../mk/motif.buildlink2.mk"
 CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--with-x-toolkit=motif
+.elif defined(EMACS_GUI) && ${EMACS_GUI} == none
+CONFIGURE_ARGS+=	--with-x-toolkit=no
+.else
+CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--with-x-toolkit=athena
+.endif
 
 .include "../../graphics/xpm/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-xpm
>Release-Note:
>Audit-Trail:
>Unformatted: