Hi Porters,
following Marc Espie's recent addition of apache-module.port.mk i
converted all apache ports in the tree to use MODULES+=apache-module.

The diffs attached to this mail have noone respectively all recipients
of this mail as maintainer...  test, comments and oks are needed to get
this done.

Regards,
Simon
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_auth_bsd/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile    21 Feb 2007 20:26:33 -0000      1.5
+++ Makefile    20 Jun 2007 21:35:36 -0000
@@ -4,13 +4,15 @@ COMMENT=      "provides HTTP Basic authentica
 
 VERSION=       0.8.2
 DISTNAME=      bsdauth-${VERSION}
-PKGNAME=       mod_auth_bsd-${VERSION}
+PKGNAME=       mod_auth_bsd-${VERSION}p0
 EXTRACT_SUFX=  .tgz
 CATEGORIES=    www
 MASTER_SITES=  http://www.25thandclement.com/~william/projects/releases/
 
 HOMEPAGE=      http://www.25thandclement.com/~william/projects/bsdauth.html
 
+MODULES+=      apache-module
+
 # ISC-like
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
@@ -18,18 +20,17 @@ PERMIT_PACKAGE_CDROM=       Yes
 PERMIT_PACKAGE_FTP=    Yes
 WANTLIB=               event
 
+MODAPACHE_NAME=                auth_bsd
+
 NO_REGRESS=    Yes
 
 post-build:
-       @sed 's,_PREFIX_,${PREFIX},' \
-               < ${FILESDIR}/mod_auth_bsd-enable \
-               > ${WRKBUILD}/mod_auth_bsd-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_auth_bsd
        ${INSTALL_DATA} ${WRKSRC}/INSTALL \
                ${PREFIX}/share/doc/mod_auth_bsd/README
-       ${INSTALL_DATA} ${WRKBUILD}/mod_auth_bsd.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_auth_bsd-enable ${PREFIX}/sbin
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_auth_bsd-enable
===================================================================
RCS file: /cvs/ports/www/mod_auth_bsd/files/mod_auth_bsd-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_auth_bsd-enable
--- files/mod_auth_bsd-enable   11 Jul 2004 06:54:50 -0000      1.1.1.1
+++ files/mod_auth_bsd-enable   20 Jun 2007 21:35:36 -0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-#      $OpenBSD: mod_auth_bsd-enable,v 1.1.1.1 2004/07/11 06:54:50 jolan Exp $
-
-MODULE=_PREFIX_/lib/mod_auth_bsd.so
-
-if [ `id -u` -ne 0 ]; then
-    echo "You must be root to run this script."
-    exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-    echo "Cannot find auth_bsd module (${MODULE})"
-    exit 1
-else
-    echo "Enabling BSD Authentication module..."
-    /usr/sbin/apxs -i -a -n bsd_auth ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_auth_bsd/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 18:59:33 -0000      1.2
+++ pkg/MESSAGE 20 Jun 2007 21:35:36 -0000
@@ -1,7 +1,7 @@
 To finish the install of mod_auth_bsd, you need
 to enable the module using the following command:
 
-# ${PREFIX}/sbin/mod_auth_bsd-enable
+# ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_auth_bsd/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   11 Jan 2006 08:20:26 -0000      1.4
+++ pkg/PLIST   20 Jun 2007 21:35:36 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.4 2006/01/11 08:20:26 jolan Exp $
-lib/mod_auth_bsd.so
-sbin/mod_auth_bsd-enable
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_auth_bsd/
 share/doc/mod_auth_bsd/README
[EMAIL PROTECTED] /usr/lib/apache/modules/mod_auth_bsd.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_auth_radius/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile    12 Nov 2006 23:28:42 -0000      1.14
+++ Makefile    20 Jun 2007 21:35:38 -0000
@@ -5,8 +5,9 @@
 SHARED_ONLY=   Yes
 
 DISTNAME=      mod_auth_radius-1.5.7
-PKGNAME=       ${DISTNAME}p2
+PKGNAME=       ${DISTNAME}p3
 CATEGORIES=    www
+MODULES+=      apache-module
 
 # Apache
 PERMIT_PACKAGE_CDROM=  Yes
@@ -19,23 +20,22 @@ HOMEPAGE=   http://www.freeradius.org/mod_
 MASTER_SITES=  ftp://ftp.freeradius.org/pub/radius/
 EXTRACT_SUFX=  .tar
 
