diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile index 9edd0509b3b..24121498718 100644 --- a/www/mod_fastcgi/Makefile +++ b/www/mod_fastcgi/Makefile @@ -1,8 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/04/28 11:49:56 mbalmer Exp $ - -# This port currently only works with archs supporting dynamic loading -# and has Apache that supports DSO's. -SHARED_ONLY= Yes +# $OpenBSD: Makefile,v 1.3 2007/06/22 14:48:23 simon Exp $ COMMENT= "Apache FastCGI module" @@ -15,6 +11,9 @@ HOMEPAGE= http://www.fastcgi.com/ MASTER_SITES= ${HOMEPAGE}dist/ +MODULES= apache-module +MODAPACHE_NAME= fastcgi + MAINTAINER= Marc Balmer # Proprietary license @@ -27,16 +26,13 @@ NO_REGRESS= Yes do-build: (cd ${WRKBUILD}; apxs -o mod_fastcgi.so -c *.c) - + post-build: - sed 's,!!PREFIX!!,${PREFIX},' \ - < ${FILESDIR}/mod_fastcgi-enable \ - > ${WRKBUILD}/mod_fastcgi-enable + @${MODAPACHE_CREATE_ENABLE_SCRIPT} do-install: - ${INSTALL_DATA} ${WRKBUILD}/mod_fastcgi.so ${PREFIX}/lib - ${INSTALL_SCRIPT} ${WRKBUILD}/mod_fastcgi-enable ${PREFIX}/sbin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_fastcgi ${INSTALL_DATA} ${WRKBUILD}/docs/* ${PREFIX}/share/doc/mod_fastcgi - + ${MODAPACHE_INSTALL} + .include diff --git a/www/mod_fastcgi/files/mod_fastcgi-enable b/www/mod_fastcgi/files/mod_fastcgi-enable deleted file mode 100644 index 07a377f0714..00000000000 --- a/www/mod_fastcgi/files/mod_fastcgi-enable +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: mod_fastcgi-enable,v 1.1.1.1 2005/02/14 06:23:23 mbalmer Exp $ - -MODULE=!!PREFIX!!/lib/mod_fastcgi.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_fastcgi module (${MODULE})" - exit 1 -else - echo "Enabling FastCGI module..." - /usr/sbin/apxs -i -a -n fastcgi ${MODULE} -fi diff --git a/www/mod_fastcgi/pkg/MESSAGE b/www/mod_fastcgi/pkg/MESSAGE index ce30b0bbf7d..9b67b75234a 100644 --- a/www/mod_fastcgi/pkg/MESSAGE +++ b/www/mod_fastcgi/pkg/MESSAGE @@ -1,7 +1,7 @@ To finish the install of mod_fastcgi, you need to enable the module using the following command - ${PREFIX}/sbin/mod_fastcgi-enable + ${PREFIX}/sbin/${MODAPACHE_ENABLE} If you already have Apache running on your machine, you should not use "apachectl restart" - instead, diff --git a/www/mod_fastcgi/pkg/PLIST b/www/mod_fastcgi/pkg/PLIST index 04a68a654fc..88538157981 100644 --- a/www/mod_fastcgi/pkg/PLIST +++ b/www/mod_fastcgi/pkg/PLIST @@ -1,6 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/02/14 06:23:23 mbalmer Exp $ -lib/mod_fastcgi.so -sbin/mod_fastcgi-enable +@comment $OpenBSD: PLIST,v 1.2 2007/06/22 14:48:23 simon Exp $ +lib/${MODAPACHE_MODULE} +@exec-update test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL} +sbin/${MODAPACHE_ENABLE} share/doc/mod_fastcgi/ share/doc/mod_fastcgi/LICENSE.TERMS share/doc/mod_fastcgi/mod_fastcgi.html +@unexec-delete rm -f ${MODAPACHE_FINAL} +@comment share/doc/mod_fastcgi/mod_fastcgi.html.orig diff --git a/www/mod_ldapvhost/Makefile b/www/mod_ldapvhost/Makefile index e27142bc45f..915a4d98dd6 100644 --- a/www/mod_ldapvhost/Makefile +++ b/www/mod_ldapvhost/Makefile @@ -1,13 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2006/10/29 18:48:24 steven Exp $ - -# This port currently only works with archs supporting dynamic loading -# and has Apache that supports DSO's. -SHARED_ONLY= Yes +# $OpenBSD: Makefile,v 1.4 2007/06/22 14:53:20 simon Exp $ COMMENT= "Apache LDAP based virtual hosts module" DISTNAME= mod_ldapvhost-1.0.2 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 CATEGORIES= www HOMEPAGE= https://www.msys.ch/products/unix/mod_ldapvhost/ @@ -16,6 +12,7 @@ MAINTAINER= Marc Balmer MASTER_SITES= ftp://ftp.etc.msys.ch/pub/sources/mod_ldapvhost/ EXTRACT_SUFX= .tgz +MODULES+= apache-module # BSD PERMIT_PACKAGE_CDROM= Yes @@ -23,24 +20,23 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +MODAPACHE_NAME= ldapvhost + NO_REGRESS= Yes LIB_DEPENDS= ldap,lber::databases/openldap do-build: (cd ${WRKBUILD}; make) - + post-build: - sed 's,!!PREFIX!!,${PREFIX},' \ - < ${FILESDIR}/mod_ldapvhost-enable \ - > ${WRKBUILD}/mod_ldapvhost-enable + @${MODAPACHE_CREATE_ENABLE_SCRIPT} do-install: - ${INSTALL_DATA} ${WRKBUILD}/mod_ldapvhost.so ${PREFIX}/lib - ${INSTALL_SCRIPT} ${WRKBUILD}/mod_ldapvhost-enable ${PREFIX}/sbin ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_ldapvhost ${INSTALL_DATA} ${WRKBUILD}/*.schema ${PREFIX}/share/doc/mod_ldapvhost/ ${INSTALL_DATA} ${WRKBUILD}/mod_ldapvhost.conf \ ${PREFIX}/share/doc/mod_ldapvhost/ - + ${MODAPACHE_INSTALL} + .include diff --git a/www/mod_ldapvhost/files/mod_ldapvhost-enable b/www/mod_ldapvhost/files/mod_ldapvhost-enable deleted file mode 100644 index 9c37b1e6367..00000000000 --- a/www/mod_ldapvhost/files/mod_ldapvhost-enable +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: mod_ldapvhost-enable,v 1.1.1.1 2006/10/22 08:55:38 mbalmer Exp $ - -MODULE=!!PREFIX!!/lib/mod_ldapvhost.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_ldapvhost module (${MODULE})" - exit 1 -else - echo "Enabling LDAP virtual hosts module..." - /usr/sbin/apxs -i -a -n ldapvhost ${MODULE} -fi diff --git a/www/mod_ldapvhost/pkg/MESSAGE b/www/mod_ldapvhost/pkg/MESSAGE index b0f3cad5116..500b9f9fefd 100644 --- a/www/mod_ldapvhost/pkg/MESSAGE +++ b/www/mod_ldapvhost/pkg/MESSAGE @@ -1,7 +1,7 @@ To finish the installation of mod_ldapvhost, you need to enable the module using the following command - ${PREFIX}/sbin/mod_ldapvhost-enable + ${PREFIX}/sbin/${MODAPACHE_ENABLE} If you already have Apache running on your machine, you should not use "apachectl restart" - instead, you should fully stop and then restart the diff --git a/www/mod_ldapvhost/pkg/PLIST b/www/mod_ldapvhost/pkg/PLIST index d7011e7a255..6cbb8710eba 100644 --- a/www/mod_ldapvhost/pkg/PLIST +++ b/www/mod_ldapvhost/pkg/PLIST @@ -1,7 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.2 2006/10/22 09:04:03 mbalmer Exp $ -lib/mod_ldapvhost.so -sbin/mod_ldapvhost-enable +@comment $OpenBSD: PLIST,v 1.3 2007/06/22 14:53:20 simon Exp $ +lib/${MODAPACHE_MODULE} +@exec-update test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL} +sbin/${MODAPACHE_ENABLE} share/doc/mod_ldapvhost/ share/doc/mod_ldapvhost/mod_ldapvhost.conf share/doc/mod_ldapvhost/msys.schema share/doc/mod_ldapvhost/vhost.schema +@unexec-delete rm -f ${MODAPACHE_FINAL}