Thu Jun 19 15:24:04 2008 UTC ()
use more INSTALLATION_DIRS.  There should be no functional change.


(taca)
diff -r1.15 -r1.16 pkgsrc/www/instiki/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/www/instiki/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/instiki/Attic/Makefile 2006/10/04 22:04:09 1.15
+++ pkgsrc/www/instiki/Attic/Makefile 2008/06/19 15:24:04 1.16
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1# $NetBSD: Makefile,v 1.15 2006/10/04 22:04:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2008/06/19 15:24:04 taca Exp $
2 2
3DISTNAME= instiki-0.9.2 3DISTNAME= instiki-0.9.2
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://rubyforge.org/frs/download.php/2515/ 6MASTER_SITES= http://rubyforge.org/frs/download.php/2515/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://instiki.org/show/HomePage 10HOMEPAGE= http://instiki.org/show/HomePage
11COMMENT= Wiki clone that focuses on simple installation and running 11COMMENT= Wiki clone that focuses on simple installation and running
12 12
13NO_BUILD= yes 13NO_BUILD= yes
14 14
15RCD_SCRIPTS= instiki 15RCD_SCRIPTS= instiki
16FILES_SUBST+= RUBY=${RUBY:Q} 16FILES_SUBST+= RUBY=${RUBY:Q}
17 17
18REPLACE_RUBY= instiki 18REPLACE_RUBY= instiki
19 19
20INSTIKI_DIR= ${PREFIX}/share/${PKGBASE} 20INSTIKI_DIR= share/${PKGBASE}
21 21
22SUBST_CLASSES+= paths 22SUBST_CLASSES+= paths
23SUBST_MESSAGE.paths= Fixing hardcoded paths. 23SUBST_MESSAGE.paths= Fixing hardcoded paths.
24SUBST_STAGE.paths= pre-configure 24SUBST_STAGE.paths= pre-configure
25SUBST_FILES.paths= app/controllers/wiki.rb 25SUBST_FILES.paths= app/controllers/wiki.rb
26SUBST_SED.paths= \ 26SUBST_SED.paths= \
27 -e 's,File.dirname(__FILE__) + "/../../storage,"${VARBASE}/instiki,g' 27 -e 's,File.dirname(__FILE__) + "/../../storage,"${VARBASE}/instiki,g'
28 28
 29INSTALLATION_DIRS= share/doc/${PKGBASE} ${INSTIKI_DIR}
 30
29post-patch: 31post-patch:
30 ${MV} ${WRKSRC}/instiki ${WRKSRC}/instiki.tmp 32 ${MV} ${WRKSRC}/instiki ${WRKSRC}/instiki.tmp
31 ${TR} -d '\015' < ${WRKSRC}/instiki.tmp > ${WRKSRC}/instiki 33 ${TR} -d '\015' < ${WRKSRC}/instiki.tmp > ${WRKSRC}/instiki
32 34
33do-install: 35do-install:
34 ${INSTALL_DATA_DIR} ${INSTIKI_DIR} 
35.for d in app libraries 36.for d in app libraries
36 cd ${WRKSRC} && ${CP} -R ${d} ${INSTIKI_DIR} 37 cd ${WRKSRC} && ${CP} -R ${d} ${DESTDIR}${PREFIX}/${INSTIKI_DIR}
37 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTIKI_DIR}/${d} 38 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/${INSTIKI_DIR}/${d}
38.endfor 39.endfor
39 ${FIND} ${INSTIKI_DIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} 40 ${FIND} ${DESTDIR}${PREFIX}/${INSTIKI_DIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
40 ${FIND} ${INSTIKI_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} 41 ${FIND} ${DESTDIR}${PREFIX}/${INSTIKI_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
41 ${INSTALL_SCRIPT} ${WRKSRC}/instiki ${INSTIKI_DIR} 42 ${INSTALL_SCRIPT} ${WRKSRC}/instiki ${DESTDIR}${PREFIX}/${INSTIKI_DIR}
42 ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE} 
43 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE} 43 ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE}
44 44
45.include "../../lang/ruby/replace.mk" 45.include "../../lang/ruby/replace.mk"
46.include "../../lang/ruby/buildlink3.mk" 46.include "../../lang/ruby/buildlink3.mk"
47.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"