+MODAPACHE_NAME=        auth_radius
+
 NO_REGRESS=    Yes
 
 WRKDIST=       ${WRKDIR}/${DISTNAME}
 
 do-build:
        @cd ${WRKSRC}; /usr/sbin/apxs -c mod_auth_radius.c
-       @sed 's,!!PREFIX!!,${PREFIX},' \
-               < ${FILESDIR}/mod_auth_radius-enable \
-               > ${WRKBUILD}/mod_auth_radius-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_auth_radius
-       ${INSTALL_DATA} ${WRKSRC}/mod_auth_radius.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_auth_radius-enable ${PREFIX}/sbin
        ${INSTALL_DATA} ${WRKSRC}/httpd.conf \
                ${PREFIX}/share/examples/mod_auth_radius/httpd.conf-example
        ${INSTALL_DATA} ${WRKSRC}/htaccess \
                ${PREFIX}/share/examples/mod_auth_radius/htaccess-example
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_auth_radius-enable
===================================================================
RCS file: /cvs/ports/www/mod_auth_radius/files/mod_auth_radius-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_auth_radius-enable
--- files/mod_auth_radius-enable        1 Sep 2001 15:26:13 -0000       1.1.1.1
+++ files/mod_auth_radius-enable        20 Jun 2007 21:35:38 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_auth_radius-enable,v 1.1.1.1 2001/09/01 15:26:13 jcs Exp $
-
-MODULE=!!PREFIX!!/lib/mod_auth_radius.so
-
-if [ `id -u` -ne 0 ]; then
-    echo "You must be root to run this script."
-    exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-    echo "Cannot find mod_auth_radius module (${MODULE})"
-    exit 1
-else
-    echo "Enabling RADIUS Authentication module..."
-    /usr/sbin/apxs -i -a -n radius_auth ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_auth_radius/pkg/MESSAGE,v
retrieving revision 1.3
diff -u -p -r1.3 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 18:59:33 -0000      1.3
+++ pkg/MESSAGE 20 Jun 2007 21:35:38 -0000
@@ -1,7 +1,7 @@
 To finish the install of mod_auth_radius, you need
 to enable the module using the following command
 
-  ${PREFIX}/sbin/mod_auth_radius-enable
+  ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 Also, copy the following file into your Apache config:
 ${PREFIX}/share/examples/mod_auth_radius/httpd.conf-example
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_auth_radius/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   7 Feb 2005 12:11:09 -0000       1.3
+++ pkg/PLIST   20 Jun 2007 21:35:38 -0000
@@ -1,7 +1,8 @@
 @comment $OpenBSD: PLIST,v 1.3 2005/02/07 12:11:09 alek Exp $
-lib/mod_auth_radius.so
-sbin/mod_auth_radius-enable
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/examples/mod_auth_radius/
 share/examples/mod_auth_radius/htaccess-example
 share/examples/mod_auth_radius/httpd.conf-example
[EMAIL PROTECTED] rm -f /usr/lib/apache/modules/mod_auth_radius.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_geoip/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile    2 Nov 2006 07:03:29 -0000       1.7
+++ Makefile    20 Jun 2007 21:35:41 -0000
@@ -7,18 +7,22 @@ COMMENT=      "Apache module for finding the 
 SHARED_ONLY=   Yes
 
 DISTNAME=      mod_geoip_1.2.6
-PKGNAME=       mod_geoip-1.2.6p0
+PKGNAME=       mod_geoip-1.2.6p1
 CATEGORIES=    www geo
 
 HOMEPAGE=      http://www.maxmind.com/app/mod_geoip
 MASTER_SITES=  http://www.maxmind.com/download/geoip/api/mod_geoip/
 
+MODULES+=      apache-module
+
 # Apache Software License
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
+MODAPACHE_NAME=        geoip
+
 LIB_DEPENDS=   GeoIP.>=4::net/GeoIP
 
 FLAGS=         -I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -30,14 +34,11 @@ APXS=               /usr/sbin/apxs
 do-build:
        cd ${WRKSRC} && \
                ${APXS} -c -o mod_geoip.so ${FLAGS} -lGeoIP mod_geoip.c
