diff options
| author | uebayasi <uebayasi> | 2008-10-11 09:31:54 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi> | 2008-10-11 09:31:54 +0000 |
| commit | c4b82a5cd529780fd545357545325d304952e605 (patch) | |
| tree | 28f89f081daec07805c1f982f0bc63a420c005ba /devel/apel | |
| parent | a7300be85c95b1f5616bddb1498456305605775e (diff) | |
| download | pkgsrc-c4b82a5cd529780fd545357545325d304952e605.tar.gz | |
Move mk/emacs.mk to editors/emacs/modules.mk.
Don't call pkg_info to get the installed Emacs version; always use the
version matching EMACS_TYPE set by users. Be DEPENDS to it. This should
address pkg/37146 by Aleksey Cheusov.
While here convert some emacs lisp packages to user-destdir.
Diffstat (limited to 'devel/apel')
| -rw-r--r-- | devel/apel/Makefile | 23 | ||||
| -rw-r--r-- | devel/apel/buildlink3.mk | 4 |
2 files changed, 22 insertions, 5 deletions
diff --git a/devel/apel/Makefile b/devel/apel/Makefile index ddded744cbf..14eb6ff1fe9 100644 --- a/devel/apel/Makefile +++ b/devel/apel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/10/29 12:53:51 uebayasi Exp $ +# $NetBSD: Makefile,v 1.20 2008/10/11 09:31:55 uebayasi Exp $ DISTNAME= apel-10.7 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -10,6 +10,11 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://www.kanji.zinbun.kyoto-u.ac.jp/~tomo/elisp/APEL/ COMMENT= Portable Emacs library +PKG_DESTDIR_SUPPORT= user-destdir +INSTALLATION_DIRS+= ${DOCDIR} \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/apel \ + ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/emu + PLIST_SRC= ${PKGDIR}/PLIST.${EMACS_FLAVOR} BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}} INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}} @@ -17,7 +22,6 @@ MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q} MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q} MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q} MAKE_FLAGS+= ${MAKE_FLAGS.${EMACS_FLAVOR}} -INSTALLATION_DIRS+= ${DOCDIR} # apel is included in xemacs-packages EMACS_VERSIONS_ACCEPTED=emacs22 emacs22nox emacs21 emacs21nox emacs20 @@ -29,5 +33,18 @@ INSTALL_TARGET.xemacs= install-package MAKE_FLAGS.emacs= MAKE_FLAGS.xemacs= PACKAGEDIR=${EMACS_LISPPREFIX:C|/lisp$||} -.include "../../mk/emacs.mk" +# Pkgsrc developers should run "install" without this and check if PLIST is +# correct. Users just need to install files. +do-install: plist + cd ${WRKSRC}; \ + for subdir in emu apel; do \ + grep -v '^@' ${PLIST} | grep "/site-lisp/$$subdir/" | \ + while read file; do \ + file=$$( basename $$file ); \ + ${INSTALL_DATA} $$file \ + ${DESTDIR}${EMACS_LISPPREFIX}/$$subdir/$$file; \ + done \ + done + +.include "../../editors/emacs/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/apel/buildlink3.mk b/devel/apel/buildlink3.mk index 37b3585a523..e55330412dd 100644 --- a/devel/apel/buildlink3.mk +++ b/devel/apel/buildlink3.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1 2007/10/29 12:41:16 uebayasi Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2008/10/11 09:31:55 uebayasi Exp $ # BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APEL_BUILDLINK3_MK:= ${APEL_BUILDLINK3_MK}+ -.include "../../mk/emacs.mk" +.include "../../editors/emacs/modules.mk" .if ${EMACS_FLAVOR} == "emacs" .if ${BUILDLINK_DEPTH} == "+" |