Sun Feb 17 00:21:58 2013 UTC ()
grmbl, try again.


(dholland)
diff -r1.10 -r1.11 pkgsrc/editors/emacs21/Makefile.common
cvs diff -r1.10 -r1.11 pkgsrc/editors/emacs21/Makefile.common (switch to unified diff)

--- pkgsrc/editors/emacs21/Makefile.common 2013/02/17 00:18:58 1.10
+++ pkgsrc/editors/emacs21/Makefile.common 2013/02/17 00:21:58 1.11
@@ -1,108 +1,108 @@ @@ -1,108 +1,108 @@
1# $NetBSD: Makefile.common,v 1.10 2013/02/17 00:18:58 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.11 2013/02/17 00:21:58 dholland 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
12 12
13CONFLICTS= mule-[0-9]* 13CONFLICTS= mule-[0-9]*
14 14
15USE_TOOLS+= gmake perl:run 15USE_TOOLS+= gmake perl:run
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18PATCHDIR= ${.CURDIR}/../../editors/emacs21/patches 18PATCHDIR= ${.CURDIR}/../../editors/emacs21/patches
19FILESDIR= ${.CURDIR}/../../editors/emacs21/files 19FILESDIR= ${.CURDIR}/../../editors/emacs21/files
20DISTINFO_FILE= ${.CURDIR}/../../editors/emacs21/distinfo 20DISTINFO_FILE= ${.CURDIR}/../../editors/emacs21/distinfo
21PLIST_SRC= ${.CURDIR}/../../editors/emacs21/PLIST 21PLIST_SRC= ${.CURDIR}/../../editors/emacs21/PLIST
22 22
23# needed for 21.4a, can probably go away on next update 23# needed for 21.4a, can probably go away on next update
24EMACSVERSION= 21.4 24EMACSVERSION= 21.4
25WRKSRC= ${WRKDIR}/emacs-${EMACSVERSION} 25WRKSRC= ${WRKDIR}/emacs-${EMACSVERSION}
26PLIST_SUBST+= EMACSVERSION=${EMACSVERSION:Q} 26PLIST_SUBST+= EMACSVERSION=${EMACSVERSION:Q}
27 27
28MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp 28MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp
29 29
30# build PATH in the dumped emacs is not a problem 30# build PATH in the dumped emacs is not a problem
31CHECK_WRKREF_SKIP+= bin/emacs 31CHECK_WRKREF_SKIP+= bin/emacs
32CHECK_WRKREF_SKIP+= bin/emacs-${EMACSVERSION} 32CHECK_WRKREF_SKIP+= bin/emacs-${EMACSVERSION}
33 33
34CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q} 34CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q}
35INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} 35INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX}
36INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} 36INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
37INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} 37INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
38 38
39.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
40 40
41# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1. 41# This matches NetBSD <1.7 releases and 1.6A-1.6P, where ld is <2.13.2.1.
42.if (${OPSYS} == "NetBSD" && \ 42.if (${OPSYS} == "NetBSD" && \
43 (empty(OS_VERSION:M1.[0-5]*) && \ 43 (empty(OS_VERSION:M1.[0-5]*) && \
44 empty(OS_VERSION:M1.6_*) && \ 44 empty(OS_VERSION:M1.6_*) && \
45 empty(OS_VERSION:M1.6) && \ 45 empty(OS_VERSION:M1.6) && \
46 empty(OS_VERSION:M1.6.[0-9]*) && \ 46 empty(OS_VERSION:M1.6.[0-9]*) && \
47 empty(OS_VERSION:M1.6[A-P]*))) || \ 47 empty(OS_VERSION:M1.6[A-P]*))) || \
48 ${OPSYS} == "DragonFly" 48 ${OPSYS} == "DragonFly"
49# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc 49# If using GNU ld 2.13.2.1 or later, avoid creating combined reloc
50# sections and .data reloc sections, both of which Emacs can't handle 50# sections and .data reloc sections, both of which Emacs can't handle
51# properly. Analyzed by Stephen Ma. 51# properly. Analyzed by Stephen Ma.
52LDFLAGS+= -Wl,-z,nocombreloc 52LDFLAGS+= -Wl,-z,nocombreloc
53.endif 53.endif
54 54
55# Use terminfo on NetBSD-6. 55# Use terminfo on NetBSD-6.
56# We cannot use terminfo.*.mk as emacs WILL force a link to termcap, 56# We cannot use terminfo.*.mk as emacs WILL force a link to termcap,
57# but this is fine for us. 57# but this is fine for us.
58.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h) 58.if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
59CPPFLAGS+= -DTERMINFO 59CPPFLAGS+= -DTERMINFO
60.endif 60.endif
61 61
62.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) 62.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
63CPPFLAGS+= -DDFLY_CRT_USRLIB 63CPPFLAGS+= -DDFLY_CRT_USRLIB
64.endif 64.endif
65 65
66PLIST_VARS+= fns.el 66PLIST_VARS+= fns.el
67.if ${OPSYS} == "Darwin" 67.if ${OPSYS} == "Darwin"
68PLIST_SUBST+= DOCTAIL="" 68PLIST_SUBST+= DOCTAIL=""
69.else 69.else
70PLIST.fns.el= yes 70PLIST.fns.el= yes
71PLIST_SUBST+= DOCTAIL="-${EMACSVERSION}.1" 71PLIST_SUBST+= DOCTAIL="-${EMACSVERSION}.1"
72.endif 72.endif
73 73
74# Disable W^X. 74# Disable W^X.
75.if ${OPSYS} == "OpenBSD" 75.if ${OPSYS} == "OpenBSD"
76LDFLAGS+= -Z 76LDFLAGS+= -Z
77.endif 77.endif
78 78
79.include "../../mk/compiler.mk" 79.include "../../mk/compiler.mk"
80.if !empty(CC_VERSION:Mgcc-3.*) 80.if !empty(CC_VERSION:Mgcc-3.*)
81CFLAGS+= -fno-zero-initialized-in-bss 81CFLAGS+= -fno-zero-initialized-in-bss
82.endif 82.endif
83 83
84INFO_FILES= # PLIST 84INFO_FILES= # PLIST
85REPLACE_PERL= lib-src/grep-changelog 85REPLACE_PERL= lib-src/grep-changelog
86 86
87post-extract: 87post-extract:
88 ${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp 88 ${CP} ${FILESDIR}/site-init.el ${WRKSRC}/lisp
89 ${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m 89 ${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
90 ${CP} ${FILESDIR}/powermac.h ${WRKSRC}/src/m 90 ${CP} ${FILESDIR}/powermac.h ${WRKSRC}/src/m
91 ${CP} ${FILESDIR}/darwin.h ${WRKSRC}/src/s 91 ${CP} ${FILESDIR}/darwin.h ${WRKSRC}/src/s
92 ${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s 92 ${CP} ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
93 ${CP} ${FILESDIR}/unexmacosx.c ${WRKSRC}/src 93 ${CP} ${FILESDIR}/unexmacosx.c ${WRKSRC}/src
94 ${CP} ${FILESDIR}/sh3el.h ${WRKSRC}/src/m 94 ${CP} ${FILESDIR}/sh3el.h ${WRKSRC}/src/m
95 95
96# for patch-ba 96# for patch-ba
97post-build: 97post-build:
98 cd ${WRKSRC}/lisp && \ 98 cd ${WRKSRC}/lisp && \
99 rm sort.elc && ${MAKE_PROGRAM} sort.elc && \ 99 rm sort.elc && ${MAKE_PROGRAM} sort.elc && \
100 rm mail/smtpmail.elc && ${MAKE_PROGRAM} mail/smtpmail.elc && \ 100 rm mail/smtpmail.elc && ${MAKE_PROGRAM} mail/smtpmail.elc && \
101 rm fast-lock.elc && ${MAKE_PROGRAM} fast-lock.elc 101 rm fast-lock.elc && ${MAKE_PROGRAM} fast-lock.elc
102 102
103pre-install: 103pre-install:
104 @${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f 104 @${FIND} ${WRKSRC} -type f -name "*.orig" -print | ${XARGS} ${RM} -f
105 105
106post-install: 106post-install:
107 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/emacs 107 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/emacs
108 ${CHMOD} -R go-w ${DESTDIR}${PREFIX}/share/emacs 108 ${CHMOD} -R go-w ${DESTDIR}${PREFIX}/share/emacs