- Fix pkg-plist breakage

- Minor port enhancements
- Bump PORTREVISION

Approved by:	farrokhi (maintainer, implicit via miwi)

2 files changed, 10 insertions, 12 deletions

diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 210608c31f26..819cecdfc74f 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	roundcube
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 PORTEPOCH=	1
-CATEGORIES=	mail
+CATEGORIES=	mail www
 MASTER_SITES=	SF/${PORTNAME}mail
 DISTNAME=	${PORTNAME}mail-${PORTVERSION}
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
 
-#WRKSRC=		${WRKDIR}/${PORTNAME}mail
 NO_BUILD=	yes
 
-RCUBECOMP=	SQL bin config index.php logs program skins temp
+RCUBECOMP=	SQL bin config index.php logs program robots.txt skins temp
 PORTDOCS=	CHANGELOG INSTALL LICENSE README UPGRADING
 
 SCRIPTS_ENV=	SHAREOWN=${SHAREOWN} SHAREGRP=${SHAREGRP} \
@@ -62,7 +62,7 @@ USE_PHP+=	sqlite
 .endif
 
 .if defined(WITH_SPELLCHECK)
-USE_PHP+=	openssl sockets
+USE_PHP+=	openssl
 .endif
 
 .if defined(WITH_LOCALCHECK)
@@ -83,7 +83,8 @@ post-patch:
 .if defined(WITH_REPLACE_MAIL_URL)
 	@${REINPLACE_CMD} "s/'mail'/'${MAIL}'/g" ${WRKSRC}/index.php \
 		${WRKSRC}/program/include/main.inc \
-		${WRKSRC}/program/js/app.js
+		${WRKSRC}/program/js/app.js \
+		${WRKSRC}/program/steps/addressbook/mailto.inc
 	@${REINPLACE_CMD} "s/_task=mail/_task=${MAIL}/g" \
 		${WRKSRC}/program/steps/mail/rss.inc
 	@${REINPLACE_CMD} "s/command=\"mail\"/command=\"${MAIL}\"/g" \
@@ -95,8 +96,6 @@ post-patch:
 		${WRKSRC}/skins/default/templates/*.html
 	@${MV} ${WRKSRC}/skins/default/images/buttons/mail.gif \
 		${WRKSRC}/skins/default/images/buttons/${MAIL}.gif
-	@${MV} ${WRKSRC}/skins/default/images/buttons/mail.png \
-		${WRKSRC}/skins/default/images/buttons/${MAIL}.png
 	@${MV} ${WRKSRC}/skins/default/mail.css \
 		${WRKSRC}/skins/default/${MAIL}.css
 	@${MV} ${WRKSRC}/skins/default/templates/mail.html \
diff --git a/mail/roundcube/pkg-plist b/mail/roundcube/pkg-plist
index e4979bc53475..10efd49e2cec 100644
--- a/mail/roundcube/pkg-plist
+++ b/mail/roundcube/pkg-plist
@@ -12,9 +12,7 @@
 %%WWWDIR%%/bin/msgimport
 %%WWWDIR%%/bin/quotaimg.php
 %%WWWDIR%%/config/.htaccess
-%%WWWDIR%%/config/db.inc.php
 %%WWWDIR%%/config/db.inc.php.dist
-%%WWWDIR%%/config/main.inc.php
 %%WWWDIR%%/config/main.inc.php.dist
 %%WWWDIR%%/index.php
 %%WWWDIR%%/logs/.htaccess
@@ -511,6 +509,7 @@
 %%WWWDIR%%/program/steps/settings/manage_folders.inc
 %%WWWDIR%%/program/steps/settings/save_identity.inc
 %%WWWDIR%%/program/steps/settings/save_prefs.inc
+%%WWWDIR%%/robots.txt
 %%WWWDIR%%/skins/default/addresses.css
 %%WWWDIR%%/skins/default/colorpicker.css
 %%WWWDIR%%/skins/default/common.css
@@ -568,7 +567,7 @@
 %%WWWDIR%%/skins/default/images/buttons/ldap_pas.png
 %%WWWDIR%%/skins/default/images/buttons/logout.gif
 %%WWWDIR%%/skins/default/images/buttons/logout.png
-%%WWWDIR%%/skins/default/images/buttons/mail.gif
+%%WWWDIR%%/skins/default/images/buttons/%%MAIL%%.gif
 %%WWWDIR%%/skins/default/images/buttons/mail.png
 %%WWWDIR%%/skins/default/images/buttons/markread_act.png
 %%WWWDIR%%/skins/default/images/buttons/next_act.png
@@ -651,7 +650,7 @@
 %%WWWDIR%%/skins/default/includes/settingscripts.html
 %%WWWDIR%%/skins/default/includes/settingstabs.html
 %%WWWDIR%%/skins/default/includes/taskbar.html
-%%WWWDIR%%/skins/default/mail.css
+%%WWWDIR%%/skins/default/%%MAIL%%.css
 %%WWWDIR%%/skins/default/pngbehavior.htc
 %%WWWDIR%%/skins/default/print.css
 %%WWWDIR%%/skins/default/settings.css
@@ -665,7 +664,7 @@
 %%WWWDIR%%/skins/default/templates/error.html
 %%WWWDIR%%/skins/default/templates/identities.html
 %%WWWDIR%%/skins/default/templates/login.html
-%%WWWDIR%%/skins/default/templates/mail.html
+%%WWWDIR%%/skins/default/templates/%%MAIL%%.html
 %%WWWDIR%%/skins/default/templates/managefolders.html
 %%WWWDIR%%/skins/default/templates/message.html
 %%WWWDIR%%/skins/default/templates/messagepart.html