Update to 20070508 snapshot. From the changelog:

2007/05/01 (thomasb)
----------
- Updated German, Euskara, Hungarian, Romanian and Spanish translation
- Added Hindi and Kurdish localization

2007/04/28 (thomasb)
----------
- LDAP access is back in address book (closes #1484087)
- Added search function for contacts
- New Template parsing and output encoding
- Fixed bugs #1484119 and #1483978

2007/04/08 (thomasb)
----------
- Fixed message moving procedure (closes #1484308)
- Fixed display of multiple attachments (closes #1466563)
- Fixed check for new messages (closes #1484310)
- List attachments without filename

2007/03/27 (thomasb)
----------
- New session authentication: Change sessid cookie when login, authentication with sessauth cookie is now configurable.
  Should close bugs #1483951 and #1484299

2007/03/23 (thomasb)
----------
- Correctly translate mailbox names (closes #1484276)
- Quote e-mail address links (closes #1484300)

2007/03/21 (thomasb)
----------
- Updated PEAR::Mail_mime package
- Added Persian localization
- Updated Catalan and Brazilian Portuguese translations
- Updated INSTALL manual with a note about database passwords
- Accept single quotes for HTML attributes when modifying message body (thanks Jason)
- Sanitize input for new users/identities (thanks Colin Alston)

2007/03/19 (thomasb)
----------
- Don't download HTML message parts
- Convert HTML parts to plaintext if 'prefer_html' is off
- Correctly parse message/rfc822 parts (closes #1484045)
- Code cleanup

2007/03/18 (thomasb)
----------
- Also use user_id for unique key in messages table (closes #1484074)
- Hide contacts drop down on blur (closes #1484203)
- Make entries in contacts drop down clickable
- Turn off browser autocompletion on login page
- Quote <? in text/html message parts
- Hide border around radio buttons
- Replaced old JS function calls.

2007/03/13 (thomasb)
----------
- Applied patch for attachment download by crichardson (closes #1484198)
- Fixed bug in Postgres DB handling (closes #1484068)
- Fixed bug of invalid calls to fetchRow() in rcube_db.inc (closes #1484280)
- Fixed array_merge bug (closes #1484281)
- Fixed flag for deletion in list view (closes #1484264)
- Finally support semicolons as recipient separator (closes ##1484251)
- Fixed message headers (subject) encoding

pkgsrc changes:
* Make iconv and mbstring dependencies PKG_OPTIONS ("iconv" and "multibyte")
* Write logs and tempfiles under ${VARBASE}, not ${PREFIX}
* Cosmetic and pkglint-appeasing tweaks

1 files changed, 31 insertions, 37 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index e574710ae56..3c6cb44d086 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/04/08 21:25:44 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2007/05/11 11:51:05 schmonz Exp $
 #
 
-#		SVN build 508
-DISTNAME=	roundcube-0.1-20070314
+DISTNAME=	roundcube-0.1-20070508
 PKGNAME=	${DISTNAME:S/-0.1//}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.farrokhi.net/roundcube/
@@ -12,55 +11,56 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://roundcube.net/
 COMMENT=	Browser-based multilingual IMAP client
 
-.include "../../lang/php/phpversion.mk"
-
-DEPENDS+=	${PHP_PKG_PREFIX}-iconv>=4.3.1:../../converters/php-iconv
-DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.1:../../misc/php-mbstring
-
 USE_LANGUAGES=	# none
+NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/roundcubemail
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR?=	httpd
 
-BUILD_DEFS+=	APACHE_USER APACHE_GROUP
+BUILD_DEFS+=	APACHE_USER APACHE_GROUP VARBASE
 RCDIR=		${PREFIX}/share/roundcube
 EGDIR=		${PREFIX}/share/examples/roundcube
 DOCDIR=		${PREFIX}/share/doc/roundcube
 PAX_DIRS=	program skins
 
 MESSAGE_SUBST+=	DOCDIR=${DOCDIR:Q} PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+FILES_SUBST+=	RCDIR=${RCDIR:Q}
 
-CONF_FILES=		${EGDIR}/roundcube.conf ${PKG_SYSCONFDIR}/roundcube.conf
-CONF_FILES_PERMS+=	${EGDIR}/db.inc.php ${RCDIR}/config/db.inc.php \
-			${APACHE_USER} ${APACHE_GROUP} 0440
-CONF_FILES_PERMS+=	${EGDIR}/main.inc.php ${RCDIR}/config/main.inc.php \
-			${APACHE_USER} ${APACHE_GROUP} 0440
+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
+
+CONF_FILES=	${EGDIR}/roundcube.conf ${PKG_SYSCONFDIR}/roundcube.conf
+CONF_FILES_PERMS+=	\
+	${EGDIR}/db.inc.php ${PKG_SYSCONFDIR}/roundcube/db.inc.php \
+		${APACHE_USER} ${APACHE_GROUP} 0440 \
+	${EGDIR}/main.inc.php ${PKG_SYSCONFDIR}/roundcube/main.inc.php \
+		${APACHE_USER} ${APACHE_GROUP} 0440
 
 SUBST_CLASSES+=		files
-SUBST_STAGE.files=	post-build
+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"
 
-do-build:
-	${CP} ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
+post-extract:
+	cp ${FILESDIR}/roundcube.conf ${WRKSRC}/roundcube.conf
 
-do-install:
-	${INSTALL_DATA_DIR} ${RCDIR}
-	${INSTALL_DATA_DIR} ${RCDIR}/config
-	${INSTALL_DATA_DIR} ${RCDIR}/program
-	${INSTALL_DATA_DIR} ${RCDIR}/skins
-	${INSTALL_DATA_DIR} ${RCDIR}/temp
-	${INSTALL_DATA_DIR} ${RCDIR}/logs
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}/SQL
-	${INSTALL_DATA_DIR} ${DOCDIR}
+pre-install:
+	find ${WRKSRC} -name "*.orig" -print | xargs rm -f
 
+do-install:
 	${INSTALL_DATA} ${WRKSRC}/roundcube.conf ${EGDIR}/roundcube.conf
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR}
@@ -70,23 +70,17 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/SQL/*.sql ${EGDIR}/SQL/
 
 	${INSTALL_DATA} ${WRKSRC}/.htaccess ${RCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/config/.htaccess ${RCDIR}/config/
-	${INSTALL_DATA} ${WRKSRC}/temp/.htaccess ${RCDIR}/temp/
-	${INSTALL_DATA} ${WRKSRC}/logs/.htaccess ${RCDIR}/logs/
 
 	${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
 
-	${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${RCDIR}/temp/
-	${CHOWN} ${APACHE_USER}:${APACHE_GROUP} ${RCDIR}/logs/
-
 .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}
+	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"