Fri Nov 11 10:54:41 2016 UTC ()
emacs21: remove convoluted logic for using binutils hack -- use it
unconditionally here too. it's highly unlikely someone has such old
binutils.

bump PKGREVISION - it causes runtime crashes.


(maya)
diff -r1.36 -r1.37 pkgsrc/editors/emacs21/Makefile
diff -r1.16 -r1.17 pkgsrc/editors/emacs21/Makefile.common
cvs diff -r1.36 -r1.37 pkgsrc/editors/emacs21/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/Makefile 2016/07/09 06:38:14 1.36
+++ pkgsrc/editors/emacs21/Makefile 2016/11/11 10:54:41 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2016/07/09 06:38:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.37 2016/11/11 10:54:41 maya Exp $
2 2
3PKGREVISION= 35 3PKGREVISION= 36
4CATEGORIES= editors 4CATEGORIES= editors
5 5
6CONFLICTS+= emacs21-nox11-[0-9]* 6CONFLICTS+= emacs21-nox11-[0-9]*
7 7
8USE_TOOLS+= imake 8USE_TOOLS+= imake
9 9
10.include "options.mk" 10.include "options.mk"
11 11
12.include "../../editors/emacs21/Makefile.common" 12.include "../../editors/emacs21/Makefile.common"
13 13
14.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/editors/emacs21/Makefile.common (expand / switch to unified diff)

--- pkgsrc/editors/emacs21/Makefile.common 2016/02/25 12:22:40 1.16
+++ pkgsrc/editors/emacs21/Makefile.common 2016/11/11 10:54:41 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.16 2016/02/25 12:22:40 jperkin Exp $ 1# $NetBSD: Makefile.common,v 1.17 2016/11/11 10:54:41 maya Exp $
2# 2#
3# used by editors/emacs21/Makefile 3# used by editors/emacs21/Makefile
4# used by editors/emacs21-nox11/Makefile 4# used by editors/emacs21-nox11/Makefile
5 5
6DISTNAME= emacs-${EMACSVERSION}a 6DISTNAME= emacs-${EMACSVERSION}a
7PKGNAME?= emacs21-${EMACSVERSION}a 7PKGNAME?= emacs21-${EMACSVERSION}a
8 8
9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 11HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
12COMMENT= GNU editing macros (editor) 12COMMENT= GNU editing macros (editor)
13 13
14CONFLICTS= mule-[0-9]* 14CONFLICTS= mule-[0-9]*
@@ -29,39 +29,30 @@ PLIST_SUBST+= EMACSVERSION=${EMACSVERSIO @@ -29,39 +29,30 @@ PLIST_SUBST+= EMACSVERSION=${EMACSVERSIO
29MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp 29MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp
30 30
31# build PATH in the dumped emacs is not a problem 31# build PATH in the dumped emacs is not a problem
32CHECK_WRKREF_SKIP+= bin/emacs 32CHECK_WRKREF_SKIP+= bin/emacs
33CHECK_WRKREF_SKIP+= bin/emacs-${EMACSVERSION} 33CHECK_WRKREF_SKIP+= bin/emacs-${EMACSVERSION}
34 34
35CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q} 35CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q}
36INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} 36INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
37INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} 37INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
38INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} 38INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
39 39
40.include "../../mk/bsd.prefs.mk" 40.include "../../mk/bsd.prefs.mk"
41 41
42# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1. 
43.if (${OPSYS} == "NetBSD" && \ 
44 (empty(OS_VERSION:M1.[0-5]*) && \ 
45 empty(OS_VERSION:M1.6_*) && \ 
46 empty(OS_VERSION:M1.6) && \ 
47 empty(OS_VERSION:M1.6.[0-9]*) && \ 
48 empty(OS_VERSION:M1.6[A-P]*))) || \ 
49 ${OPSYS} == "DragonFly" 
50# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc 42# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
51# sections and .data reloc sections, both of which Emacs can't handle 43# sections and .data reloc sections, both of which Emacs can't handle
52# properly. Analyzed by Stephen Ma. 44# properly. Analyzed by Stephen Ma.
53LDFLAGS+= -Wl,-z,nocombreloc 45LDFLAGS+= -Wl,-z,nocombreloc
54.endif 
55 46
56# Use terminfo on NetBSD-6. 47# Use terminfo on NetBSD-6.
57# We cannot use terminfo.*.mk as emacs WILL force a link to termcap, 48# We cannot use terminfo.*.mk as emacs WILL force a link to termcap,
58# but this is fine for us. 49# but this is fine for us.
59.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h) 50.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
60CPPFLAGS+= -DTERMINFO 51CPPFLAGS+= -DTERMINFO
61.endif 52.endif
62 53
63.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) 54.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
64CPPFLAGS+= -DDFLY_CRT_USRLIB 55CPPFLAGS+= -DDFLY_CRT_USRLIB
65.endif 56.endif
66 57
67PLIST_VARS+= fns.el 58PLIST_VARS+= fns.el