CVS commit: pkgsrc/editors/xemacs

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Dec 19 13:29:34 UTC 2018

Modified Files:
        pkgsrc/editors/xemacs: Makefile options.mk

Log Message:
Fix debug option arg, which is different from 21.5

Set dialogs and widgets to "athena" explicitly.
There are no "lucid" implementations; instead, configure will look for
Motif implementations, and fall back to Athena. The former is prone to
sneak in an undeclared dependency on Motif.


To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 pkgsrc/editors/xemacs/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/xemacs/options.mk

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

Modified files:

Index: pkgsrc/editors/xemacs/Makefile
diff -u pkgsrc/editors/xemacs/Makefile:1.121 pkgsrc/editors/xemacs/Makefile:1.122
--- pkgsrc/editors/xemacs/Makefile:1.121        Thu Feb  1 14:25:30 2018
+++ pkgsrc/editors/xemacs/Makefile      Wed Dec 19 13:29:34 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.121 2018/02/01 14:25:30 hauke Exp $
+# $NetBSD: Makefile,v 1.122 2018/12/19 13:29:34 hauke Exp $
 
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       XEmacs text editor version 21.4
 
 # extra options for x11 support, not for sharing with xemacs-current-nox11

Index: pkgsrc/editors/xemacs/options.mk
diff -u pkgsrc/editors/xemacs/options.mk:1.15 pkgsrc/editors/xemacs/options.mk:1.16
--- pkgsrc/editors/xemacs/options.mk:1.15       Tue Jan 30 11:52:18 2018
+++ pkgsrc/editors/xemacs/options.mk    Wed Dec 19 13:29:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2018/01/30 11:52:18 hauke Exp $
+# $NetBSD: options.mk,v 1.16 2018/12/19 13:29:34 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS+=                ldap canna debug
@@ -27,10 +27,11 @@ CONFIGURE_ARGS+=    --site-libraries=${PREF
 CONFIGURE_ARGS+=       --site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib
 # Lucid widgets
 CONFIGURE_ARGS+=       --with-toolbars=yes
-CONFIGURE_ARGS+=       --with-menubars=yes
+CONFIGURE_ARGS+=       --with-menubars=lucid
 CONFIGURE_ARGS+=       --with-scrollbars=lucid
-CONFIGURE_ARGS+=       --with-dialogs=lucid
-CONFIGURE_ARGS+=       --with-widgets=lucid
+# Setting these to 'lucid' will sneak in Motif, so don't
+CONFIGURE_ARGS+=       --with-dialogs=athena
+CONFIGURE_ARGS+=       --with-widgets=athena
 CONFIGURE_ARGS+=       --with-athena=xaw
 CONFIGURE_ARGS+=       --with-xim=xlib
 .else
@@ -69,7 +70,7 @@ CONFIGURE_ARGS+=      --without-canna
 
 PLIST_VARS+=            debug
 .if !empty(PKG_OPTIONS:Mdebug)
-CONFIGURE_ARGS+=       --enable-debug=yes --with-debug
+CONFIGURE_ARGS+=       --debug
 CFLAGS+=                -g3
 INSTALL_UNSTRIPPED=     yes
 .endif