o Update to 3.0

o Support NOPORTDOCS and deploy DOCSDIR
o Update COMMENT, DESCR, PKGMESSAGE and WWW tag
o Clean up installation (enable httpd.conf stuff by default)
o Install better documentation

PR:		29254
Submitted by:	maintainer

6 files changed, 57 insertions, 33 deletions

diff --git a/www/mod_layout/Makefile b/www/mod_layout/Makefile
index 388d09d5b1e5..8e3528501173 100644
--- a/www/mod_layout/Makefile
+++ b/www/mod_layout/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	mod_layout
-PORTVERSION=	2.10.6
-PORTREVISION=	1
+PORTVERSION=	3.0
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.tangent.org/pub/apache/ \
-		http://www.tangent.org/mod_layout/
+		http://software.tangent.org/download/
 
 MAINTAINER=	petef@databits.net
 
@@ -20,13 +19,14 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 MAKE_ENV=	APXS=${LOCALBASE}/sbin/apxs
 
 post-patch:
-	@${PERL} -pi -e 's!-i -a -n!-i -A -n!; s!APXS=apxs!APXS?=apxs!' \
+	@${PERL} -pi -e 's!APXS=apxs!APXS?=apxs!' \
 		${WRKSRC}/Makefile
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/faq.html ${PREFIX}/share/doc/${PORTNAME}
+	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/directives
+	${INSTALL_DATA} ${WRKSRC}/faq.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/directives/* ${DOCSDIR}/directives
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/www/mod_layout/distinfo b/www/mod_layout/distinfo
index 1e2389e10a3e..298e5597ed49 100644
--- a/www/mod_layout/distinfo
+++ b/www/mod_layout/distinfo
@@ -1 +1 @@
-MD5 (mod_layout-2.10.6.tar.gz) = 2221e35e31388354132bbd20bec44d35
+MD5 (mod_layout-3.0.tar.gz) = 4a3ff812549636d2411f8f31abd78426
diff --git a/www/mod_layout/pkg-comment b/www/mod_layout/pkg-comment
index 8196f76ad465..96e186896fc2 100644
--- a/www/mod_layout/pkg-comment
+++ b/www/mod_layout/pkg-comment
@@ -1 +1 @@
-Apache module that provides for prepending/appending served HTML pages
+Apache module to wrap served pages with a header and/or footer
diff --git a/www/mod_layout/pkg-descr b/www/mod_layout/pkg-descr
index f75b3ed788ed..9de7f17673d8 100644
--- a/www/mod_layout/pkg-descr
+++ b/www/mod_layout/pkg-descr
@@ -1,18 +1,13 @@
-From the software's FAQ list:
-	So what is Mod Layout?
+mod_layout is a utility to wrap served webpages. This means it can
+add a footer ot header to a document. This allows you to create a
+standard look and feel throughout a website without using SSI.
+Some example uses are adding standard disclaimers to the bottom of
+all pages, banner ads to the top of all pages, or even a menu at
+the beginning of a page. There are many other per-document settings
+you can modify with mod_layout; see the file 'faq.html' for more
+information.
 
-	Mod layout wraps a page, by saying this I mean that it can place
-	information at both the beginning and the end of a document. This
-	allows you do create a single look and feel throughout a website
-	without using server side includes to "automagically" add content
-	in either of these two locations. You can use it to add standard
-	disclaimers to all of the pages on a server or to place banner
-	adds on the top of all pages (I know, banner adds, ick...). I've
-	even seen people use the header and footer to place the entire
-	contents of a given server inside of tables. There are many
-	possibilities.
-
-WWW: http://www.tangent.org/mod_layout/
+WWW: http://software.tangent.org/projects.pl?view=mod_layout
 
 - Pete
 petef@databits.net
diff --git a/www/mod_layout/pkg-message b/www/mod_layout/pkg-message
index 332e936946e1..3aedee2a66f7 100644
--- a/www/mod_layout/pkg-message
+++ b/www/mod_layout/pkg-message
@@ -1,12 +1,7 @@
-
 -----------------------------------------------------------------
-You have installed mod_layout, a module that can automatically
-prepend/append HTML pages served.  To enable this module, edit
-${PREFIX}/etc/apache/httpd.conf and look for the line:
-
-#LoadModule layout_module      libexec/apache/mod_layout.so
+You have installed mod_layout, a module that can automatically add
+a footer or header to pages served.
 
-Remove the hash mark from the beginning of the line and run
-${PREFIX}/sbin/apachectl restart to enable this module.  Please
-see ${PREFIX}/share/doc/mod_layout for more details.
+Please see ${PREFIX}/share/doc/mod_layout/faq.html for details on
+using this module.
 -----------------------------------------------------------------
diff --git a/www/mod_layout/pkg-plist b/www/mod_layout/pkg-plist
index 6159e083d955..cb4205c426e0 100644
--- a/www/mod_layout/pkg-plist
+++ b/www/mod_layout/pkg-plist
@@ -1,5 +1,39 @@
 libexec/apache/mod_layout.so
+@exec %D/sbin/apxs -e -a -n layout %D/%f
+@unexec echo "===>  If you do not plan on reinstalling mod_layout, you must manually remove"; echo "===>  references to it in httpd.conf."
 %%PORTDOCS%%share/doc/mod_layout/faq.html
-@exec %D/sbin/apxs -e -A -n layout mod_layout.so
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutCache.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutCacheNeeded.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutComment.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutDefaultHandlers.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutDisplayOriginal.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutFooter.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutFooterFile.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutFooterOff.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutFooterTXT.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHTTPHeader.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHTTPHeaderOff.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHTTPOverrideHandler.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHTTPOverrideURI.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHandler.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHandlerGlob.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHeader.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHeaderFile.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHeaderOff.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutHeaderTXT.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutIgnoreFooterURI.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutIgnoreHeaderURI.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutIgnoreTag.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutIgnoreTagFooter.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutIgnoreTagHeader.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutIgnoreURI.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutMerge.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutMergeBeginTag.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutMergeEndTag.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutMergeErrorIgnore.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutPostAsync.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutProxy.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutReplaceTags.html
+%%PORTDOCS%%share/doc/mod_layout/directives/LayoutTimeFormat.html
+%%PORTDOCS%%@dirrm share/doc/mod_layout/directives
 %%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"