Sat Sep 24 00:54:53 2011 UTC ()
* Fix build on Linux (conflict with glibc).
* patch-ag does not exist, regen distinfo.

Tested on Gentoo Linux, DragonFly 2.10.1, and NetBSD current.


(ryoon)
diff -r1.17 -r1.18 pkgsrc/editors/emacs22/Makefile
diff -r1.10 -r1.11 pkgsrc/editors/emacs22/distinfo
cvs diff -r1.17 -r1.18 pkgsrc/editors/emacs22/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs22/Attic/Makefile 2011/07/21 01:35:44 1.17
+++ pkgsrc/editors/emacs22/Attic/Makefile 2011/09/24 00:54:52 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2011/07/21 01:35:44 tron Exp $ 1# $NetBSD: Makefile,v 1.18 2011/09/24 00:54:52 ryoon Exp $
2 2
3PKGNAME?= ${DISTNAME} 3PKGNAME?= ${DISTNAME}
4COMMENT?= GNU editing macros (editor) 4COMMENT?= GNU editing macros (editor)
5 5
6DISTNAME= emacs-22.3 6DISTNAME= emacs-22.3
7PKGREVISION= 14 7PKGREVISION= 14
8CATEGORIES= editors 8CATEGORIES= editors
9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} 9MASTER_SITES= ${MASTER_SITE_GNU:=emacs/}
10 10
11MAINTAINER= markd@NetBSD.org 11MAINTAINER= markd@NetBSD.org
12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html 12HOMEPAGE= http://www.gnu.org/software/emacs/emacs.html
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
@@ -55,26 +55,26 @@ CONF_FILES_PERMS+= /dev/null ${VARBASE}/ @@ -55,26 +55,26 @@ CONF_FILES_PERMS+= /dev/null ${VARBASE}/
55 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q} 55 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE:Q}
56SPECIAL_PERMS+= libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS} 56SPECIAL_PERMS+= libexec/emacs/${PKGVERSION_NOREV}/${MACHINE_GNU_PLATFORM}/update-game-score ${SETGID_GAMES_PERMS}
57 57
58.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) 58.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o)
59CPPFLAGS+= -DDFLY_CRT_USRLIB 59CPPFLAGS+= -DDFLY_CRT_USRLIB
60.endif 60.endif
61 61
62.include "../../mk/compiler.mk" 62.include "../../mk/compiler.mk"
63 63
64# "emacs" uses the C pre-processor to generate makefiles. The C pre-processor 64# "emacs" uses the C pre-processor to generate makefiles. The C pre-processor
65# of newer GCC version is designed to break this by purpose. We work around 65# of newer GCC version is designed to break this by purpose. We work around
66# that using the traditional mode to generate makefiles.  66# that using the traditional mode to generate makefiles.
67.if !empty(CC_VERSION:Mgcc-[4-9].*) 67.if !empty(CC_VERSION:Mgcc-[4-9].*)
68CPP+= -traditional 68CPP+= -P
69CONFIGURE_ENV+= CPP=${CPP:Q} 69CONFIGURE_ENV+= CPP=${CPP:Q}
70.endif 70.endif
71 71
72post-extract: 72post-extract:
73 cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp 73 cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
74 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s 74 cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
75 ${CHMOD} -R go-w ${WRKSRC} 75 ${CHMOD} -R go-w ${WRKSRC}
76 76
77.include "../../mk/oss.buildlink3.mk" 77.include "../../mk/oss.buildlink3.mk"
78.include "../../mk/termcap.buildlink3.mk" 78.include "../../mk/termcap.buildlink3.mk"
79 79
80.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/editors/emacs22/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs22/Attic/distinfo 2011/07/21 01:17:42 1.10
+++ pkgsrc/editors/emacs22/Attic/distinfo 2011/09/24 00:54:52 1.11
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1$NetBSD: distinfo,v 1.10 2011/07/21 01:17:42 tron Exp $ 1$NetBSD: distinfo,v 1.11 2011/09/24 00:54:52 ryoon Exp $
2 2
3SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 3SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0
4RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 4RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
5Size (emacs-22.3.tar.gz) = 39587396 bytes 5Size (emacs-22.3.tar.gz) = 39587396 bytes
6SHA1 (patch-aa) = e99831448b12ba9cc99b5530dc7de949b44c4337 6SHA1 (patch-aa) = e99831448b12ba9cc99b5530dc7de949b44c4337
7SHA1 (patch-ab) = 01ef535f7eca86ff325ed2f2a952ac50e9a59492 7SHA1 (patch-ab) = 01ef535f7eca86ff325ed2f2a952ac50e9a59492
8SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8 8SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8
9SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131 9SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
10SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f 10SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
11SHA1 (patch-af) = 9a30adf280d660c58e841ddb25dfcf1613a5f9fe 11SHA1 (patch-af) = 9a30adf280d660c58e841ddb25dfcf1613a5f9fe
12SHA1 (patch-ag) = 4c8ca4878f4688900222cd273d9beb1fe25e1d14 
13SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa 12SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
14SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c 13SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c
15SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831 14SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831
16SHA1 (patch-an) = 1faa6d8913738278c746c50fff1b0b2f4a869796 15SHA1 (patch-an) = 1faa6d8913738278c746c50fff1b0b2f4a869796
17SHA1 (patch-ao) = 7f2308966583205092885c997c47be83f81a4389 16SHA1 (patch-ao) = 7f2308966583205092885c997c47be83f81a4389
18SHA1 (patch-ap) = b55bc6477c8ca7fd4cb6446ca9487cc0808e2b68 17SHA1 (patch-ap) = b55bc6477c8ca7fd4cb6446ca9487cc0808e2b68
19SHA1 (patch-aq) = 6ee5d195a7dc6d4e94246942689a3b22d9c85636 18SHA1 (patch-aq) = 6ee5d195a7dc6d4e94246942689a3b22d9c85636
20SHA1 (patch-ar) = 96c08701708a8c12c3ea6de12d7632f6ac696793 19SHA1 (patch-ar) = 96c08701708a8c12c3ea6de12d7632f6ac696793
21SHA1 (patch-as) = 00692744b545a98f4339160089eaa5519ca823a5 20SHA1 (patch-as) = 00692744b545a98f4339160089eaa5519ca823a5
22SHA1 (patch-at) = d5468ed9d7ca76f438f7c8b89960c6fcc9cb90c7 21SHA1 (patch-at) = d5468ed9d7ca76f438f7c8b89960c6fcc9cb90c7
23SHA1 (patch-au) = e4a525ed182c3b8f3f7365ee01e186ad5d1b0c7e 22SHA1 (patch-au) = e4a525ed182c3b8f3f7365ee01e186ad5d1b0c7e
24SHA1 (patch-av) = f2fcb0ccbddba1683cc7f1744bca8b171f83c0e7 23SHA1 (patch-av) = f2fcb0ccbddba1683cc7f1744bca8b171f83c0e7
25SHA1 (patch-aw) = 575ffdbf0cf9554dee32aa88fd5a5f49c5ab2bf1 24SHA1 (patch-aw) = 575ffdbf0cf9554dee32aa88fd5a5f49c5ab2bf1