Update to 0.1.1

pkgsrc changes:
- Use the 'dep' version to install roundcube with no included dependencies
  and instead manage it all through pkgsrc - suggestion from schmonz@
- Move the config files to ${PREFIX}/share/roundcube/config as it was
  becomming difficult to manage them under ${PKG_SYSCONFDIR}
- Add the GUI installer scripts to the install so users can use it for the
  initial setup and generation of the configuration files.
- Add a note to the roundcube.conf file about protection of the
  installer directory once initially used.
- Don't assume apache is the only supported web server (because it's not)
  we don't support any additional ones now but this will make integration
  down the track easier if we do.
- Increased PKG_SUGGESTED_OPTIONS based on documentation in the INSTALL file.
- Add more required PHP options to roundcube.conf

Thanks to Dan Engholm for feedback on the package.

From the ChangeLog:
* Clear selection when selecting single item (1484942)
* Remove hard-coded image size in skin templates (1484893)
* Database schema improvements (dropped unnecessary indexes)
* Fixed creating a new folder with a comma in its name (1484681)
* Fixed sorting of messages when default mailbox is empty (1484317)
* Improve message previewpane - less loading (1484316)
* Fixed login form autocompletion (1484839)
* Fixed virtuser_query option for mdb2 backend (1484874)
* Fixed attachment resoting from Drafts when message body was empty (1484506)
* Fixed usage of ob_gzhandler (1484851)
* Fixed message part window in IE6 (1484610)
* Fixed decoding of mime-encoded strings (1484191)
* Fixed some iconv/mb_string problems (1484598)
* Correctly quote mailbox name when using in URL (1484313)
* Fixed "headers already sent" errors (1484860)

1 files changed, 53 insertions, 37 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 5e4fac6da54..389b5ab7d03 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/03/15 13:54:59 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2008/05/04 16:34:03 adrianp Exp $
 #
 
-DISTNAME=	roundcubemail-0.1
-PKGNAME=	${DISTNAME:S/mail//}
+DISTNAME=	roundcubemail-${VERSION}-dep
+PKGNAME=	${DISTNAME:S/mail-${VERSION}-dep/-${VERSION}/}
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=roundcubemail/}
 
@@ -12,49 +12,54 @@ COMMENT=	Browser-based multilingual IMAP client
 
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
+VERSION=	0.1.1
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../lang/php/phpversion.mk"
 
-PKG_SYSCONFSUBDIR?=	httpd
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Net_SMTP>=1.2.10:../../net/pear-Net_SMTP
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Mail_Mime>=1.3:../../mail/pear-Mail_Mime
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-MDB2>=2.4.1:../../databases/pear-MDB2
+DEPENDS+=	${PHP_PKG_PREFIX}-pear-Auth_SASL-[0-9]*:../../mail/pear-Auth_SASL
 
-PKG_GROUPS_VARS+=	APACHE_GROUP
-PKG_USERS_VARS+=	APACHE_USER
-BUILD_DEFS+=		VARBASE APACHE_USER APACHE_GROUP
+PKG_SYSCONFSUBDIR?=	roundcube
 
-RCDIR=		${PREFIX}/share/roundcube
-EGDIR=		${PREFIX}/share/examples/roundcube
-DOCDIR=		${PREFIX}/share/doc/roundcube
-PAX_DIRS=	program skins
+WWW_USER?=		${APACHE_USER}
+WWW_GROUP?=		${APACHE_GROUP}
 
-MESSAGE_SUBST+=	DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-MESSAGE_SUBST+=	VARBASE=${VARBASE:Q}
-FILES_SUBST+=	RCDIR=${RCDIR:Q}
+PKG_GROUPS_VARS+=	WWW_GROUP
+PKG_USERS_VARS+=	WWW_USER
+BUILD_DEFS+=		VARBASE WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP
 