-       @sed 's,!!PREFIX!!,${PREFIX},' \
-               < ${FILESDIR}/mod_geoip-enable \
-               > ${WRKBUILD}/mod_geoip-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
-       ${INSTALL_DATA} ${WRKBUILD}/mod_geoip.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_geoip-enable ${PREFIX}/sbin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_geoip
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mod_geoip
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_geoip-enable
===================================================================
RCS file: /cvs/ports/www/mod_geoip/files/mod_geoip-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_geoip-enable
--- files/mod_geoip-enable      27 Jun 2003 15:06:13 -0000      1.1.1.1
+++ files/mod_geoip-enable      20 Jun 2007 21:35:41 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_geoip-enable,v 1.1.1.1 2003/06/27 15:06:13 naddy Exp $
-
-MODULE=!!PREFIX!!/lib/mod_geoip.so
-
-if [ `id -u` -ne 0 ]; then
-       echo "You must be root to run this script."
-       exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-       echo "Cannot find mod_geoip module (${MODULE})"
-       exit 1
-else
-       echo "Enabling GeoIP module..."
-       /usr/sbin/apxs -i -a -n geoip ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_geoip/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 18:59:33 -0000      1.2
+++ pkg/MESSAGE 20 Jun 2007 21:35:41 -0000
@@ -1,7 +1,7 @@
 To finish the install of mod_geoip, you need
 to enable the module using the following command
 
-  ${PREFIX}/sbin/mod_geoip-enable
+  ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_geoip/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   5 Feb 2005 10:56:29 -0000       1.3
+++ pkg/PLIST   20 Jun 2007 21:35:41 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.3 2005/02/05 10:56:29 alek Exp $
-lib/mod_geoip.so
-sbin/mod_geoip-enable
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_geoip/
 share/doc/mod_geoip/README
[EMAIL PROTECTED] rm -f /usr/lib/apache/modules/mod_geoip.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_layout/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile    17 Aug 2005 16:10:05 -0000      1.4
+++ Makefile    20 Jun 2007 21:35:43 -0000
@@ -4,15 +4,16 @@ COMMENT=      "Apache module for implementing
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
-NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} 
+SHARED_ONLY=   Yes
 
 DISTNAME=      mod_layout-3.2
-PKGNAME=       ${DISTNAME}p0
+PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    www
 
 HOMEPAGE=      http://software.tangent.org/projects.pl?view=mod_layout
 MASTER_SITES=  http://software.tangent.org/download/ \
                ftp://ftp.tangent.org/pub/apache/
+MODULES+=      apache-module
 
 # Apache Software License
 PERMIT_PACKAGE_CDROM=  Yes
@@ -20,20 +21,19 @@ PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
+MODAPACHE_NAME=        layout
+
 NO_REGRESS=    Yes
 
 post-build:
