- Cope with new PHP infrastructure

PR:		ports/69550
Submitted by:	TAKATSU Tomonari <tota@rtfm.jp> (maintainer)

2 files changed, 26 insertions, 11 deletions

diff --git a/mail/ilohamail-devel/Makefile b/mail/ilohamail-devel/Makefile
index 60acb893597e..42e3ab4394ba 100644
--- a/mail/ilohamail-devel/Makefile
+++ b/mail/ilohamail-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ilohamail
 PORTVERSION=	0.8.13
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ilohamail
@@ -16,9 +17,16 @@ MAINTAINER=	tota@rtfm.jp
 COMMENT=	IlohaMail is a lightweight multilingual webmail program
 
 NO_BUILD=	yes
-USE_PHP=	yes
+USE_PHP=	pcre
 WANT_PHP_WEB=	yes
 
+.if !defined(WITHOUT_MYSQL)
+USE_PHP+=	mysql
+PLIST_SUB+=	MYSQL=""
+.else
+PLIST_SUB+=	MYSQL="@comment "
+.endif
+
 .if !defined(WITHOUT_WWWDIR)
 ILOHADIR=	${PREFIX}/www/ilohamail
 .else
@@ -28,12 +36,19 @@ ILOHADIR=	${PREFIX}/ilohamail
 PLIST_SUB+=	ILOHADIR="${ILOHADIR:S,^${PREFIX}/,,}"
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "  define WITHOUT_MYSQL: not to use MySQL back-end"
+	@${ECHO_MSG} ""
+
 do-install:
 	@${MKDIR} ${ILOHADIR}
 	${CP} -Rp ${WRKSRC}/IlohaMail/ ${ILOHADIR}
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${ILOHADIR}/data
+.if !defined(WITHOUT_MYSQL)
 	@${MKDIR} ${DATADIR}
 	${CP} -Rp ${WRKSRC}/MySQL ${DATADIR}
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}; ${CP} -Rp INSTALL README RELEASE_NOTES \
diff --git a/mail/ilohamail-devel/pkg-plist b/mail/ilohamail-devel/pkg-plist
index 728587704004..f01b22d2aa0e 100644
--- a/mail/ilohamail-devel/pkg-plist
+++ b/mail/ilohamail-devel/pkg-plist
@@ -9,14 +9,14 @@
 %%PORTDOCS%%%%DOCSDIR%%/THEMES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
-%%DATADIR%%/MySQL/0.7.3.sql
-%%DATADIR%%/MySQL/0.7.5.sql
-%%DATADIR%%/MySQL/0.7.6.sql
-%%DATADIR%%/MySQL/0.7.9.sql
-%%DATADIR%%/MySQL/0.8.0.sql
-%%DATADIR%%/MySQL/0.8.10.sql
-%%DATADIR%%/MySQL/0.8.5.sql
-%%DATADIR%%/MySQL/sql
+%%MYSQL%%%%DATADIR%%/MySQL/0.7.3.sql
+%%MYSQL%%%%DATADIR%%/MySQL/0.7.5.sql
+%%MYSQL%%%%DATADIR%%/MySQL/0.7.6.sql
+%%MYSQL%%%%DATADIR%%/MySQL/0.7.9.sql
+%%MYSQL%%%%DATADIR%%/MySQL/0.8.0.sql
+%%MYSQL%%%%DATADIR%%/MySQL/0.8.10.sql
+%%MYSQL%%%%DATADIR%%/MySQL/0.8.5.sql
+%%MYSQL%%%%DATADIR%%/MySQL/sql
 %%ILOHADIR%%/conf/conf.inc
 %%ILOHADIR%%/conf/custom_auth.inc
 %%ILOHADIR%%/conf/db_conf.php
@@ -827,7 +827,7 @@
 @dirrm %%ILOHADIR%%/data
 @dirrm %%ILOHADIR%%/conf
 @dirrm %%ILOHADIR%%
-@dirrm %%DATADIR%%/MySQL
-@dirrm %%DATADIR%%
+%%MYSQL%%@dirrm %%DATADIR%%/MySQL
+%%MYSQL%%@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%