Tue Jun 5 17:56:10 2012 UTC ()
- SQL files are used by scripts and PHP code to create/update the
  database, and they are looking for them directly under INSTALL_DIR.
  As such, move them to RCDIR.

- install bin/ scripts with --x rights.

Package not bumped. All these changes do not affect roundcube besides
installation and update. If your roundcube install works already, chances
are you have adjusted the package in a way similar to this patch.


(jym)
diff -r1.39 -r1.40 pkgsrc/mail/roundcube/Makefile
diff -r1.22 -r1.23 pkgsrc/mail/roundcube/PLIST
cvs diff -r1.39 -r1.40 pkgsrc/mail/roundcube/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/Makefile 2012/03/12 15:38:04 1.39
+++ pkgsrc/mail/roundcube/Makefile 2012/06/05 17:56:10 1.40
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1# $NetBSD: Makefile,v 1.39 2012/03/12 15:38:04 taca Exp $ 1# $NetBSD: Makefile,v 1.40 2012/06/05 17:56:10 jym Exp $
2 2
3DISTNAME= roundcubemail-0.7.2-dep 3DISTNAME= roundcubemail-0.7.2-dep
4PKGNAME= ${DISTNAME:S/mail-/-/:S/-dep//} 4PKGNAME= ${DISTNAME:S/mail-/-/:S/-dep//}
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
7 7
8MAINTAINER= taca@NetBSD.org 8MAINTAINER= taca@NetBSD.org
9HOMEPAGE= http://roundcube.net/ 9HOMEPAGE= http://roundcube.net/
10COMMENT= Browser-based multilingual IMAP client 10COMMENT= Browser-based multilingual IMAP client
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP 15DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.4.2:../../net/pear-Net_SMTP
16DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.8.1:../../mail/pear-Mail_Mime 16DEPENDS+= ${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.8.1:../../mail/pear-Mail_Mime
17DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2>=2.5.0:../../databases/pear-MDB2 17DEPENDS+= ${PHP_PKG_PREFIX}-pear-MDB2>=2.5.0:../../databases/pear-MDB2
18DEPENDS+= ${PHP_PKG_PREFIX}-pear-Auth_SASL>=1.0.3:../../mail/pear-Auth_SASL 18DEPENDS+= ${PHP_PKG_PREFIX}-pear-Auth_SASL>=1.0.3:../../mail/pear-Auth_SASL
19DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom 19DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
20DEPENDS+= ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json 20DEPENDS+= ${PHP_PKG_PREFIX}-json-[0-9]*:../../textproc/php-json
21DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.1:../../net/pear-Net_IDNA2 21DEPENDS+= ${PHP_PKG_PREFIX}-pear-Net_IDNA2>=0.1.1:../../net/pear-Net_IDNA2
22 22
23USE_LANGUAGES= # none 23USE_LANGUAGES= # none
24USE_TOOLS+= pax 24USE_TOOLS+= pax
25NO_BUILD= yes 25NO_BUILD= yes
26 26
27INSTALLATION_DIRS= ${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins 27INSTALLATION_DIRS= ${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins
28INSTALLATION_DIRS+= ${EGDIR}/SQL ${DOCDIR} ${RCDIR}/bin 28INSTALLATION_DIRS+= ${RCDIR}/bin ${RCDIR}/SQL ${DOCDIR} ${EGDIR}
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31.include "../../lang/php/phpversion.mk" 31.include "../../lang/php/phpversion.mk"
32 32
33PKG_SYSCONFSUBDIR?= roundcube 33PKG_SYSCONFSUBDIR?= roundcube
34 34
35WWW_USER?= ${APACHE_USER} 35WWW_USER?= ${APACHE_USER}
36WWW_GROUP?= ${APACHE_GROUP} 36WWW_GROUP?= ${APACHE_GROUP}
37 37
38PKG_GROUPS_VARS+= WWW_GROUP 38PKG_GROUPS_VARS+= WWW_GROUP
39PKG_USERS_VARS= WWW_USER 39PKG_USERS_VARS= WWW_USER
40BUILD_DEFS+= VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP 40BUILD_DEFS+= VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
41 41
42RCDIR= ${PREFIX}/share/roundcube 42RCDIR= ${PREFIX}/share/roundcube
43EGDIR= ${PREFIX}/share/examples/roundcube 43EGDIR= ${PREFIX}/share/examples/roundcube
44DOCDIR= ${PREFIX}/share/doc/roundcube 44DOCDIR= ${PREFIX}/share/doc/roundcube
45PAX_DIRS= plugins program skins installer bin 45PAX_DIRS= plugins program skins installer
46 46
47CONF_PLUGINS= acl additional_message_headers enigma help \ 47CONF_PLUGINS= acl additional_message_headers enigma help \
48 jqueryui managesieve newmail_notifier password \ 48 jqueryui managesieve newmail_notifier password \
49 redundant_attachments squirrelmail_usercopy 49 redundant_attachments squirrelmail_usercopy
50 50
51MESSAGE_SUBST+= DOCDIR=${DOCDIR} PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 51MESSAGE_SUBST+= DOCDIR=${DOCDIR} PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
52MESSAGE_SUBST+= VARBASE=${VARBASE} RCDIR=${RCDIR} 52MESSAGE_SUBST+= VARBASE=${VARBASE} RCDIR=${RCDIR}
53FILES_SUBST+= RCDIR=${RCDIR} 53FILES_SUBST+= RCDIR=${RCDIR}
54 54
55OWN_DIRS+= ${PKG_SYSCONFDIR} 55OWN_DIRS+= ${PKG_SYSCONFDIR}
56OWN_DIRS_PERMS+= ${VARBASE}/log/roundcube \ 56OWN_DIRS_PERMS+= ${VARBASE}/log/roundcube \
57 ${WWW_USER} ${WWW_GROUP} 0755 57 ${WWW_USER} ${WWW_GROUP} 0755
58OWN_DIRS_PERMS+= ${VARBASE}/spool/roundcube \ 58OWN_DIRS_PERMS+= ${VARBASE}/spool/roundcube \
@@ -91,46 +91,47 @@ REPLACE.php.old= /usr/bin/env php @@ -91,46 +91,47 @@ REPLACE.php.old= /usr/bin/env php
91REPLACE.php.new= ${PREFIX}/bin/php 91REPLACE.php.new= ${PREFIX}/bin/php
92REPLACE_FILES.php= bin/*.sh 92REPLACE_FILES.php= bin/*.sh
93 93
94.include "../../mk/apache.mk" 94.include "../../mk/apache.mk"
95.include "options.mk" 95.include "options.mk"
96 96
97post-extract: 97post-extract:
98 ${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf 98 ${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
99 99
100pre-install: 100pre-install:
101 ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f 101 ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
102 102
103do-install: 103do-install:
104 ${INSTALL_DATA} ${WRKSRC}/roundcube.conf \ 
105 ${DESTDIR}${EGDIR}/roundcube.conf 
106 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR} 104 ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}
107 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR} 105 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR}
108 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR} 106 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
109 ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DESTDIR}${DOCDIR} 107 ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DESTDIR}${DOCDIR}
110 108
111 ${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${DESTDIR}${EGDIR}/SQL/ 
112 
113 ${INSTALL_DATA} ${WRKSRC}/.htaccess ${DESTDIR}${RCDIR}/ 109 ${INSTALL_DATA} ${WRKSRC}/.htaccess ${DESTDIR}${RCDIR}/
114 ${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${RCDIR}/ 110 ${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${RCDIR}/
115 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${RCDIR}/ 111 ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${RCDIR}/
 112 ${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${DESTDIR}${RCDIR}/SQL/
116 113
 114 ${INSTALL_DATA} ${WRKSRC}/roundcube.conf \
 115 ${DESTDIR}${EGDIR}/roundcube.conf
117 ${INSTALL_DATA} ${WRKSRC}/config/mimetypes.php \ 116 ${INSTALL_DATA} ${WRKSRC}/config/mimetypes.php \
118 ${DESTDIR}${EGDIR}/mimetypes.php 117 ${DESTDIR}${EGDIR}/mimetypes.php
119 ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \ 118 ${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
120 ${DESTDIR}${EGDIR}/db.inc.php.dist 119 ${DESTDIR}${EGDIR}/db.inc.php.dist
121 ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \ 120 ${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
122 ${DESTDIR}${EGDIR}/main.inc.php.dist 121 ${DESTDIR}${EGDIR}/main.inc.php.dist
123 122
 123 ${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${DESTDIR}${RCDIR}/bin/
 124
124.for i in ${PAX_DIRS} 125.for i in ${PAX_DIRS}
125 cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${RCDIR}/${i} 126 cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${RCDIR}/${i}
126 ${FIND} ${DESTDIR}${RCDIR}/${i} -type f | \ 127 ${FIND} ${DESTDIR}${RCDIR}/${i} -type f | \
127 ${XARGS} ${CHMOD} ${SHAREMODE} 128 ${XARGS} ${CHMOD} ${SHAREMODE}
128 ${FIND} ${DESTDIR}${RCDIR}/${i} -type d | \ 129 ${FIND} ${DESTDIR}${RCDIR}/${i} -type d | \
129 ${XARGS} ${CHMOD} ${PKGDIRMODE} 130 ${XARGS} ${CHMOD} ${PKGDIRMODE}
130 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${RCDIR}/${i} 131 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${RCDIR}/${i}
131.endfor 132.endfor
132 133
133.for f in ${CONF_PLUGINS} 134.for f in ${CONF_PLUGINS}
134 ${MKDIR} ${DESTDIR}${EGDIR}/plugins/${f} 135 ${MKDIR} ${DESTDIR}${EGDIR}/plugins/${f}
135 test -f ${DESTDIR}${EGDIR}/plugins/${f}/config.inc.php ] || 136 test -f ${DESTDIR}${EGDIR}/plugins/${f}/config.inc.php ] ||
136 ${MV} ${DESTDIR}${RCDIR}/plugins/${f}/config.inc.php.dist \ 137 ${MV} ${DESTDIR}${RCDIR}/plugins/${f}/config.inc.php.dist \
cvs diff -r1.22 -r1.23 pkgsrc/mail/roundcube/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/roundcube/PLIST 2012/03/12 15:38:04 1.22
+++ pkgsrc/mail/roundcube/PLIST 2012/06/05 17:56:10 1.23
@@ -1,26 +1,18 @@ @@ -1,26 +1,18 @@
1@comment $NetBSD: PLIST,v 1.22 2012/03/12 15:38:04 taca Exp $ 1@comment $NetBSD: PLIST,v 1.23 2012/06/05 17:56:10 jym Exp $
2share/doc/roundcube/INSTALL 2share/doc/roundcube/INSTALL
3share/doc/roundcube/LICENSE 3share/doc/roundcube/LICENSE
4share/doc/roundcube/README 4share/doc/roundcube/README
5share/doc/roundcube/UPGRADING 5share/doc/roundcube/UPGRADING
6share/examples/roundcube/SQL/mssql.initial.sql 
7share/examples/roundcube/SQL/mssql.upgrade.sql 
8share/examples/roundcube/SQL/mysql.initial.sql 
9share/examples/roundcube/SQL/mysql.update.sql 
10share/examples/roundcube/SQL/postgres.initial.sql 
11share/examples/roundcube/SQL/postgres.update.sql 
12share/examples/roundcube/SQL/sqlite.initial.sql 
13share/examples/roundcube/SQL/sqlite.update.sql 
14share/examples/roundcube/db.inc.php.dist 6share/examples/roundcube/db.inc.php.dist
15share/examples/roundcube/main.inc.php.dist 7share/examples/roundcube/main.inc.php.dist
16share/examples/roundcube/mimetypes.php 8share/examples/roundcube/mimetypes.php
17share/examples/roundcube/plugins/acl/config.inc.php 9share/examples/roundcube/plugins/acl/config.inc.php
18share/examples/roundcube/plugins/additional_message_headers/config.inc.php 10share/examples/roundcube/plugins/additional_message_headers/config.inc.php
19share/examples/roundcube/plugins/enigma/config.inc.php 11share/examples/roundcube/plugins/enigma/config.inc.php
20share/examples/roundcube/plugins/help/config.inc.php 12share/examples/roundcube/plugins/help/config.inc.php
21share/examples/roundcube/plugins/jqueryui/config.inc.php 13share/examples/roundcube/plugins/jqueryui/config.inc.php
22share/examples/roundcube/plugins/managesieve/config.inc.php 14share/examples/roundcube/plugins/managesieve/config.inc.php
23share/examples/roundcube/plugins/newmail_notifier/config.inc.php 15share/examples/roundcube/plugins/newmail_notifier/config.inc.php
24share/examples/roundcube/plugins/password/config.inc.php 16share/examples/roundcube/plugins/password/config.inc.php
25share/examples/roundcube/plugins/redundant_attachments/config.inc.php 17share/examples/roundcube/plugins/redundant_attachments/config.inc.php
26share/examples/roundcube/plugins/squirrelmail_usercopy/config.inc.php 18share/examples/roundcube/plugins/squirrelmail_usercopy/config.inc.php
@@ -1416,13 +1408,21 @@ share/roundcube/skins/default/templates/ @@ -1416,13 +1408,21 @@ share/roundcube/skins/default/templates/
1416share/roundcube/skins/default/templates/identityedit.html 1408share/roundcube/skins/default/templates/identityedit.html
1417share/roundcube/skins/default/templates/importcontacts.html 1409share/roundcube/skins/default/templates/importcontacts.html
1418share/roundcube/skins/default/templates/login.html 1410share/roundcube/skins/default/templates/login.html
1419share/roundcube/skins/default/templates/mail.html 1411share/roundcube/skins/default/templates/mail.html
1420share/roundcube/skins/default/templates/message.html 1412share/roundcube/skins/default/templates/message.html
1421share/roundcube/skins/default/templates/messageerror.html 1413share/roundcube/skins/default/templates/messageerror.html
1422share/roundcube/skins/default/templates/messagepart.html 1414share/roundcube/skins/default/templates/messagepart.html
1423share/roundcube/skins/default/templates/messagepreview.html 1415share/roundcube/skins/default/templates/messagepreview.html
1424share/roundcube/skins/default/templates/messageprint.html 1416share/roundcube/skins/default/templates/messageprint.html
1425share/roundcube/skins/default/templates/plugin.html 1417share/roundcube/skins/default/templates/plugin.html
1426share/roundcube/skins/default/templates/settings.html 1418share/roundcube/skins/default/templates/settings.html
1427share/roundcube/skins/default/templates/settingsedit.html 1419share/roundcube/skins/default/templates/settingsedit.html
1428share/roundcube/skins/default/watermark.html 1420share/roundcube/skins/default/watermark.html
 1421share/roundcube/SQL/mssql.initial.sql
 1422share/roundcube/SQL/mssql.upgrade.sql
 1423share/roundcube/SQL/mysql.initial.sql
 1424share/roundcube/SQL/mysql.update.sql
 1425share/roundcube/SQL/postgres.initial.sql
 1426share/roundcube/SQL/postgres.update.sql
 1427share/roundcube/SQL/sqlite.initial.sql
 1428share/roundcube/SQL/sqlite.update.sql