-       @sed 's,!!PREFIX!!,${PREFIX},' \
-               < ${FILESDIR}/mod_layout-enable \
-               > ${WRKBUILD}/mod_layout-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
-       ${INSTALL_DATA} ${WRKBUILD}/mod_layout.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_layout-enable ${PREFIX}/sbin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_layout
        ${INSTALL_DATA} ${WRKSRC}/faq.html ${PREFIX}/share/doc/mod_layout
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_layout/directives
        ${INSTALL_DATA} ${WRKSRC}/directives/* \
                ${PREFIX}/share/doc/mod_layout/directives
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_layout-enable
===================================================================
RCS file: /cvs/ports/www/mod_layout/files/mod_layout-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_layout-enable
--- files/mod_layout-enable     25 May 2003 19:57:56 -0000      1.1.1.1
+++ files/mod_layout-enable     20 Jun 2007 21:35:43 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_layout-enable,v 1.1.1.1 2003/05/25 19:57:56 naddy Exp $
-
-MODULE=!!PREFIX!!/lib/mod_layout.so
-
-if [ `id -u` -ne 0 ]; then
-       echo "You must be root to run this script."
-       exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-       echo "Cannot find mod_layout module (${MODULE})"
-       exit 1
-else
-       echo "Enabling Layout module..."
-       /usr/sbin/apxs -i -a -n layout ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_layout/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 10:16:31 -0000      1.2
+++ pkg/MESSAGE 20 Jun 2007 21:35:43 -0000
@@ -1,7 +1,7 @@
 To finish the install of mod_layout, you need
 to enable the module using the following command
 
-       ${PREFIX}/sbin/mod_layout-enable
+       ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_layout/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   13 Oct 2004 10:16:31 -0000      1.3
+++ pkg/PLIST   20 Jun 2007 21:35:43 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/10/13 10:16:31 xsa Exp $
-lib/mod_layout.so
-sbin/mod_layout-enable
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_layout/
 share/doc/mod_layout/directives/
 share/doc/mod_layout/directives/Layout.html
@@ -38,4 +39,4 @@ share/doc/mod_layout/directives/LayoutPr
 share/doc/mod_layout/directives/LayoutReplaceTags.html
 share/doc/mod_layout/directives/LayoutTimeFormat.html
 share/doc/mod_layout/faq.html
[EMAIL PROTECTED] /usr/lib/apache/modules/mod_layout.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_log_sql/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile    4 Aug 2006 00:10:42 -0000       1.8
+++ Makefile    20 Jun 2007 21:35:45 -0000
@@ -7,11 +7,13 @@ COMMENT=      "Apache module for logging to a
 SHARED_ONLY=   Yes
 
 DISTNAME=      mod_log_sql-1.18
-PKGNAME=       ${DISTNAME}p0
+PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    www
 
 HOMEPAGE=      http://www.outoforder.cc/projects/apache/mod_log_sql/
 
+MODULES+=      apache-module
+
 # Artistic
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
@@ -19,6 +21,8 @@ PERMIT_DISTFILES_CDROM=       Yes
 PERMIT_DISTFILES_FTP=  Yes
 WANTLIB=               z
 
+MODAPACHE_NAME=        log_sql
+
 MASTER_SITES=  http://www.outoforder.cc/downloads/mod_log_sql/
 EXTRACT_SUFX=  .tar.bz2
 
@@ -36,13 +40,9 @@ FLAGS=               -I${LOCALBASE}/include/mysql -L$
 do-build:
        cd ${WRKBUILD} && \
                ${APXS} -c -o mod_log_sql.so ${FLAGS} mod_log_sql.c
-       @sed 's,!!PREFIX!!,${PREFIX},' \
-               < ${FILESDIR}/mod_log_sql-enable \
-               > ${WRKBUILD}/mod_log_sql-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
-       ${INSTALL_DATA} ${WRKBUILD}/mod_log_sql.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_log_sql-enable ${PREFIX}/sbin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_log_sql
        for p in ${EXAMPLES}; do \
                ${INSTALL_DATA} ${WRKSRC}/$$p \
@@ -51,5 +51,6 @@ do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_log_sql
        ${INSTALL_DATA} ${WRKSRC}/Documentation/HTML/* \
                ${PREFIX}/share/doc/mod_log_sql
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_log_sql-enable
===================================================================
RCS file: /cvs/ports/www/mod_log_sql/files/mod_log_sql-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_log_sql-enable
--- files/mod_log_sql-enable    26 May 2003 15:19:32 -0000      1.1.1.1
+++ files/mod_log_sql-enable    20 Jun 2007 21:35:45 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_log_sql-enable,v 1.1.1.1 2003/05/26 15:19:32 naddy Exp $
-
-MODULE=!!PREFIX!!/lib/mod_log_sql.so
-
-if [ `id -u` -ne 0 ]; then
-       echo "You must be root to run this script."
-       exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-       echo "Cannot find mod_log_sql module (${MODULE})"
-       exit 1
-else
-       echo "Enabling Log SQL module..."
-       /usr/sbin/apxs -i -a -n sql_log ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_log_sql/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 18:59:33 -0000      1.2
+++ pkg/MESSAGE 20 Jun 2007 21:35:45 -0000
@@ -1,7 +1,7 @@
 To finish the install of mod_log_sql, you need
 to enable the module using the following command
 
-  ${PREFIX}/sbin/mod_log_sql-enable
+  ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_log_sql/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   5 Feb 2005 10:49:49 -0000       1.3
+++ pkg/PLIST   20 Jun 2007 21:35:45 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.3 2005/02/05 10:49:49 alek Exp $
-lib/mod_log_sql.so
-sbin/mod_log_sql-enable
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_log_sql/
 share/doc/mod_log_sql/contents.png
 share/doc/mod_log_sql/documentation.css
@@ -24,4 +25,4 @@ share/doc/mod_log_sql/up_g.png
 share/examples/mod_log_sql/
 share/examples/mod_log_sql/create_tables.sql
 share/examples/mod_log_sql/make_combined_log.pl
[EMAIL PROTECTED] rm -f /usr/lib/apache/modules/mod_log_sql.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_mp3/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile    4 Aug 2006 00:10:42 -0000       1.8
+++ Makefile    20 Jun 2007 21:35:45 -0000
@@ -4,16 +4,18 @@ COMMENT=      "turns Apache into an MP3 or Og
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
-NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
+SHARED_ONLY=   Yes
 
 DISTNAME=      mod_mp3-0.39
-PKGNAME=       ${DISTNAME}p1
+PKGNAME=       ${DISTNAME}p2
 CATEGORIES=    www audio
 MASTER_SITES=  http://download.tangent.org/ \
                ftp://ftp.tangent.org/pub/apache/
 
 HOMEPAGE=      http://tangent.org/
 
+MODULES+=      apache-module
+
 # Apache
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
@@ -23,6 +25,9 @@ PERMIT_DISTFILES_FTP= Yes
 FLAVORS=       mysql postgresql
 FLAVOR?=
 
+MODAPACHE_NAME=                mp3
+MODAPACHE_LOCATION=    ${WRKBUILD}/src
+
 CONFIGURE_STYLE=       gnu
 CONFIGURE_ARGS+=       --with-apxs=/usr/sbin/apxs \
                        --with-perl=/usr/bin/perl
@@ -52,13 +57,9 @@ EXAMPLES+=   ${EXAMPLESRC}/pgsql_schema
 .endif
 
 post-build:
-       @sed 's,!!PREFIX!!,${PREFIX},' \
-               < ${FILESDIR}/mod_mp3-enable \
-               > ${WRKBUILD}/mod_mp3-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
-       ${INSTALL_DATA} ${WRKBUILD}/src/mod_mp3.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_mp3-enable ${PREFIX}/sbin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_mp3
        ${INSTALL_DATA} ${WRKSRC}/faq.html ${PREFIX}/share/doc/mod_mp3
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_mp3
@@ -66,5 +67,6 @@ do-install:
 .if defined(EXAMPLES)
        ${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/mod_mp3
 .endif
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_mp3-enable
===================================================================
RCS file: /cvs/ports/www/mod_mp3/files/mod_mp3-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_mp3-enable
--- files/mod_mp3-enable        20 May 2003 01:57:18 -0000      1.1.1.1
+++ files/mod_mp3-enable        20 Jun 2007 21:35:45 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_mp3-enable,v 1.1.1.1 2003/05/20 01:57:18 naddy Exp $
-
-MODULE=!!PREFIX!!/lib/mod_mp3.so
-
-if [ `id -u` -ne 0 ]; then
-       echo "You must be root to run this script."
-       exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-       echo "Cannot find mod_mp3 module (${MODULE})"
-       exit 1
-else
-       echo "Enabling MP3 module..."
-       /usr/sbin/apxs -i -a -n mp3 ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_mp3/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 18:59:33 -0000      1.2
+++ pkg/MESSAGE 20 Jun 2007 21:35:45 -0000
@@ -1,7 +1,7 @@
 To finish the install of mod_mp3, you need
 to enable the module by using the following command
 
-  ${PREFIX}/sbin/mod_mp3-enable        
+  ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 Also, copy the following file into your Apache config
 directory:
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_mp3/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   26 Jan 2005 00:08:45 -0000      1.3
+++ pkg/PLIST   20 Jun 2007 21:35:45 -0000
@@ -1,10 +1,11 @@
 @comment $OpenBSD: PLIST,v 1.3 2005/01/26 00:08:45 alek Exp $
-lib/mod_mp3.so
-sbin/mod_mp3-enable
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_mp3/
 share/doc/mod_mp3/faq.html
 share/examples/mod_mp3/
 share/examples/mod_mp3/mp3.conf
 %%mysql%%
 %%postgresql%%
[EMAIL PROTECTED] rm -f /usr/lib/apache/modules/mod_mp3.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_perl/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile    4 May 2007 08:43:05 -0000       1.19
+++ Makefile    20 Jun 2007 21:35:46 -0000
@@ -7,12 +7,19 @@ SHARED_ONLY=  Yes
 COMMENT=       "module that embeds a Perl interpreter into Apache"
 
 DISTNAME=      mod_perl-1.30
+PKGNAME=       ${DISTNAME}p0
 CATEGORIES=    www perl5
 MASTER_SITES=  http://perl.apache.org/dist/ \
                ${MASTER_SITE_PERL_CPAN:=Apache/}
 
 HOMEPAGE=      http://perl.apache.org/
 
+MODULES=       apache-module
+
+MODAPACHE_NAME= perl
+MODAPACHE_LOCATION= ${WRKBUILD}/apaci
+MODAPACHE_FILE=        ${MODAPACHE_LOCATION}/libperl.so
+
 # Apache
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
@@ -30,14 +37,12 @@ CONFIGURE_ARGS=     USE_APXS="1" EVERYTHING=
 INSTALL_TARGET=        pure_install doc_install
 
 post-build:
-       @sed -e s#!!PREFIX!!#${PREFIX}#g \
-       < ${FILESDIR}/mod_perl-enable > ${WRKBUILD}/mod_perl-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_perl
-       ${INSTALL_DATA} ${WRKBUILD}/apaci/libperl.so ${PREFIX}/lib/mod_perl.so
        ${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/* \
                ${PREFIX}/share/doc/mod_perl
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_perl-enable ${PREFIX}/sbin
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_perl-enable
===================================================================
RCS file: /cvs/ports/www/mod_perl/files/mod_perl-enable,v
retrieving revision 1.4
diff -u -p -r1.4 mod_perl-enable
--- files/mod_perl-enable       13 Aug 2001 17:16:00 -0000      1.4
+++ files/mod_perl-enable       20 Jun 2007 21:35:46 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_perl-enable,v 1.4 2001/08/13 17:16:00 brad Exp $
-
-MODULE=!!PREFIX!!/lib/mod_perl.so
-
-if [ `id -u` -ne 0 ]; then
-    echo "You must be root to run this script."
-    exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-    echo "Cannot find mod_perl module (${MODULE})"
-    exit 1
-else
-    echo "Enabling Perl module..."
-    /usr/sbin/apxs -i -a -n perl ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_perl/pkg/MESSAGE,v
retrieving revision 1.3
diff -u -p -r1.3 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 18:59:33 -0000      1.3
+++ pkg/MESSAGE 20 Jun 2007 21:35:46 -0000
@@ -1,7 +1,7 @@
 To finish the install of ${PKGNAME}, you need
 to enable the module using the following command
 
-  ${PREFIX}/sbin/mod_perl-enable
+  ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_perl/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST   4 May 2007 08:43:05 -0000       1.18
+++ pkg/PLIST   20 Jun 2007 21:35:46 -0000
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.18 2007/05/04 08:43:05 bernd Exp $
-lib/mod_perl.so
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
 ${P5ARCH}/
 ${P5ARCH}/Apache/
 ${P5ARCH}/Apache.pm
@@ -109,7 +110,7 @@ ${P5ARCH}/mod_perl_tuning.pod
 @man man/man3p/mod_perl_method_handlers.3p
 @man man/man3p/mod_perl_traps.3p
 @man man/man3p/mod_perl_tuning.3p
-sbin/mod_perl-enable
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_perl/
 share/doc/mod_perl/mod_perl.html
[EMAIL PROTECTED] rm -f /usr/lib/apache/modules/mod_perl.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_random/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile    17 Aug 2005 16:10:05 -0000      1.4
+++ Makefile    20 Jun 2007 21:35:47 -0000
@@ -4,15 +4,16 @@ COMMENT=      "Apache module that provides ra
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
-NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
+SHARED_ONLY=   Yes
 
 DISTNAME=      mod_random-1.4
-PKGNAME=       ${DISTNAME}p0
+PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    www
 
 HOMEPAGE=      http://software.tangent.org/projects.pl?view=mod_random
 MASTER_SITES=  http://software.tangent.org/download/ \
                ftp://ftp.tangent.org/pub/apache/
+MODULES+=      apache-module
 
 # BSD 
 PERMIT_PACKAGE_CDROM=  Yes
@@ -20,20 +21,19 @@ PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
+MODAPACHE_NAME=        random
+
 NO_REGRESS=    Yes
 APXS=          /usr/sbin/apxs
 
 do-build:
        cd ${WRKSRC} && \
                ${APXS} -c -o mod_random.so mod_random.c
-       @sed 's,!!PREFIX!!,${PREFIX},' \
-               < ${FILESDIR}/mod_random-enable \
-               > ${WRKBUILD}/mod_random-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
-       ${INSTALL_DATA} ${WRKBUILD}/mod_random.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_random-enable ${PREFIX}/sbin
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_random
        ${INSTALL_DATA} ${WRKSRC}/faq.html ${PREFIX}/share/doc/mod_random
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_random-enable
===================================================================
RCS file: /cvs/ports/www/mod_random/files/mod_random-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_random-enable
--- files/mod_random-enable     26 May 2003 14:24:11 -0000      1.1.1.1
+++ files/mod_random-enable     20 Jun 2007 21:35:47 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_random-enable,v 1.1.1.1 2003/05/26 14:24:11 naddy Exp $
-
-MODULE=!!PREFIX!!/lib/mod_random.so
-
-if [ `id -u` -ne 0 ]; then
-       echo "You must be root to run this script."
-       exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-       echo "Cannot find mod_random module (${MODULE})"
-       exit 1
-else
-       echo "Enabling Random module..."
-       /usr/sbin/apxs -i -a -n random ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_random/pkg/MESSAGE,v
retrieving revision 1.3
diff -u -p -r1.3 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 10:08:56 -0000      1.3
+++ pkg/MESSAGE 20 Jun 2007 21:35:47 -0000
@@ -1,7 +1,7 @@
 To finish the install of mod_random, you need
 to enable the module using the following command
 
-       ${PREFIX}/sbin/mod_random-enable
+       ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_random/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   13 Oct 2004 10:08:56 -0000      1.3
+++ pkg/PLIST   20 Jun 2007 21:35:47 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.3 2004/10/13 10:08:56 xsa Exp $
-lib/mod_random.so
-sbin/mod_random-enable
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_random/
 share/doc/mod_random/faq.html
[EMAIL PROTECTED] /usr/lib/apache/modules/mod_random.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_security/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile    17 Apr 2006 14:58:02 -0000      1.14
+++ Makefile    20 Jun 2007 21:35:48 -0000
@@ -8,7 +8,7 @@ SHARED_ONLY=    Yes
 
 VER=           1.9.3
 DISTNAME=      modsecurity-apache_${VER}
-PKGNAME=       modsecurity-apache-${VER}
+PKGNAME=       modsecurity-apache-${VER}p0
 
 CATEGORIES=    www
 
@@ -17,12 +17,16 @@ MASTER_SITES0=      ${MASTER_SITE_SOURCEFORGE
 
 HOMEPAGE=      http://www.modsecurity.org/
 
+MODULES+=      apache-module
+
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=    Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
+MODAPACHE_NAME=        security
+
 NO_REGRESS=    Yes
 
 DOCS=  CHANGES INSTALL LICENSE README doc/modsecurity-manual.pdf
@@ -31,18 +35,16 @@ SUBST_VARS= PKGNAME
 do-build:
        cd ${WRKSRC}/apache1 && /usr/sbin/apxs -Wc,"${CFLAGS}" -c \
                mod_security.c -o ${WRKBUILD}/mod_security.so
-       sed 's,!!PREFIX!!,${PREFIX},' < ${FILESDIR}/mod_security-enable \
-               > ${WRKBUILD}/mod_security-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mod_security
-       ${INSTALL_DATA} ${WRKBUILD}/mod_security.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_security-enable ${PREFIX}/sbin
        ${INSTALL_DATA} ${WRKSRC}/httpd.conf.example-* \
                ${PREFIX}/share/examples/mod_security
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_security
 .for i in ${DOCS}
         ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/mod_security
 .endfor
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_security-enable
===================================================================
RCS file: /cvs/ports/www/mod_security/files/mod_security-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_security-enable
--- files/mod_security-enable   19 Nov 2003 01:33:26 -0000      1.1.1.1
+++ files/mod_security-enable   20 Jun 2007 21:35:48 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_security-enable,v 1.1.1.1 2003/11/19 01:33:26 david Exp $
-
-MODULE=!!PREFIX!!/lib/mod_security.so
-
-if [ `id -u` -ne 0 ]; then
-    echo "You must be root to run this script."
-    exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-    echo "Cannot find mod_security module (${MODULE})"
-    exit 1
-else
-    echo "Enabling security module..."
-    /usr/sbin/apxs -i -a -n security ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_security/pkg/MESSAGE,v
retrieving revision 1.3
diff -u -p -r1.3 MESSAGE
--- pkg/MESSAGE 17 Apr 2006 14:58:02 -0000      1.3
+++ pkg/MESSAGE 20 Jun 2007 21:35:48 -0000
@@ -1,7 +1,7 @@
 To finish the install of ${PKGNAME}, you need
 to enable the module using the following command
 
-  ${PREFIX}/sbin/mod_security-enable
+  ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 The manual is found at ${PREFIX}/share/doc/mod_security.
 
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/www/mod_security/pkg/PFRAG.shared,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.shared
--- pkg/PFRAG.shared    15 Sep 2004 18:49:50 -0000      1.2
+++ pkg/PFRAG.shared    20 Jun 2007 21:35:48 -0000
@@ -1,2 +0,0 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.shared,v 1.2 2004/09/15 18:49:50 espie Exp $
-lib/mod_security.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_security/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   17 Apr 2006 14:58:02 -0000      1.11
+++ pkg/PLIST   20 Jun 2007 21:35:48 -0000
@@ -1,5 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.11 2006/04/17 14:58:02 sturm Exp $
-sbin/mod_security-enable
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
 share/doc/mod_security/
 share/doc/mod_security/CHANGES
 share/doc/mod_security/INSTALL
@@ -9,4 +11,4 @@ share/doc/mod_security/modsecurity-manua
 share/examples/mod_security/
 share/examples/mod_security/httpd.conf.example-minimal
 %%SHARED%%
[EMAIL PROTECTED] rm -f /usr/lib/apache/modules/mod_security.so
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mod_text2html/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile    17 Aug 2005 16:10:05 -0000      1.4
+++ Makefile    20 Jun 2007 21:35:49 -0000
@@ -4,15 +4,16 @@ COMMENT=      "Apache module designed to repl
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
-NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} 
+SHARED_ONLY=   Yes
 
 DISTNAME=      mod_text2html-1.0
-PKGNAME=       ${DISTNAME}p0
+PKGNAME=       ${DISTNAME}p1
 CATEGORIES=    www
 
 HOMEPAGE=      http://software.tangent.org/projects.pl?view=mod_text2html
 MASTER_SITES=  http://software.tangent.org/download/ \
                ftp://ftp.tangent.org/pub/apache/
+MODULES+=      apache-module
 
 # Apache Software License
 PERMIT_PACKAGE_CDROM=  Yes
@@ -20,6 +21,8 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=        Yes
 PERMIT_DISTFILES_FTP=  Yes
 
+MODAPACHE_NAME=        text2html
+
 NO_REGRESS=    Yes
 
 APXS=          /usr/sbin/apxs
@@ -27,12 +30,9 @@ APXS=                /usr/sbin/apxs
 do-build:
        cd ${WRKBUILD} && \
                ${APXS} -c -o mod_text2html.so mod_text2html.c
-       @sed 's,!!PREFIX!!,${PREFIX},' \
-               < ${FILESDIR}/mod_text2html-enable \
-               > ${WRKBUILD}/mod_text2html-enable
+       ${MODAPACHE_CREATE_ENABLE_SCRIPT}
 
 do-install:
-       ${INSTALL_DATA} ${WRKBUILD}/mod_text2html.so ${PREFIX}/lib
-       ${INSTALL_SCRIPT} ${WRKBUILD}/mod_text2html-enable ${PREFIX}/sbin
+       ${MODAPACHE_INSTALL}
 
 .include <bsd.port.mk>
Index: files/mod_text2html-enable
===================================================================
RCS file: /cvs/ports/www/mod_text2html/files/mod_text2html-enable,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 mod_text2html-enable
--- files/mod_text2html-enable  29 May 2003 22:45:38 -0000      1.1.1.1
+++ files/mod_text2html-enable  20 Jun 2007 21:35:49 -0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: mod_text2html-enable,v 1.1.1.1 2003/05/29 22:45:38 naddy Exp $
-
-MODULE=!!PREFIX!!/lib/mod_text2html.so
-
-if [ `id -u` -ne 0 ]; then
-       echo "You must be root to run this script."
-       exit
-fi
-
-if [ ! -f ${MODULE} ]; then
-       echo "Cannot find mod_text2html module (${MODULE})"
-       exit 1
-else
-       echo "Enabling Layout module..."
-       /usr/sbin/apxs -i -a -n text2html ${MODULE}
-fi
Index: pkg/MESSAGE
===================================================================
RCS file: /cvs/ports/www/mod_text2html/pkg/MESSAGE,v
retrieving revision 1.2
diff -u -p -r1.2 MESSAGE
--- pkg/MESSAGE 13 Oct 2004 10:22:50 -0000      1.2
+++ pkg/MESSAGE 20 Jun 2007 21:35:49 -0000
@@ -1,7 +1,7 @@
 To finish the install of mod_text2html, you need
 to enable the module using the following command
 
-       ${PREFIX}/sbin/mod_text2html-enable
+       ${PREFIX}/sbin/${MODAPACHE_ENABLE}
 
 If you already have Apache running on your machine,
 you should not use "apachectl restart" - instead,
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/mod_text2html/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   13 Oct 2004 10:22:50 -0000      1.2
+++ pkg/PLIST   20 Jun 2007 21:35:49 -0000
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.2 2004/10/13 10:22:50 xsa Exp $
-lib/mod_text2html.so
-sbin/mod_text2html-enable
[EMAIL PROTECTED] /usr/lib/apache/modules/mod_text2html.so
+lib/${MODAPACHE_MODULE}
[EMAIL PROTECTED] test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL}
+sbin/${MODAPACHE_ENABLE}
[EMAIL PROTECTED] rm -f ${MODAPACHE_FINAL}

Reply via email to