svn commit: r329353 - head/mail/roundcube-veximaccountadmin

[Mark Felder]

Author: feld
Date: Fri Oct  4 18:09:26 2013
New Revision: 329353
URL: http://svnweb.freebsd.org/changeset/ports/329353

Log:
  - Fix for Roundcube >=0.9.0
  - STAGE support
  
  Approved by:	crees (mentor)

Modified:
  head/mail/roundcube-veximaccountadmin/Makefile
  head/mail/roundcube-veximaccountadmin/pkg-plist

Modified: head/mail/roundcube-veximaccountadmin/Makefile
==============================================================================
--- head/mail/roundcube-veximaccountadmin/Makefile	Fri Oct  4 18:07:51 2013	(r329352)
+++ head/mail/roundcube-veximaccountadmin/Makefile	Fri Oct  4 18:09:26 2013	(r329353)
@@ -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 p
 
 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,^\.$$, at dirrmtry %%WWWDIR%%," \
-		-e "s,^\., at 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>

Modified: head/mail/roundcube-veximaccountadmin/pkg-plist
==============================================================================
--- head/mail/roundcube-veximaccountadmin/pkg-plist	Fri Oct  4 18:07:51 2013	(r329352)
+++ head/mail/roundcube-veximaccountadmin/pkg-plist	Fri Oct  4 18:09:26 2013	(r329353)
@@ -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
- at 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
+ at dirrmtry %%PLUGINDIR%%/localization
+ at dirrmtry %%PLUGINDIR%%
+ at dirrmtry %%WWWDIR%%/plugins
 @dirrmtry %%WWWDIR%%