Wed Apr 25 11:56:43 2012 UTC ()
Like emacs21, #define TERMINFO for NetBSD >= 6.

Fixes PR lib/46366 - thanks to dholland for the hint.


(hauke)
diff -r1.101 -r1.102 pkgsrc/editors/xemacs/Makefile
cvs diff -r1.101 -r1.102 pkgsrc/editors/xemacs/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/xemacs/Makefile 2012/02/06 12:40:05 1.101
+++ pkgsrc/editors/xemacs/Makefile 2012/04/25 11:56:42 1.102
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.101 2012/02/06 12:40:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.102 2012/04/25 11:56:42 hauke Exp $
2 2
3PKGNAME?= ${DISTNAME} 3PKGNAME?= ${DISTNAME}
4COMMENT?= XEmacs text editor version 21 4COMMENT?= XEmacs text editor version 21
5 5
6DISTNAME= xemacs-21.4.22 6DISTNAME= xemacs-21.4.22
7PKGREVISION= 5 7PKGREVISION= 6
8CATEGORIES= editors 8CATEGORIES= editors
9MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/} 9MASTER_SITES= ${MASTER_SITE_XEMACS:=${DISTNAME:C/[.][^.]*$//}/}
10 10
11MAINTAINER= hauke@NetBSD.org 11MAINTAINER= hauke@NetBSD.org
12HOMEPAGE= http://www.xemacs.org/ 12HOMEPAGE= http://www.xemacs.org/
13 13
14CONFLICTS+= gnuserv-[0-9]* 14CONFLICTS+= gnuserv-[0-9]*
15CONFLICTS+= xemacs-[0-9]* 15CONFLICTS+= xemacs-[0-9]*
16CONFLICTS+= xemacs-nox11-[0-9]* 16CONFLICTS+= xemacs-nox11-[0-9]*
17 17
18NOT_FOR_PLATFORM= *-*-mips* # fails purespace dumping 18NOT_FOR_PLATFORM= *-*-mips* # fails purespace dumping
19 19
20PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
@@ -29,26 +29,33 @@ FILES_SUBST+= DISTNAME=${DISTNAME:Q} @@ -29,26 +29,33 @@ FILES_SUBST+= DISTNAME=${DISTNAME:Q}
29MESSAGE_SUBST+= DISTNAME=${DISTNAME:Q} 29MESSAGE_SUBST+= DISTNAME=${DISTNAME:Q}
30INFO_FILES= # PLIST 30INFO_FILES= # PLIST
31 31
32.include "options.mk" 32.include "options.mk"
33 33
34CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} 34CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM}
35CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 35CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
36CONFIGURE_ARGS+= --mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1 36CONFIGURE_ARGS+= --mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
37CONFIGURE_ARGS+= --with-clash-detection 37CONFIGURE_ARGS+= --with-clash-detection
38CONFIGURE_ARGS+= --with-mule=yes 38CONFIGURE_ARGS+= --with-mule=yes
39CONFIGURE_ARGS+= --with-msw=no 39CONFIGURE_ARGS+= --with-msw=no
40CFLAGS+= -Dunix 40CFLAGS+= -Dunix
41 41
 42# Use terminfo on NetBSD-6 and newer.
 43# We cannot use terminfo.*.mk as XEmacs enforces a link to termcap,
 44# but this is fine for us.
 45.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
 46CPPFLAGS+= -DTERMINFO
 47.endif
 48
42.if ${X11_TYPE} != "modular" 49.if ${X11_TYPE} != "modular"
43INFOPATH= ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR} 50INFOPATH= ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
44.else 51.else
45INFOPATH= ${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR} 52INFOPATH= ${PREFIX}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
46.endif 53.endif
47CONFIGURE_ARGS+= --infopath=${INFOPATH:Q} 54CONFIGURE_ARGS+= --infopath=${INFOPATH:Q}
48 55
49.if ${OPSYS} == "SunOS" 56.if ${OPSYS} == "SunOS"
50. if !exists(/usr/demo/SOUND/libaudio.a) && \ 57. if !exists(/usr/demo/SOUND/libaudio.a) && \
51 !exists(/usr/demo/SOUND/lib/libaudio.a) 58 !exists(/usr/demo/SOUND/lib/libaudio.a)
52CONFIGURE_ARGS+= --with_sound=none 59CONFIGURE_ARGS+= --with_sound=none
53. endif 60. endif
54.endif 61.endif