- 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.

2 files changed, 17 insertions, 16 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 9ebbad2105c..5b0b9822224 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2012/03/12 15:38:04 taca Exp $
+# $NetBSD: Makefile,v 1.40 2012/06/05 17:56:10 jym Exp $
 
 DISTNAME=	roundcubemail-0.7.2-dep
 PKGNAME=	${DISTNAME:S/mail-/-/:S/-dep//}
@@ -25,7 +25,7 @@ USE_TOOLS+=		pax
 NO_BUILD=		yes
 
 INSTALLATION_DIRS=	${RCDIR}/plugins ${RCDIR}/program ${RCDIR}/skins
-INSTALLATION_DIRS+=	${EGDIR}/SQL ${DOCDIR} ${RCDIR}/bin
+INSTALLATION_DIRS+=	${RCDIR}/bin ${RCDIR}/SQL ${DOCDIR} ${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../lang/php/phpversion.mk"
@@ -42,7 +42,7 @@ BUILD_DEFS+=		VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
 RCDIR=			${PREFIX}/share/roundcube
 EGDIR=			${PREFIX}/share/examples/roundcube
 DOCDIR=			${PREFIX}/share/doc/roundcube
-PAX_DIRS=		plugins program skins installer bin
+PAX_DIRS=		plugins program skins installer
 
 CONF_PLUGINS=		acl additional_message_headers enigma help \
 			jqueryui managesieve newmail_notifier password \
@@ -101,19 +101,18 @@ pre-install:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/roundcube.conf \
-		${DESTDIR}${EGDIR}/roundcube.conf
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DESTDIR}${DOCDIR}
 
-	${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${DESTDIR}${EGDIR}/SQL/
-
 	${INSTALL_DATA} ${WRKSRC}/.htaccess ${DESTDIR}${RCDIR}/
 	${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${RCDIR}/
 	${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${RCDIR}/
+	${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${DESTDIR}${RCDIR}/SQL/
 
+	${INSTALL_DATA} ${WRKSRC}/roundcube.conf \
+		${DESTDIR}${EGDIR}/roundcube.conf
 	${INSTALL_DATA} ${WRKSRC}/config/mimetypes.php \
 		${DESTDIR}${EGDIR}/mimetypes.php
 	${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
@@ -121,6 +120,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
 		${DESTDIR}${EGDIR}/main.inc.php.dist
 
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.sh ${DESTDIR}${RCDIR}/bin/
+
 .for i in ${PAX_DIRS}
 	cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${RCDIR}/${i}
 	${FIND} ${DESTDIR}${RCDIR}/${i} -type f | \
diff --git a/mail/roundcube/PLIST b/mail/roundcube/PLIST
index 3923d917b06..dd6ba171314 100644
--- a/mail/roundcube/PLIST
+++ b/mail/roundcube/PLIST
@@ -1,16 +1,8 @@
-@comment $NetBSD: PLIST,v 1.22 2012/03/12 15:38:04 taca Exp $
+@comment $NetBSD: PLIST,v 1.23 2012/06/05 17:56:10 jym Exp $
 share/doc/roundcube/INSTALL
 share/doc/roundcube/LICENSE
 share/doc/roundcube/README
 share/doc/roundcube/UPGRADING
-share/examples/roundcube/SQL/mssql.initial.sql
-share/examples/roundcube/SQL/mssql.upgrade.sql
-share/examples/roundcube/SQL/mysql.initial.sql
-share/examples/roundcube/SQL/mysql.update.sql
-share/examples/roundcube/SQL/postgres.initial.sql
-share/examples/roundcube/SQL/postgres.update.sql
-share/examples/roundcube/SQL/sqlite.initial.sql
-share/examples/roundcube/SQL/sqlite.update.sql
 share/examples/roundcube/db.inc.php.dist
 share/examples/roundcube/main.inc.php.dist
 share/examples/roundcube/mimetypes.php
@@ -1426,3 +1418,11 @@ share/roundcube/skins/default/templates/plugin.html
 share/roundcube/skins/default/templates/settings.html
 share/roundcube/skins/default/templates/settingsedit.html
 share/roundcube/skins/default/watermark.html
+share/roundcube/SQL/mssql.initial.sql
+share/roundcube/SQL/mssql.upgrade.sql
+share/roundcube/SQL/mysql.initial.sql
+share/roundcube/SQL/mysql.update.sql
+share/roundcube/SQL/postgres.initial.sql
+share/roundcube/SQL/postgres.update.sql
+share/roundcube/SQL/sqlite.initial.sql
+share/roundcube/SQL/sqlite.update.sql