- Revert last commit, this port cannot use AP_FAST_BUILD (leads to runtime

  failure)

Feature safe:	yes

3 files changed, 25 insertions, 6 deletions

diff --git a/www/mod_layout22/Makefile b/www/mod_layout22/Makefile
index e7a29ce85663..f872dcba2371 100644
--- a/www/mod_layout22/Makefile
+++ b/www/mod_layout22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mod_layout
 PORTVERSION=	5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	http://download.tangent.org/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
@@ -17,15 +17,14 @@ COMMENT=	Apache2.2 module to wrap served pages with a header and/or footer
 
 MAKE_JOBS_SAFE=	yes
 
-LATEST_LINK=	mod_layout22
-CONFLICTS=  mod_layout-3.* mod_layout-4.*
+CONFLICTS=	mod_layout-3.* mod_layout-4.*
+
 PORTSCOUT=	limit:^5
 
 USE_APACHE=	22
-AP_FAST_BUILD=	yes
-AP_GENPLIST=	yes
+LATEST_LINK=	mod_layout22
 
-PORTDOCS=	README
+MAKE_ARGS+=	builddir=${WRKSRC}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/www/mod_layout22/files/patch-Makefile b/www/mod_layout22/files/patch-Makefile
new file mode 100644
index 000000000000..adabd148898e
--- /dev/null
+++ b/www/mod_layout22/files/patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig	2007-02-21 22:29:07.000000000 +0100
++++ Makefile	2008-08-31 21:53:05.000000000 +0200
+@@ -1,10 +1,10 @@
+ ##
+ ##  Makefile -- Build procedure for mod_layout Apache module
+ ##
+-builddir=$(shell pwd)
++#builddir=$(shell pwd)
+ 
+ #   the used tools
+-APXS=apxs
++APXS=${LOCALBASE}/sbin/apxs
+ APACHECTL=apachectl
+ CC=`$(APXS) -q CC`
+ INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS`  #-DLAYOUT_FILEOWNER_NAME
diff --git a/www/mod_layout22/pkg-plist b/www/mod_layout22/pkg-plist
new file mode 100644
index 000000000000..614c127180cd
--- /dev/null
+++ b/www/mod_layout22/pkg-plist
@@ -0,0 +1,5 @@
+%%APACHEMODDIR%%/%%AP_MODULE%%
+@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %D/%F
+@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%