From tota@rtfm.jp  Sun Jul 25 07:26:16 2004
Return-Path: <tota@rtfm.jp>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C6CF916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Jul 2004 07:26:16 +0000 (GMT)
Received: from mail3.inetd.co.jp (mail3.inetd.co.jp [211.13.206.143])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AA8F743D31
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Jul 2004 07:26:15 +0000 (GMT)
	(envelope-from tota@rtfm.jp)
Received: from photon.rtfm.jp (h219-110-218-065.catv02.itscom.jp [219.110.218.65])
	by mail3.inetd.co.jp (8.11.7/3.7W04072316) with ESMTP id i6P7QDZ65700
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Jul 2004 16:26:13 +0900 (JST)
Received: from photon.rtfm.jp (localhost [127.0.0.1])
	by photon.rtfm.jp (8.12.11/8.12.11) with ESMTP id i6P7PwlE006006
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 25 Jul 2004 16:25:58 +0900 (JST)
	(envelope-from tota@photon.rtfm.jp)
Received: (from root@localhost)
	by photon.rtfm.jp (8.12.11/8.12.11/Submit) id i6P7PwnA006005;
	Sun, 25 Jul 2004 16:25:58 +0900 (JST)
	(envelope-from tota)
Message-Id: <200407250725.i6P7PwnA006005@photon.rtfm.jp>
Date: Sun, 25 Jul 2004 16:25:58 +0900 (JST)
From: TAKATSU Tomonari <tota@rtfm.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] mail/ilohamail: update to cope with the new PHP framework
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         69550
>Category:       ports
>Synopsis:       [MAINTAINER] mail/ilohamail: update to cope with the new PHP framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 25 07:30:20 GMT 2004
>Closed-Date:    Sun Jul 25 15:55:54 GMT 2004
>Last-Modified:  Sun Jul 25 15:55:54 GMT 2004
>Originator:     TAKATSU Tomonari
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
none (personal)
>Environment:
System: FreeBSD photon.rtfm.jp 5.2-CURRENT FreeBSD 5.2-CURRENT #3: Tue Jun 15 06:44:29 JST 2004
>Description:
Update mail/ilohamail to handle the new PHP infrastructure

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

diff -urN ilohamail.orig/Makefile ilohamail/Makefile
--- ilohamail.orig/Makefile	Thu Jul  1 17:51:16 2004
+++ ilohamail/Makefile	Sun Jul 25 16:10:54 2004
@@ -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 @@
 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 @@
 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 -urN ilohamail.orig/pkg-plist ilohamail/pkg-plist
--- ilohamail.orig/pkg-plist	Thu Jul  1 17:51:16 2004
+++ ilohamail/pkg-plist	Sun Jul 25 15:37:05 2004
@@ -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%%

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sun Jul 25 15:55:46 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=69550 
>Unformatted:
