- use SUB_FILES for pkg-message

- fix plist for -DWITHOUT_MYSQL
- use PORTDOCS, DOCSDIR and DATADIR in plist
- fix plist with -DNOPORTDOCS

Prompted by:	QAT QA run
Approved by:	maintainer timeout on QATMail

3 files changed, 38 insertions, 40 deletions

diff --git a/mail/ilohamail-devel/Makefile b/mail/ilohamail-devel/Makefile
index 162a98df524a..252584fd7e44 100644
--- a/mail/ilohamail-devel/Makefile
+++ b/mail/ilohamail-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ilohamail
 DISTNAME=	IlohaMail-0.9-20050415
 
-MAINTAINER=     craig001@lerwick.hopto.org
+MAINTAINER=	craig001@lerwick.hopto.org
 COMMENT=	IlohaMail is a lightweight webmail program (devel version)
 
 NO_BUILD=	yes
@@ -33,7 +33,8 @@ ILOHADIR=	${PREFIX}/ilohamail-devel
 .endif
 
 PLIST_SUB+=	ILOHADIR="${ILOHADIR:S,^${PREFIX}/,,}"
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES+=	pkg-message
+SUB_LIST+=	ILOHADIR=${ILOHADIR}
 
 pre-everything::
 	@${ECHO_MSG} ""
@@ -56,15 +57,12 @@ do-install:
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}; ${CP} -Rp INSTALL README RELEASE_NOTES \
+	cd ${WRKSRC} && \
+		${CP} -Rp INSTALL README RELEASE_NOTES \
 		THEMES TODO UPGRADING Manual ${DOCSDIR}
 .endif
 
 post-install:
-	@${SED} -e 's|%%ILOHADIR%%|${ILOHADIR}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|g' \
-		-e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
-		< ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${ILOHADIR}/data
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/mail/ilohamail-devel/pkg-message b/mail/ilohamail-devel/files/pkg-message.in
index 0b3e1783c54b..0b3e1783c54b 100644
--- a/mail/ilohamail-devel/pkg-message
+++ b/mail/ilohamail-devel/files/pkg-message.in
diff --git a/mail/ilohamail-devel/pkg-plist b/mail/ilohamail-devel/pkg-plist
index 7f03bb41e450..6ef50aed261a 100644
--- a/mail/ilohamail-devel/pkg-plist
+++ b/mail/ilohamail-devel/pkg-plist
@@ -1,30 +1,30 @@
-share/doc/ilohamail-devel/INSTALL
-share/doc/ilohamail-devel/Manual/CVS/Entries
-share/doc/ilohamail-devel/Manual/CVS/Repository
-share/doc/ilohamail-devel/Manual/CVS/Root
-share/doc/ilohamail-devel/Manual/configure.MySQL.html
-share/doc/ilohamail-devel/Manual/configure.html
-share/doc/ilohamail-devel/Manual/configure.php.html
-share/doc/ilohamail-devel/Manual/custom.smtp.html
-share/doc/ilohamail-devel/Manual/install.html
-share/doc/ilohamail-devel/Manual/key_controls.txt
-share/doc/ilohamail-devel/README
-share/doc/ilohamail-devel/RELEASE_NOTES
-share/doc/ilohamail-devel/THEMES
-share/doc/ilohamail-devel/TODO
-share/doc/ilohamail-devel/UPGRADING
-share/ilohamail-devel/MySQL/0.7.3.sql
-share/ilohamail-devel/MySQL/0.7.5.sql
-share/ilohamail-devel/MySQL/0.7.6.sql
-share/ilohamail-devel/MySQL/0.7.9.sql
-share/ilohamail-devel/MySQL/0.8.0.sql
-share/ilohamail-devel/MySQL/0.8.10.sql
-share/ilohamail-devel/MySQL/0.8.5.sql
-share/ilohamail-devel/MySQL/0.9.0.sql
-share/ilohamail-devel/MySQL/CVS/Entries
-share/ilohamail-devel/MySQL/CVS/Repository
-share/ilohamail-devel/MySQL/CVS/Root
-share/ilohamail-devel/MySQL/sql
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/Manual/CVS/Entries
+%%PORTDOCS%%%%DOCSDIR%%/Manual/CVS/Repository
+%%PORTDOCS%%%%DOCSDIR%%/Manual/CVS/Root
+%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.MySQL.html
+%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.html
+%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.php.html
+%%PORTDOCS%%%%DOCSDIR%%/Manual/custom.smtp.html
+%%PORTDOCS%%%%DOCSDIR%%/Manual/install.html
+%%PORTDOCS%%%%DOCSDIR%%/Manual/key_controls.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/THEMES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
+%%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/0.9.0.sql
+%%MYSQL%%%%DATADIR%%/MySQL/CVS/Entries
+%%MYSQL%%%%DATADIR%%/MySQL/CVS/Repository
+%%MYSQL%%%%DATADIR%%/MySQL/CVS/Root
+%%MYSQL%%%%DATADIR%%/MySQL/sql
 www/ilohamail-devel/CVS/Entries
 www/ilohamail-devel/CVS/Repository
 www/ilohamail-devel/CVS/Root
@@ -1244,9 +1244,9 @@ www/ilohamail-devel/source/view.php
 @dirrm www/ilohamail-devel/conf
 @dirrm www/ilohamail-devel/CVS
 @dirrm www/ilohamail-devel
-@dirrm share/ilohamail-devel/MySQL/CVS
-@dirrm share/ilohamail-devel/MySQL
-@dirrm share/ilohamail-devel
-@dirrm share/doc/ilohamail-devel/Manual/CVS
-@dirrm share/doc/ilohamail-devel/Manual
-@dirrm share/doc/ilohamail-devel
+%%MYSQL%%@dirrm %%DATADIR%%/MySQL/CVS
+%%MYSQL%%@dirrm %%DATADIR%%/MySQL
+%%MYSQL%%@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Manual/CVS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/Manual
+%%PORTDOCS%%@dirrm %%DOCSDIR%%