Fri Mar 18 10:55:20 2011 UTC ()
Add user-destdir installation support.


(obache)
diff -r1.4 -r1.5 pkgsrc/textproc/emacs-muse/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/textproc/emacs-muse/files/Makefile.defs
cvs diff -r1.4 -r1.5 pkgsrc/textproc/emacs-muse/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/emacs-muse/Makefile 2009/08/06 01:44:55 1.4
+++ pkgsrc/textproc/emacs-muse/Makefile 2011/03/18 10:55:20 1.5
@@ -1,38 +1,40 @@ @@ -1,38 +1,40 @@
1# $NetBSD: Makefile,v 1.4 2009/08/06 01:44:55 minskim Exp $ 1# $NetBSD: Makefile,v 1.5 2011/03/18 10:55:20 obache Exp $
2# 2#
3 3
4DISTNAME= muse-3.11 4DISTNAME= muse-3.11
5PKGNAME= ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME} 5PKGNAME= ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= textproc editors 7CATEGORIES= textproc editors
8MASTER_SITES= http://download.gna.org/muse-el/ 8MASTER_SITES= http://download.gna.org/muse-el/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://mwolson.org/projects/EmacsMuse.html 11HOMEPAGE= http://mwolson.org/projects/EmacsMuse.html
12COMMENT= Publishing environment for Emacs 12COMMENT= Publishing environment for Emacs
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
 15PKG_DESTDIR_SUPPORT= user-destdir
 16
15USE_LANGUAGES= # none 17USE_LANGUAGES= # none
16USE_TOOLS+= gmake makeinfo 18USE_TOOLS+= gmake makeinfo
17INFO_FILES= yes 19INFO_FILES= yes
18 20
19MAKE_FLAGS+= -I.. 21MAKE_FLAGS+= -I..
20INSTALLATION_DIRS= share/doc/emacs-muse share/examples/emacs-muse 22INSTALLATION_DIRS= share/doc/emacs-muse share/examples/emacs-muse
21 23
22pre-build: 24pre-build:
23 sed -e "s,@PREFIX@,${PREFIX}," -e "s,@LISPDIR@,${EMACS_LISPPREFIX}," \ 25 sed -e "s,@PREFIX@,${PREFIX}," -e "s,@LISPDIR@,${EMACS_LISPPREFIX}," \
24 -e "s,@EMACS@,${EMACS_BIN}," ${FILESDIR}/Makefile.defs \ 26 -e "s,@EMACS@,${EMACS_BIN}," ${FILESDIR}/Makefile.defs \
25 > ${WRKSRC}/Makefile.defs 27 > ${WRKSRC}/Makefile.defs
26 28
27post-install: 29post-install:
28 ${INSTALL_DATA} ${WRKSRC}/etc/emacs-wiki-migration.txt \ 30 ${INSTALL_DATA} ${WRKSRC}/etc/emacs-wiki-migration.txt \
29 ${PREFIX}/share/doc/emacs-muse 31 ${DESTDIR}${PREFIX}/share/doc/emacs-muse
30 ${INSTALL_DATA} ${WRKSRC}/etc/muse.rnc \ 32 ${INSTALL_DATA} ${WRKSRC}/etc/muse.rnc \
31 ${PREFIX}/share/doc/emacs-muse 33 ${DESTDIR}${PREFIX}/share/doc/emacs-muse
32 ${INSTALL_DATA} ${WRKSRC}/examples/QuickStart.muse \ 34 ${INSTALL_DATA} ${WRKSRC}/examples/QuickStart.muse \
33 ${PREFIX}/share/examples/emacs-muse 35 ${DESTDIR}${PREFIX}/share/examples/emacs-muse
34 ${INSTALL_DATA} ${WRKSRC}/examples/*.png \ 36 ${INSTALL_DATA} ${WRKSRC}/examples/*.png \
35 ${PREFIX}/share/examples/emacs-muse 37 ${DESTDIR}${PREFIX}/share/examples/emacs-muse
36 38
37.include "../../editors/emacs/modules.mk" 39.include "../../editors/emacs/modules.mk"
38.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/textproc/emacs-muse/files/Makefile.defs (expand / switch to unified diff)

--- pkgsrc/textproc/emacs-muse/files/Makefile.defs 2007/09/16 10:30:25 1.1.1.1
+++ pkgsrc/textproc/emacs-muse/files/Makefile.defs 2011/03/18 10:55:20 1.2
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1include Makefile.defs.default 1include Makefile.defs.default
2 2
3EMACS= @EMACS@ 3EMACS= ${DESTDIR}@EMACS@
4PREFIX= @PREFIX@ 4PREFIX= ${DESTDIR}@PREFIX@
5ELISPDIR= @LISPDIR@/muse 5ELISPDIR= ${DESTDIR}@LISPDIR@/muse