-OWN_DIRS+=	${PKG_SYSCONFDIR}/roundcube
-OWN_DIRS_PERMS+=${VARBASE}/log/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755
-OWN_DIRS_PERMS+=${VARBASE}/tmp/roundcube ${APACHE_USER} ${APACHE_GROUP} 0755
+RCDIR=			${PREFIX}/share/roundcube
+EGDIR=			${PREFIX}/share/examples/roundcube
+DOCDIR=			${PREFIX}/share/doc/roundcube
+PAX_DIRS=		program skins installer
 
-CONF_FILES=	${EGDIR}/roundcube.conf ${PKG_SYSCONFDIR}/roundcube.conf
-CONF_FILES_PERMS+=	\
-	${EGDIR}/db.inc.php ${PKG_SYSCONFDIR}/roundcube/db.inc.php \
-		${ROOT_USER} ${APACHE_GROUP} 0640 \
-	${EGDIR}/main.inc.php ${PKG_SYSCONFDIR}/roundcube/main.inc.php \
-		${ROOT_USER} ${APACHE_GROUP} 0640
+MESSAGE_SUBST+=		DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+=		VARBASE=${VARBASE:Q} RCDIR=${RCDIR:Q}
+FILES_SUBST+=		RCDIR=${RCDIR:Q}
+
+OWN_DIRS_PERMS+=	${VARBASE}/log/roundcube \
+			${WWW_USER} ${WWW_GROUP} 0755
+OWN_DIRS_PERMS+=	${VARBASE}/tmp/roundcube \
+			${WWW_USER} ${WWW_GROUP} 0755
+
+CONF_FILES=		${EGDIR}/roundcube.conf \
+			${PKG_SYSCONFDIR}/roundcube.conf
 
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	do-configure
 SUBST_FILES.files=	roundcube.conf
 SUBST_FILES.files+=	config/main.inc.php.dist
-SUBST_FILES.files+=	program/include/main.inc
 SUBST_SED.files=	-e "s|@RCDIR@|${RCDIR}|g"
 SUBST_SED.files+=	-e "s|@VARBASE@|${VARBASE}|g"
-SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 INSTALLATION_DIRS=	${RCDIR}/program ${RCDIR}/skins ${EGDIR}/SQL ${DOCDIR}
 
-.include "options.mk"
 .include "../../mk/apache.mk"
+.include "options.mk"
 
 post-extract:
 	${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
@@ -63,6 +68,7 @@ pre-install:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
 do-install:
+	${INSTALL_DATA_DIR} ${RCDIR}/config
 	${INSTALL_DATA} ${WRKSRC}/roundcube.conf ${EGDIR}/roundcube.conf
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
@@ -72,17 +78,27 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${EGDIR}/SQL/
 
 	${INSTALL_DATA} ${WRKSRC}/.htaccess ${RCDIR}/
-
 	${INSTALL_DATA} ${WRKSRC}/index.php ${RCDIR}/
-
-	${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist ${EGDIR}/db.inc.php
-	${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist ${EGDIR}/main.inc.php
-
-.for i in ${PAX_DIRS}
-	cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i}
-	${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/robots.txt ${RCDIR}/
+
+	${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
+		${EGDIR}/db.inc.php.dist
+	${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
+		${EGDIR}/main.inc.php.dist
+	${INSTALL_DATA} ${WRKSRC}/config/db.inc.php.dist \
+		${RCDIR}/config/db.inc.php.dist
+	${INSTALL_DATA} ${WRKSRC}/config/main.inc.php.dist \
+		${RCDIR}/config/main.inc.php.dist
+
+	${CHMOD} ${PKGDIRMODE} ${RCDIR}/config
+	${CHOWN} ${WWW_USER}:${WWW_GROUP} ${RCDIR}/config
+	${CHOWN} ${WWW_USER}:${WWW_GROUP} ${RCDIR}/config/*.dist
+
+.	for i in ${PAX_DIRS}
+		cd ${WRKSRC}/${i} && ${PAX} -rw . ${RCDIR}/${i}
+		${FIND} ${RCDIR}/${i} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
+		${FIND} ${RCDIR}/${i} -type d | ${XARGS} ${CHMOD} ${PKGDIRMODE}
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${RCDIR}/${i}
+.	endfor
 
 .include "../../mk/bsd.pkg.mk"