diff options
| author | hauke <hauke@pkgsrc.org> | 2017-11-15 15:07:17 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2017-11-15 15:07:17 +0000 |
| commit | 21e4c4eb9d176ff717ee9f7d4a58fa3e432f8fbb (patch) | |
| tree | 63d550634636da4e63f51fe3167b4026228dae91 /editors | |
| parent | ce4e53d8715d13235a90796f9eca06bdf8f18d90 (diff) | |
| download | pkgsrc-21e4c4eb9d176ff717ee9f7d4a58fa3e432f8fbb.tar.gz | |
Upgrade to XEmacs 21.5.34
Most of the functionality moved to
../../editors/xemacs-current/{Makefile.common,options.mk}
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/xemacs-current-nox11/Makefile | 11 | ||||
| -rw-r--r-- | editors/xemacs-current-nox11/hacks.mk | 17 |
2 files changed, 1 insertions, 27 deletions
diff --git a/editors/xemacs-current-nox11/Makefile b/editors/xemacs-current-nox11/Makefile index 495ecafacb8..3d305d7086d 100644 --- a/editors/xemacs-current-nox11/Makefile +++ b/editors/xemacs-current-nox11/Makefile @@ -1,16 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2016/12/30 23:09:41 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2017/11/15 15:07:17 hauke Exp $ PKGNAME= ${DISTNAME:S/-/-nox11-/} COMMENT= *BETA* XEmacs text editor version ${PKGVERSION_NOREV} (no X11 support) -PKGREVISION= 23 - -CONFIGURE_ARGS+= --without-x -CONFIGURE_ARGS+= --without-jpeg -CONFIGURE_ARGS+= --without-png -CONFIGURE_ARGS+= --without-tiff -CONFIGURE_ARGS+= --without-xpm -CONFIGURE_ARGS+= --with-site-prefixes=${PREFIX} -CONFIGURE_ARGS+= --with-site-runtime-libraries=${PREFIX}/lib .include "../../editors/xemacs-current/options.mk" .include "../../editors/xemacs-current/Makefile.common" diff --git a/editors/xemacs-current-nox11/hacks.mk b/editors/xemacs-current-nox11/hacks.mk deleted file mode 100644 index 7ff97e072fa..00000000000 --- a/editors/xemacs-current-nox11/hacks.mk +++ /dev/null @@ -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 |