Sat Feb 28 17:35:04 2009 UTC ()
Nice try but ${FIND} -empty aint that portable
Replace pax with ${PAX}


(adrianp)
diff -r1.15 -r1.16 pkgsrc/mail/roundcube/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/mail/roundcube/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/Makefile 2009/02/10 21:24:51 1.15
+++ pkgsrc/mail/roundcube/Makefile 2009/02/28 17:35:04 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2009/02/10 21:24:51 adrianp Exp $ 1# $NetBSD: Makefile,v 1.16 2009/02/28 17:35:04 adrianp Exp $
2# 2#
3 3
4DISTNAME= roundcubemail-${RCVERSION}-dep 4DISTNAME= roundcubemail-${RCVERSION}-dep
5PKGREVISION= 1 5PKGREVISION= 1
6PKGNAME= ${DISTNAME:S/mail-${RCVERSION}-dep/-${VERSION}/} 6PKGNAME= ${DISTNAME:S/mail-${RCVERSION}-dep/-${VERSION}/}
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
9 9
10MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://roundcube.net/ 11HOMEPAGE= http://roundcube.net/
12COMMENT= Browser-based multilingual IMAP client 12COMMENT= Browser-based multilingual IMAP client
13 13
14USE_TOOLS+= pax 14USE_TOOLS+= pax
@@ -71,54 +71,67 @@ SUBST_FILES.files= roundcube.conf @@ -71,54 +71,67 @@ SUBST_FILES.files= roundcube.conf
71SUBST_FILES.files+= config/main.inc.php.dist 71SUBST_FILES.files+= config/main.inc.php.dist
72SUBST_FILES.files+= installer/index.php 72SUBST_FILES.files+= installer/index.php
73SUBST_FILES.files+= program/include/iniset.php 73SUBST_FILES.files+= program/include/iniset.php
74SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g" 74SUBST_SED.files= -e "s|@RCDIR@|${RCDIR}|g"
75SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g" 75SUBST_SED.files+= -e "s|@VARBASE@|${VARBASE}|g"
76SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" 76SUBST_SED.files+= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
77SUBST_MESSAGE.files= Fixing configuration files. 77SUBST_MESSAGE.files= Fixing configuration files.
78 78
79REPLACE_INTERPRETER+= php 79REPLACE_INTERPRETER+= php
80REPLACE.php.old= .*/bin/php 80REPLACE.php.old= .*/bin/php
81REPLACE.php.new= ${PREFIX}/bin/php 81REPLACE.php.new= ${PREFIX}/bin/php
82REPLACE_FILES.php= bin/*.sh 82REPLACE_FILES.php= bin/*.sh
83 83
 84EMPTY_DIRS= plugins/cleanup plugins/emotions/images \
 85 plugins/emotions/jscripts plugins/media/images \
 86 plugins/media/jscripts plugins/nonbreaking/images \
 87 plugins/nonbreaking/langs plugins/searchreplace/images \
 88 plugins/searchreplace/jscripts plugins/spellchecker/images \
 89 plugins/spellchecker/langs plugins/table/images \
 90 plugins/table/jscripts plugins/visualchars/images \
 91 plugins/visualchars/langs themes/advanced/css \
 92 themes/advanced/docs/en/images themes/advanced/images/xp \
 93 themes/advanced/jscripts themes/advanced/docs/en \
 94 themes/advanced/images themes/advanced/docs
 95
84INSTALLATION_DIRS= ${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR} 96INSTALLATION_DIRS= ${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR}
85INSTALLATION_DIRS+= ${RCDIR}/bin 97INSTALLATION_DIRS+= ${RCDIR}/bin
86 98
87.include "../../mk/apache.mk" 99.include "../../mk/apache.mk"
88.include "options.mk" 100.include "options.mk"
89 101
90post-extract: 102post-extract:
91 ${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf 103 ${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
92 104
93pre-install: 105pre-install:
94 ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f 106 ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
95. for i in 1 2 3 107
96 ${FIND} ${WRKSRC}/program/js/tiny_mce -type d -empty | ${XARGS} ${RMDIR} 108. for d in ${EMPTY_DIRS}
 109 cd ${WRKSRC}/program/js/tiny_mce && rmdir ${d}
97. endfor 110. endfor
98 111
99do-install: 112do-install:
100 ${INSTALL_DATA} ${WRKSRC}/roundcube.conf ${EGDIR}/roundcube.conf 113 ${INSTALL_DATA} ${WRKSRC}/roundcube.conf ${EGDIR}/roundcube.conf
101 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR} 114 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
102 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR} 115 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
103 ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} 116 ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
104 ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCDIR} 117 ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCDIR}
105 118
106 ${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${EGDIR}/SQL/ 119 ${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${EGDIR}/SQL/
107 120
108 ${INSTALL_DATA} ${WRKSRC}/.htaccess ${RCDIR}/ 121 ${INSTALL_DATA} ${WRKSRC}/.htaccess ${RCDIR}/
109 ${INSTALL_DATA} ${WRKSRC}/index.php ${RCDIR}/ 122 ${INSTALL_DATA} ${WRKSRC}/index.php ${RCDIR}/
110 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${RCDIR}/ 123 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${RCDIR}/
111 124
112 ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \ 125 ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
113 ${EGDIR}/db.inc.php.dist 126 ${EGDIR}/db.inc.php.dist
114 ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \ 127 ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
115 ${EGDIR}/main.inc.php.dist 128 ${EGDIR}/main.inc.php.dist
116 129
117. for i in ${PAX_DIRS} 130. for i in ${PAX_DIRS}
118 cd ${WRKSRC}/${i} && pax -rw . ${RCDIR}/${i} 131 cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i}
119 ${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} 132 ${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
120 ${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE} 133 ${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
121 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i} 134 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
122. endfor 135. endfor
123 136
124.include "../../mk/bsd.pkg.mk" 137.include "../../mk/bsd.pkg.mk"