2 files changed, 28 insertions, 18 deletions

diff --git a/security/maia/Makefile b/security/maia/Makefile
index 170c3ffe858a..c8d29b08be0e 100644
--- a/security/maia/Makefile
+++ b/security/maia/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	maia
 PORTVERSION=	1.0.2a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.purplehat.org/downloads/maia/
 
@@ -34,6 +34,8 @@ USE_PERL5_RUN=	5.8.2+
 
 NO_BUILD=	yes
 
+DOCS=	LICENSE README amavisd.conf.dist maia-mysql.sql maia-pgsql.sql maia.conf.dist
+
 MAIAUSER?=	vscan
 MAIAGROUP?=	vscan
 MAIADIR?=	/var/amavisd
@@ -208,6 +210,7 @@ post-patch:
 .endfor
 
 pre-install:
+	${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
 
 do-install:
@@ -219,8 +222,8 @@ do-install:
 .for i in amavisd-maia
 	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/sbin
 .endfor
-	${INSTALL_SCRIPT} -m 640 ${WRKSRC}/amavisd.conf.dist ${PREFIX}/etc/amavisd.conf-dist
-	${INSTALL_SCRIPT} -m 640 ${WRKSRC}/maia.conf.dist ${PREFIX}/etc/maia.conf-dist
+	${INSTALL_SCRIPT} -m 640 ${WRKSRC}/amavisd.conf.dist ${PREFIX}/etc/amavisd.conf.dist
+	${INSTALL_SCRIPT} -m 640 ${WRKSRC}/maia.conf.dist ${PREFIX}/etc/maia.conf.dist
 #
 #  This can contain sensitive information, e.g. SQL passwords, so it should be handled
 #  with care.
@@ -229,15 +232,17 @@ do-install:
 	${INSTALL} -o ${WWWOWN} -g ${WWWGRP} -m 640 ${WRKSRC}/php/config.php.dist \
 		${PREFIX}/www/${PORTNAME}/config.php
 .endif
-
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
 post-install:
-	@cd ${FILESDIR} && ${CP} .placeholder ${WWWDIR}/themes/ocean_surf/compiled/ \
-	&& ${CP} .placeholder ${WWWDIR}/themes/dgm/compiled/ \
-	&& ${CP} .placeholder ${WWWDIR}/themes/desert_sand/compiled/
 	@if [ ! -f ${PREFIX}/etc/amavisd.conf ]; then \
-        ${CP} -p ${PREFIX}/etc/amavisd.conf-dist ${PREFIX}/etc/amavisd.conf ; fi
+	${CP} -p ${PREFIX}/etc/amavisd.conf.dist ${PREFIX}/etc/amavisd.conf ; fi
 	@if [ ! -f ${PREFIX}/etc/maia.conf ]; then \
-        ${CP} -p ${PREFIX}/etc/maia.conf-dist ${PREFIX}/etc/maia.conf ; fi
+	${CP} -p ${PREFIX}/etc/maia.conf.dist ${PREFIX}/etc/maia.conf ; fi
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 	@${CHOWN} -R ${MAIAUSER}:${MAIAGROUP} ${MAIADIR}/
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
diff --git a/security/maia/pkg-plist b/security/maia/pkg-plist
index 1e5aec494906..419f3aafc387 100644
--- a/security/maia/pkg-plist
+++ b/security/maia/pkg-plist
@@ -1,10 +1,16 @@
-@unexec if cmp -s %D/etc/amavisd.conf-dist %D/etc/amavisd.conf; then rm -f %D/etc/amavisd.conf; fi
-etc/amavisd.conf-dist
+@unexec if cmp -s %D/etc/amavisd.conf.dist %D/etc/amavisd.conf; then rm -f %D/etc/amavisd.conf; fi
+etc/amavisd.conf.dist
 @exec if [ ! -f %D/etc/amavisd.conf ] ; then cp -p %D/%F %B/amavisd.conf; fi
-@unexec if cmp -s %D/etc/maia.conf-dist %D/etc/maia.conf; then rm -f %D/etc/maia.conf; fi
-etc/maia.conf-dist
+@unexec if cmp -s %D/etc/maia.conf.dist %D/etc/maia.conf; then rm -f %D/etc/maia.conf; fi
+etc/maia.conf.dist
 @exec if [ ! -f %D/etc/maia.conf ] ; then cp -p %D/%F %B/maia.conf; fi
 sbin/amavisd-maia
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/amavisd.conf.dist
+%%PORTDOCS%%%%DOCSDIR%%/maia-mysql.sql
+%%PORTDOCS%%%%DOCSDIR%%/maia-pgsql.sql
+%%PORTDOCS%%%%DOCSDIR%%/maia.conf.dist
 %%WWWDIR%%/admin/configtest.php
 %%WWWDIR%%/admin/dblib.php
 %%WWWDIR%%/admin/schema.php
@@ -34,8 +40,9 @@ sbin/amavisd-maia
 %%WWWDIR%%/chart_rules.php
 %%WWWDIR%%/chart_stats.php
 %%WWWDIR%%/chart_virus.php
-%%WWWDIR%%/config.php
+@unexec if cmp -s %D/www/maia/config.php.dist %D/www/maia/config.php; then rm -f %D/www/maia/config.php; fi
 %%WWWDIR%%/config.php.dist
+@exec if [ ! -f %D/www/maia/config.php ] ; then cp -p %D/%F %B/config.php; fi
 %%WWWDIR%%/confirm.php
 %%WWWDIR%%/constants.php
 %%WWWDIR%%/core.php
@@ -130,7 +137,6 @@ sbin/amavisd-maia
 %%WWWDIR%%/smtp.php
 %%WWWDIR%%/stats.php
 %%WWWDIR%%/themes/desert_sand/code/smarty.php
-%%WWWDIR%%/themes/desert_sand/compiled/.placeholder
 %%WWWDIR%%/themes/desert_sand/css/style.css
 %%WWWDIR%%/themes/desert_sand/images/admin-int.png
 %%WWWDIR%%/themes/desert_sand/images/bad-header.png
@@ -199,7 +205,6 @@ sbin/amavisd-maia
 %%WWWDIR%%/themes/dgm/code/function.text_config_row.php
 %%WWWDIR%%/themes/dgm/code/list-cache.js
 %%WWWDIR%%/themes/dgm/code/smarty.php
-%%WWWDIR%%/themes/dgm/compiled/.placeholder
 %%WWWDIR%%/themes/dgm/css/cache_buttons.css
 %%WWWDIR%%/themes/dgm/css/color.css
 %%WWWDIR%%/themes/dgm/css/config.css
@@ -289,7 +294,6 @@ sbin/amavisd-maia
 %%WWWDIR%%/themes/dgm/templates/xdomainsettings.tpl
 %%WWWDIR%%/themes/dgm/templates/xlogin.tpl
 %%WWWDIR%%/themes/ocean_surf/css/style.css
-%%WWWDIR%%/themes/ocean_surf/compiled/.placeholder
 %%WWWDIR%%/themes/ocean_surf/images/admin-int.png
 %%WWWDIR%%/themes/ocean_surf/images/bad-header.png
 %%WWWDIR%%/themes/ocean_surf/images/banned-file.png
@@ -394,4 +398,5 @@ sbin/amavisd-maia
 @dirrm %%WWWDIR%%/images
 @dirrm %%WWWDIR%%/admin/scripts
 @dirrm %%WWWDIR%%/admin
-@dirrm %%WWWDIR%%
+@dirrmtry %%WWWDIR%%
+@dirrm %%PORTDOCS%%%%DOCSDIR%%