Add mod_layout2 4.0.1a,

apache2 module to wrap served pages with a
header and/or footer.

PR:		45496
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>

www/Makefile

@@ -211,6 +211,7 @@
     SUBDIR += mod_jk
     SUBDIR += mod_jk2
     SUBDIR += mod_layout
+    SUBDIR += mod_layout2
     SUBDIR += mod_limitipconn
     SUBDIR += mod_log_sql
     SUBDIR += mod_mp3

www/mod_layout2/Makefile

@@ -0,0 +1,29 @@
+# New ports collection makefile for:	mod_layout Apache 2 module
+# Date created:				Nov 15 2002
+# Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mod_layout
+PORTVERSION=	4.0.1a
+CATEGORIES=	www
+MASTER_SITES=	http://software.tangent.org/download/
+
+MAINTAINER=	sheepkiller@cultdeadsheep.org
+COMMENT=	Apache2 module to wrap served pages with a header and/or footer
+
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+
+USE_REINPLACE=	yes
+MAKE_ARGS+=	builddir=${WRKSRC}
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
+.endif
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>

www/mod_layout2/distinfo

@@ -0,0 +1 @@
+MD5 (mod_layout-4.0.1a.tar.gz) = 253c4a2c0f44b788648fc7564f246e87

www/mod_layout2/files/patch-Makefile

