- Fix for Roundcube >=0.9.0

- STAGE support

Approved by:	crees (mentor)

2 files changed, 25 insertions, 27 deletions

diff --git a/mail/roundcube-veximaccountadmin/Makefile b/mail/roundcube-veximaccountadmin/Makefile
index 63274db8cc0a..d65aba0e0d8a 100644
--- a/mail/roundcube-veximaccountadmin/Makefile
+++ b/mail/roundcube-veximaccountadmin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	veximaccountadmin
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://axel.sjostedt.no/misc/files/
 PKGNAMEPREFIX=	roundcube-
@@ -14,26 +14,22 @@ COMMENT=	Roundcube vexim account admin plugin
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	roundcube>=0.5:${PORTSDIR}/mail/roundcube
+RUN_DEPENDS=	roundcube>=0.9:${PORTSDIR}/mail/roundcube
 
 NO_BUILD=	yes
 
-WWWDIR=		${PREFIX}/www/roundcube/plugins/veximaccountadmin
+PLIST_SUB+=	PLUGINDIR="${PLUGINDIR}"
+WWWDIR=		${PREFIX}/www/roundcube
+PLUGINDIR=	${WWWDIR}/plugins/${PORTNAME}
 WRKSRC=		${WRKDIR}/veximaccountadmin
+REINPLACE_ARGS=-i ''
 
-# This target is only meant to be used by the port maintainer.
-x-generate-plist: build
-	cd ${WRKSRC}; \
-	${FIND} . ! -type d ! -name '*.orig' | ${SORT} | \
-		${SED} -e "s,^\.,%%WWWDIR%%," >${.CURDIR}/pkg-plist.tmp ; \
-	${FIND} . -type d | ${SORT} -r | ${SED} \
-		-e "s,^\.$$,@dirrmtry %%WWWDIR%%," \
-		-e "s,^\.,@dirrm %%WWWDIR%%," >>${.CURDIR}/pkg-plist.tmp
+post-patch:
+	@${REINPLACE_CMD} -e 's/new rcube_mdb2/new rcube_db/g' ${WRKSRC}/veximaccountadmin.php
 
-NO_STAGE=	yes
 do-install:
-	@${ECHO} "Installing in ${WWWDIR}"
-	${MKDIR} ${WWWDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${WWWDIR}
+	@${ECHO} "Installing in ${PLUGINDIR}"
+	${MKDIR} ${STAGEDIR}/${PLUGINDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${PLUGINDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-veximaccountadmin/pkg-plist b/mail/roundcube-veximaccountadmin/pkg-plist
index 8ad293eb1f1c..a16549b86e74 100644
--- a/mail/roundcube-veximaccountadmin/pkg-plist
+++ b/mail/roundcube-veximaccountadmin/pkg-plist
@@ -1,13 +1,15 @@
-%%WWWDIR%%/CHANGELOG
-%%WWWDIR%%/LICENSE
-%%WWWDIR%%/README
-%%WWWDIR%%/config.inc.php.dist
-%%WWWDIR%%/delete.png
-%%WWWDIR%%/localization/en_US.inc
-%%WWWDIR%%/localization/fr_FR.inc
-%%WWWDIR%%/localization/nb_NO.inc
-%%WWWDIR%%/veximaccountadmin.css
-%%WWWDIR%%/veximaccountadmin.js
-%%WWWDIR%%/veximaccountadmin.php
-@dirrm %%WWWDIR%%/localization
+%%PLUGINDIR%%/CHANGELOG
+%%PLUGINDIR%%/LICENSE
+%%PLUGINDIR%%/README
+%%PLUGINDIR%%/config.inc.php.dist
+%%PLUGINDIR%%/delete.png
+%%PLUGINDIR%%/localization/en_US.inc
+%%PLUGINDIR%%/localization/fr_FR.inc
+%%PLUGINDIR%%/localization/nb_NO.inc
+%%PLUGINDIR%%/veximaccountadmin.css
+%%PLUGINDIR%%/veximaccountadmin.js
+%%PLUGINDIR%%/veximaccountadmin.php
+@dirrmtry %%PLUGINDIR%%/localization
+@dirrmtry %%PLUGINDIR%%
+@dirrmtry %%WWWDIR%%/plugins
 @dirrmtry %%WWWDIR%%