5 files changed, 16 insertions, 21 deletions

diff --git a/www/mod_layout/Makefile b/www/mod_layout/Makefile
index ab63ac4fc353..60d51dae2a7c 100644
--- a/www/mod_layout/Makefile
+++ b/www/mod_layout/Makefile
@@ -6,32 +6,24 @@
 #
 
 PORTNAME=	mod_layout
-PORTVERSION=	2.8.2
+PORTVERSION=	2.10.6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
 		http://www.tangent.org/mod_layout/
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	petef@databits.net
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
-do-build:
-	cd ${WRKSRC} && ${LOCALBASE}/sbin/apxs -c *.c
-
-do-install:
-	cd ${WRKSRC} && ${LOCALBASE}/sbin/apxs -A -i ${PORTNAME}.so
-
-.if !defined(NOPORTDOCS)
-PLIST_SUB+=	DOC=''
+post-patch:
+	@${PERL} -pi -e 's!-i -a -n!-i -A -n!' ${WRKSRC}/Makefile
 
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/*.html \
-		${PREFIX}/share/doc/${PORTNAME}
-
-.else
-PLIST_SUB+=	DOC='@comment '
+	${INSTALL_DATA} ${WRKSRC}/faq.html ${PREFIX}/share/doc/${PORTNAME}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/mod_layout/distinfo b/www/mod_layout/distinfo
index 62740e4d3419..1e2389e10a3e 100644
--- a/www/mod_layout/distinfo
+++ b/www/mod_layout/distinfo
@@ -1 +1 @@
-MD5 (mod_layout-2.8.2.tar.gz) = f786c566c7107e1da63201162489d774
+MD5 (mod_layout-2.10.6.tar.gz) = 2221e35e31388354132bbd20bec44d35
diff --git a/www/mod_layout/pkg-comment b/www/mod_layout/pkg-comment
index 323c0773730f..8196f76ad465 100644
--- a/www/mod_layout/pkg-comment
+++ b/www/mod_layout/pkg-comment
@@ -1 +1 @@
-An Apache module that provides for prepending/appending HTML pages served
+Apache module that provides for prepending/appending served HTML pages
diff --git a/www/mod_layout/pkg-descr b/www/mod_layout/pkg-descr
index b391f8627283..f75b3ed788ed 100644
--- a/www/mod_layout/pkg-descr
+++ b/www/mod_layout/pkg-descr
@@ -13,3 +13,6 @@ From the software's FAQ list:
 	possibilities.
 
 WWW: http://www.tangent.org/mod_layout/
+
+- Pete
+petef@databits.net
diff --git a/www/mod_layout/pkg-plist b/www/mod_layout/pkg-plist
index 6875218c8670..6159e083d955 100644
--- a/www/mod_layout/pkg-plist
+++ b/www/mod_layout/pkg-plist
@@ -1,5 +1,5 @@
 libexec/apache/mod_layout.so
-%%DOC%%share/doc/mod_layout/faq.html
-%%DOC%%@dirrm share/doc/mod_layout
-@exec ${PKG_PREFIX}/sbin/apxs -e -A -n layout mod_layout.so; echo "	enable the mod_layout in Apache's config manually"
-@unexec ${PKG_PREFIX}/sbin/apxs -e -A -n layout mod_layout.so || echo "	remove the mod_layout from Apache's config manually"
+%%PORTDOCS%%share/doc/mod_layout/faq.html
+@exec %D/sbin/apxs -e -A -n layout mod_layout.so
+%%PORTDOCS%%@dirrm share/doc/mod_layout
+@unexec %D/sbin/apxs -e -A -n layout mod_layout.so || echo "	disable mod_layout in Apache's config manually"