summaryrefslogtreecommitdiff
path: root/editors/xemacs
diff options
context:
space:
mode:
authorhauke <hauke@pkgsrc.org>2018-12-19 13:29:34 +0000
committerhauke <hauke@pkgsrc.org>2018-12-19 13:29:34 +0000
commit895f0325f5e2ef562b1a197b12dcd300a1a1c4d1 (patch)
tree0c335a6f2a8e833e8f64e0abba8fed214f5b80fc /editors/xemacs
parentbf281bf27055172d9e5db1f1c6b83d4e579827c6 (diff)
downloadpkgsrc-895f0325f5e2ef562b1a197b12dcd300a1a1c4d1.tar.gz
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.
Diffstat (limited to 'editors/xemacs')
-rw-r--r--editors/xemacs/Makefile4
-rw-r--r--editors/xemacs/options.mk11
2 files changed, 8 insertions, 7 deletions
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 70544347237..12e06886472 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -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
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk
index 39b1abd2b29..6de43e5bb91 100644
--- a/editors/xemacs/options.mk
+++ b/editors/xemacs/options.mk
@@ -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=${PREFIX}/lib:${X11BASE}/lib
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