Sat Nov 20 22:44:40 2010 UTC ()
Make apel build with emacs24.


(minskim)
diff -r1.22 -r1.23 pkgsrc/devel/apel/Makefile
cvs diff -r1.22 -r1.23 pkgsrc/devel/apel/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/apel/Makefile 2009/08/06 01:44:47 1.22
+++ pkgsrc/devel/apel/Makefile 2010/11/20 22:44:39 1.23
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.22 2009/08/06 01:44:47 minskim Exp $ 1# $NetBSD: Makefile,v 1.23 2010/11/20 22:44:39 minskim Exp $
2 2
3DISTNAME= apel-10.7 3DISTNAME= apel-10.7
4PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} 4PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/ 7MASTER_SITES= http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/
8 8
9MAINTAINER= uebayasi@NetBSD.org 9MAINTAINER= uebayasi@NetBSD.org
10HOMEPAGE= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/APEL/ 10HOMEPAGE= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/APEL/
11COMMENT= Portable Emacs library 11COMMENT= Portable Emacs library
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14INSTALLATION_DIRS+= ${DOCDIR} \ 14INSTALLATION_DIRS+= ${DOCDIR} \
15 ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/apel \ 15 ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/apel \
16 ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/emu 16 ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/emu
17 17
18PLIST_SRC= ${PKGDIR}/PLIST.${EMACS_FLAVOR} 18PLIST_SRC= ${PKGDIR}/PLIST.${EMACS_FLAVOR}
19BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}} 19BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}}
20INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}} 20INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}}
21MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q} 21MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q}
22MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q} 22MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q}
23MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q} 23MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
24MAKE_FLAGS+= ${MAKE_FLAGS.${EMACS_FLAVOR}} 24MAKE_FLAGS+= ${MAKE_FLAGS.${EMACS_FLAVOR}}
25 25
26# apel is included in xemacs-packages 26# apel is included in xemacs-packages
27EMACS_VERSIONS_ACCEPTED=emacs23 emacs22 emacs22nox emacs21 emacs21nox emacs20 27EMACS_VERSIONS_ACCEPTED=emacs24 emacs23 emacs22 emacs22nox \
 28 emacs21 emacs21nox emacs20
28 29
29BUILD_TARGET.emacs= elc 30BUILD_TARGET.emacs= elc
30BUILD_TARGET.xemacs= package 31BUILD_TARGET.xemacs= package
31INSTALL_TARGET.emacs= install 32INSTALL_TARGET.emacs= install
32INSTALL_TARGET.xemacs= install-package 33INSTALL_TARGET.xemacs= install-package
33MAKE_FLAGS.emacs= 34MAKE_FLAGS.emacs=
34MAKE_FLAGS.xemacs= PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||} 35MAKE_FLAGS.xemacs= PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||}
35 36
36# Pkgsrc developers should run "install" without this and check if PLIST is 37# Pkgsrc developers should run "install" without this and check if PLIST is
37# correct. Users just need to install files. 38# correct. Users just need to install files.
38do-install: plist 39do-install: plist
39 cd ${WRKSRC}; \ 40 cd ${WRKSRC}; \
40 for subdir in emu apel; do \ 41 for subdir in emu apel; do \