[pkgsrc/trunk]: pkgsrc/editors/xemacs-nox11 GC hacks.mk -- switching to syste...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5a0ef583a66
branches:  trunk
changeset: 375543:b5a0ef583a66
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Wed Feb 14 12:51:58 2018 +0000

description:
GC hacks.mk -- switching to system malloc has taken care of the issue.

Unbreak package by including options.mk, which keeps configure from
looking fro X11.

diffstat:

 editors/xemacs-nox11/Makefile |   7 +++++--
 editors/xemacs-nox11/hacks.mk |  17 -----------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diffs (40 lines):

diff -r fdd95aa46e64 -r b5a0ef583a66 editors/xemacs-nox11/Makefile
--- a/editors/xemacs-nox11/Makefile     Wed Feb 14 12:20:15 2018 +0000
+++ b/editors/xemacs-nox11/Makefile     Wed Feb 14 12:51:58 2018 +0000
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.26 2018/02/01 14:25:30 hauke Exp $
+# $NetBSD: Makefile,v 1.27 2018/02/14 12:51:58 hauke Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-nox11-/}
-PKGREVISION=   3
+PKGREVISION=   4
 COMMENT=       XEmacs text editor version 21 (no x11 support)
 
 # Version information in ../../editors/xemacs/Makefile.common
 
+.include "../../editors/xemacs/options.mk"
+
 .include "../../editors/xemacs/Makefile.common"
+
 .include "../../mk/bsd.pkg.mk"
diff -r fdd95aa46e64 -r b5a0ef583a66 editors/xemacs-nox11/hacks.mk
--- a/editors/xemacs-nox11/hacks.mk     Wed Feb 14 12:20:15 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $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