Fix build of xemacs-*nox11 packages.

Using hints by coypu, thanks!

4 files changed, 78 insertions, 0 deletions

diff --git a/editors/xemacs-current-nox11/DESCR b/editors/xemacs-current-nox11/DESCR
new file mode 100644
index 00000000000..f43ce48c04d
--- /dev/null
+++ b/editors/xemacs-current-nox11/DESCR
@@ -0,0 +1,23 @@
+This is an unstable, *BETA* release of XEmacs.
+
+XEmacs is a self-documenting, customizable, extensible real-time
+display editor.
+
+Users new to XEmacs will be able to use basic features fairly rapidly
+by studying the tutorial and using the self-documentation features.
+XEmacs also has an extensive interactive manual browser.  It is easily
+extensible since its editing commands are written in Lisp.
+
+XEmacs's many special packages handle mail reading (RMail) and sending
+(Mail), outline editing (Outline), compiling (Compile), running
+subshells within Emacs windows (Shell), running a Lisp read-eval-print
+loop (Lisp-Interaction-Mode), automated psychotherapy (Doctor :-) and
+many more. There is a WWW browsing mode written fully in elisp
+that looks and behaves much like the netscape WWW browser.
+
+XEmacs has similar functionality to GNU Emacs. It uses a different
+display model, including support for Motif menu and scroll bars and the
+ability to run as a widget inside other applications. Many people say
+it looks nicer than GNU Emacs.
+
+This package does not support X11.
diff --git a/editors/xemacs-current-nox11/hacks.mk b/editors/xemacs-current-nox11/hacks.mk
new file mode 100644
index 00000000000..7ff97e072fa
--- /dev/null
+++ b/editors/xemacs-current-nox11/hacks.mk
@@ -0,0 +1,17 @@
+# $NetBSD: hacks.mk,v 1.1 2016/12/30 23:37:40 wiz Exp $
+
+.if !defined(XEMACS_HACKS_MK)
+XEMACS_HACKS_MK=	defined
+
+.include "../../mk/compiler.mk"
+
+### [Fri Oct 28 10:00:00 UTC 2016 : hauke]
+### gcc 5 builtins collide with src/gmalloc.c's calloc(), which
+### results in 'xemacs -vanilla' busy-looping during the build.
+###
+.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-5.[0-9]*)
+PKG_HACKS+=		gcc5-malloc-builtin-conflict
+CFLAGS+=		-fno-builtin
+.endif
+
+.endif  # XEMACS_HACKS_MK
diff --git a/editors/xemacs-nox11/DESCR b/editors/xemacs-nox11/DESCR
new file mode 100644
index 00000000000..fa31dafbce0
--- /dev/null
+++ b/editors/xemacs-nox11/DESCR
@@ -0,0 +1,21 @@
+XEmacs is a self-documenting, customizable, extensible real-time
+display editor.
+
+Users new to XEmacs will be able to use basic features fairly rapidly
+by studying the tutorial and using the self-documentation features.
+XEmacs also has an extensive interactive manual browser.  It is easily
+extensible since its editing commands are written in Lisp.
+
+XEmacs's many special packages handle mail reading (RMail) and sending
+(Mail), outline editing (Outline), compiling (Compile), running
+subshells within Emacs windows (Shell), running a Lisp read-eval-print
+loop (Lisp-Interaction-Mode), automated psychotherapy (Doctor :-) and
+many more. There is a WWW browsing mode written fully in elisp
+that looks and behaves much like the netscape WWW browser.
+
+XEmacs has similar functionality to GNU Emacs. It uses a different
+display model, including support for Motif menu and scroll bars and the
+ability to run as a widget inside other applications. Many people say
+it looks nicer than GNU Emacs.
+
+This package does not support X11.
diff --git a/editors/xemacs-nox11/hacks.mk b/editors/xemacs-nox11/hacks.mk
new file mode 100644
index 00000000000..7ff97e072fa
--- /dev/null
+++ b/editors/xemacs-nox11/hacks.mk
@@ -0,0 +1,17 @@
+# $NetBSD: hacks.mk,v 1.1 2016/12/30 23:37:40 wiz Exp $
+
+.if !defined(XEMACS_HACKS_MK)
+XEMACS_HACKS_MK=	defined
+
+.include "../../mk/compiler.mk"
+
+### [Fri Oct 28 10:00:00 UTC 2016 : hauke]
+### gcc 5 builtins collide with src/gmalloc.c's calloc(), which
+### results in 'xemacs -vanilla' busy-looping during the build.
+###
+.if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-5.[0-9]*)
+PKG_HACKS+=		gcc5-malloc-builtin-conflict
+CFLAGS+=		-fno-builtin
+.endif
+
+.endif  # XEMACS_HACKS_MK