CVS commit: pkgsrc/editors/xemacs-current

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Tue Jan 30 11:47:39 UTC 2018

Modified Files:
        pkgsrc/editors/xemacs-current: distinfo options.mk
Added Files:
        pkgsrc/editors/xemacs-current/patches: patch-src_console-xlike-inc.h

Log Message:
On some target platforms, Xm headers #define *_XFT_ symbols; if we do
not use xft (the default), explicitly disable it.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/editors/xemacs-current/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/xemacs-current/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/xemacs-current/patches/patch-src_console-xlike-inc.h

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-current/distinfo
diff -u pkgsrc/editors/xemacs-current/distinfo:1.31 pkgsrc/editors/xemacs-current/distinfo:1.32
--- pkgsrc/editors/xemacs-current/distinfo:1.31 Fri Nov 17 13:06:03 2017
+++ pkgsrc/editors/xemacs-current/distinfo      Tue Jan 30 11:47:39 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2017/11/17 13:06:03 hauke Exp $
+$NetBSD: distinfo,v 1.32 2018/01/30 11:47:39 hauke Exp $
 
 SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce
 RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf
@@ -11,6 +11,7 @@ SHA1 (patch-lib-src_fakemail.c) = e62f75
 SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0
 SHA1 (patch-modules_common_Makefile.common) = d62a23a05e72cc196557e2f7fbbccea791ee0101
 SHA1 (patch-src_Makefile.in.in) = 7a7ea5fe03b11e8690f44f4dbef17e793fbf50f2
+SHA1 (patch-src_console-xlike-inc.h) = 80b29a72c73b2371ba559f1cb21ea5e4e1dedb1e
 SHA1 (patch-src_dired.c) = d850495e567224dc7a43e1db74f4e305a906f177
 SHA1 (patch-src_lisp.h) = c5f3b5f920ec6d451a5d5c5d1e414d6ae3d6660f
 SHA1 (patch-src_unexelf.c) = 96b2cf1d2512ad23fca98db9b48c34533bba8b66

Index: pkgsrc/editors/xemacs-current/options.mk
diff -u pkgsrc/editors/xemacs-current/options.mk:1.15 pkgsrc/editors/xemacs-current/options.mk:1.16
--- pkgsrc/editors/xemacs-current/options.mk:1.15       Wed Nov 15 14:46:31 2017
+++ pkgsrc/editors/xemacs-current/options.mk    Tue Jan 30 11:47:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2017/11/15 14:46:31 hauke Exp $
+# $NetBSD: options.mk,v 1.16 2018/01/30 11:47:39 hauke Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS+=                ldap canna debug
@@ -38,6 +38,9 @@ CONFIGURE_ARGS+=      --with-dialogs=lucid
 CONFIGURE_ARGS+=       --with-widgets=lucid
 CONFIGURE_ARGS+=       --with-athena=xaw
 CONFIGURE_ARGS+=       --with-xim=xlib
+# Explicitely exclude other toolkits
+CONFIGURE_ARGS+=       --without-gtk
+CONFIGURE_ARGS+=       --without-gnome
 .else
 CONFIGURE_ARGS+=       --without-x
 CONFIGURE_ARGS+=       --without-jpeg
@@ -63,7 +66,7 @@ CONFIGURE_ARGS+=      --without-ldap
 .  include "../../x11/libXrender/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-xft=emacs,tabs,menubars,gauges
 .else
-CONFIGURE_ARGS+=       --with-xft=no
+CONFIGURE_ARGS+=       --without-xft
 .endif
 
 .if !empty(PKG_OPTIONS:Mxface)

Added files:

Index: pkgsrc/editors/xemacs-current/patches/patch-src_console-xlike-inc.h
diff -u /dev/null pkgsrc/editors/xemacs-current/patches/patch-src_console-xlike-inc.h:1.1
--- /dev/null   Tue Jan 30 11:47:39 2018
+++ pkgsrc/editors/xemacs-current/patches/patch-src_console-xlike-inc.h Tue Jan 30 11:47:39 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_console-xlike-inc.h,v 1.1 2018/01/30 11:47:39 hauke Exp $
+
+On some target platforms, Xm headers #define *_XFT_ symbols
+
+--- src/console-xlike-inc.h.orig       2013-08-21 17:43:45.000000000 +0000
++++ src/console-xlike-inc.h
+@@ -115,6 +115,11 @@ along with XEmacs.  If not, see <http://
+ #define USE_XFT_MENUBARS
+ #define USE_XFT_TABS
+ #define USE_XFT_GAUGES
++#else /* Xm headers might #define *_XFT */
++#undef USE_XFT
++#undef USE_XFT_MENUBARS
++#undef USE_XFT_TABS
++#undef USE_XFT_GAUGES
+ #endif
+ 
+ /***************************************************************************/