@@ -0,0 +1,63 @@
+--- Makefile.orig	Mon Oct 21 19:38:28 2002
++++ Makefile	Sat Nov 16 16:10:44 2002
+@@ -1,17 +1,17 @@
+ ##
+ ##  Makefile -- Build procedure for mod_layout Apache module
+ ##
+-builddir=$(shell pwd)
+-top_srcdir=/usr/local/apache2
+-top_builddir=/usr/local/apache2
+-include /usr/local/apache2/build/special.mk
++#builddir=${WRKSRC}
++top_srcdir=${LOCALBASE}/share/apache2
++top_builddir=${LOCALBASE}/share/apache2
++include ${LOCALBASE}/share/apache2/build/special.mk
+ 
+ #   the used tools
+-APXS=/usr/local/apache2/bin/apxs
++APXS=${LOCALBASE}/sbin/apxs
+ APACHECTL=apachectl
+ CC=`$(APXS) -q CC`
+ INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS`  #-DLAYOUT_FILEOWNER_NAME
+-LD_SHLIB=`apxs -q LDFLAGS_SHLIB`
++LD_SHLIB=`apxs -q LDFLAGS_SHLIB` -lapr -L${LOCALBASE}/apache2
+ VERSION = 4.0.1a
+ DISTNAME = mod_layout
+ DISTVNAME = $(DISTNAME)-$(VERSION)
+@@ -36,7 +36,7 @@
+ # Apache itself won't compile with it this strict
+ #DEF = -Wall -DDEBUG -Wtraditional -Wshadow -Wid-clash-len -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings-Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wlong-long -Winline -Werror
+ #DEF = -Wall -DDEBUG 
+-
++DEF= -L${LOCALBASE}/lib/apache2 -lapr
+ #   the default target
+ all: mod_layout.so
+ 
+@@ -44,8 +44,6 @@
+ #mod_layout.so: $(OBJ)  Makefile
+ mod_layout.so: $(OBJ)
+ 	$(APXS) -o liblayout.la -c $(SOBJ)
+-	#$(APXS) -c -o liblayout $(SOBJ)
+-	#$(APXS) -i -a mod_layout.la
+ 
+ mod_layout.o : mod_layout.c
+ 	$(APXS) -c mod_layout.c 
+@@ -63,17 +61,7 @@
+ 	$(APXS) -c header.c
+ #   install the shared object file into Apache 
+ install: 
+-	$(APXS) -i -n liblayout.so -e liblayout.la
+-	@echo "+--------------------------------------------------------+"; \
+-	echo "| All done.                                              |"; \
+-	echo "|                                                        |"; \
+-	echo "| You will need to add the directive:                    |"; \
+-	echo "| LoadModule layout_module modules/liblayout.so          |"; \
+-	echo "|                                                        |"; \
+-	echo "| So that you can begin to use mod_layout.               |"; \
+-	echo "|                                                        |"; \
+-	echo "| Thanks for installing mod_layout.                      |"; \
+-	echo "+--------------------------------------------------------+"; \
++	$(APXS) -a -i -n liblayout.so -e liblayout.la
+ 
+ rpm: #all dist
+ 	cp $(DISTVNAME).tar$(SUFFIX) /usr/src/redhat/SOURCES

www/mod_layout2/pkg-descr

@@ -0,0 +1,14 @@
+mod_layout is a utility to wrap served webpages. This means it can
+add a footer or 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; Currently this mod_layout version
+is still an alpha version. But it can be used in production 
+environment for people who need Apache 2.0.x.
+THIS VERSION IS ONLY FOR APACHE 2.0.X
+New mod_layout features won't be backported to mod_layout 3.x designed
+for apache 1.3.x.
+See, for more informations :
+WWW: http://software.tangent.org/projects.pl?view=mod_layout

www/mod_layout2/pkg-message

@@ -0,0 +1,9 @@
+-----------------------------------------------------------------
+You have installed mod_layout, a module that can automatically add
+a footer or header to pages served.
+Please Add :
+	LoadModule layout_module libexec/apache2/liblayout.so
+to your httpd.conf.
+
+Please note that this module is an alpha version.
+-----------------------------------------------------------------

www/mod_layout2/pkg-plist

@@ -0,0 +1,6 @@
+libexec/apache2/mod_layout.so
+libexec/apache2/liblayout.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%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%

www/mod_layout22/Makefile

@@ -0,0 +1,29 @@
+# New ports collection makefile for:	mod_layout Apache 2 module
+# Date created:				Nov 15 2002
+# Whom:					Clement Laforet <sheepkiller@cultdeadsheep.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mod_layout
+PORTVERSION=	4.0.1a
+CATEGORIES=	www
+MASTER_SITES=	http://software.tangent.org/download/
+
+MAINTAINER=	sheepkiller@cultdeadsheep.org
+COMMENT=	Apache2 module to wrap served pages with a header and/or footer
+
+BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache2
+
+USE_REINPLACE=	yes
+MAKE_ARGS+=	builddir=${WRKSRC}
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
+.endif
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>

www/mod_layout22/distinfo

@@ -0,0 +1 @@
+MD5 (mod_layout-4.0.1a.tar.gz) = 253c4a2c0f44b788648fc7564f246e87

www/mod_layout22/files/patch-Makefile

@@ -0,0 +1,63 @@
+--- Makefile.orig	Mon Oct 21 19:38:28 2002
++++ Makefile	Sat Nov 16 16:10:44 2002
+@@ -1,17 +1,17 @@
+ ##
+ ##  Makefile -- Build procedure for mod_layout Apache module
+ ##
+-builddir=$(shell pwd)
+-top_srcdir=/usr/local/apache2
+-top_builddir=/usr/local/apache2
+-include /usr/local/apache2/build/special.mk
++#builddir=${WRKSRC}
++top_srcdir=${LOCALBASE}/share/apache2
++top_builddir=${LOCALBASE}/share/apache2
++include ${LOCALBASE}/share/apache2/build/special.mk
+ 
+ #   the used tools
+-APXS=/usr/local/apache2/bin/apxs
++APXS=${LOCALBASE}/sbin/apxs
+ APACHECTL=apachectl
+ CC=`$(APXS) -q CC`
+ INC=-I`$(APXS) -q INCLUDEDIR` `$(APXS) -q CFLAGS`  #-DLAYOUT_FILEOWNER_NAME
+-LD_SHLIB=`apxs -q LDFLAGS_SHLIB`
++LD_SHLIB=`apxs -q LDFLAGS_SHLIB` -lapr -L${LOCALBASE}/apache2
+ VERSION = 4.0.1a
+ DISTNAME = mod_layout
+ DISTVNAME = $(DISTNAME)-$(VERSION)
+@@ -36,7 +36,7 @@
+ # Apache itself won't compile with it this strict
+ #DEF = -Wall -DDEBUG -Wtraditional -Wshadow -Wid-clash-len -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings-Wconversion -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wlong-long -Winline -Werror
+ #DEF = -Wall -DDEBUG 
+-
++DEF= -L${LOCALBASE}/lib/apache2 -lapr
+ #   the default target
+ all: mod_layout.so
+ 
+@@ -44,8 +44,6 @@
+ #mod_layout.so: $(OBJ)  Makefile
+ mod_layout.so: $(OBJ)
+ 	$(APXS) -o liblayout.la -c $(SOBJ)
+-	#$(APXS) -c -o liblayout $(SOBJ)
+-	#$(APXS) -i -a mod_layout.la
+ 
+ mod_layout.o : mod_layout.c
+ 	$(APXS) -c mod_layout.c 
+@@ -63,17 +61,7 @@
+ 	$(APXS) -c header.c
+ #   install the shared object file into Apache 
+ install: 
+-	$(APXS) -i -n liblayout.so -e liblayout.la
+-	@echo "+--------------------------------------------------------+"; \
+-	echo "| All done.                                              |"; \
+-	echo "|                                                        |"; \
+-	echo "| You will need to add the directive:                    |"; \
+-	echo "| LoadModule layout_module modules/liblayout.so          |"; \
+-	echo "|                                                        |"; \
+-	echo "| So that you can begin to use mod_layout.               |"; \
+-	echo "|                                                        |"; \
+-	echo "| Thanks for installing mod_layout.                      |"; \
+-	echo "+--------------------------------------------------------+"; \
++	$(APXS) -a -i -n liblayout.so -e liblayout.la
+ 
+ rpm: #all dist
+ 	cp $(DISTVNAME).tar$(SUFFIX) /usr/src/redhat/SOURCES

www/mod_layout22/pkg-descr

@@ -0,0 +1,14 @@
+mod_layout is a utility to wrap served webpages. This means it can
+add a footer or 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; Currently this mod_layout version
+is still an alpha version. But it can be used in production 
+environment for people who need Apache 2.0.x.
+THIS VERSION IS ONLY FOR APACHE 2.0.X
+New mod_layout features won't be backported to mod_layout 3.x designed
+for apache 1.3.x.
+See, for more informations :
+WWW: http://software.tangent.org/projects.pl?view=mod_layout

www/mod_layout22/pkg-message

@@ -0,0 +1,9 @@
+-----------------------------------------------------------------
+You have installed mod_layout, a module that can automatically add
+a footer or header to pages served.
+Please Add :
+	LoadModule layout_module libexec/apache2/liblayout.so
+to your httpd.conf.
+
+Please note that this module is an alpha version.
+-----------------------------------------------------------------

www/mod_layout22/pkg-plist

@@ -0,0 +1,6 @@
+libexec/apache2/mod_layout.so
+libexec/apache2/liblayout.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%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%