From ff66b0258cf53ae90ef6511d911ddb0ba9a18ec0 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 21 Jun 2007 20:59:13 +0000 Subject: [PATCH] switch to apache-module framework initially from espie@, ok ckuethe@ (maintainer) --- www/mod_auth_kerb/Makefile | 16 ++++++++-------- www/mod_auth_kerb/files/mod_auth_kerb-enable | 18 ------------------ www/mod_auth_kerb/pkg/MESSAGE | 2 +- www/mod_auth_kerb/pkg/PLIST | 9 +++++---- 4 files changed, 14 insertions(+), 31 deletions(-) delete mode 100644 www/mod_auth_kerb/files/mod_auth_kerb-enable diff --git a/www/mod_auth_kerb/Makefile b/www/mod_auth_kerb/Makefile index 4ba6b9fe1ad..5da02f91856 100644 --- a/www/mod_auth_kerb/Makefile +++ b/www/mod_auth_kerb/Makefile @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile,v 1.6 2007/02/19 16:14:01 ckuethe Exp $ - -SHARED_ONLY= Yes +# $OpenBSD: Makefile,v 1.7 2007/06/21 20:59:13 simon Exp $ COMMENT= "Apache Kerberos authentication module" DISTNAME= mod_auth_kerb-5.3 +PKGNAME= ${DISTNAME}p0 CATEGORIES= www HOMEPAGE= http://modauthkerb.sourceforge.net/ +MODULES+= apache-module MAINTAINER= Chris Kuethe # combination of 2- and 3-clause BSD, MIT, and export crypto warnings @@ -23,19 +23,19 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=modauthkerb/} NO_REGRESS= Yes USE_GMAKE= Yes +MODAPACHE_NAME= auth_kerb +MODAPACHE_LOCATION= ${WRKBUILD}/src + CONFIGURE_STYLE=gnu CONFIGURE_ENV= KRB5_CPPFLAGS="-I/usr/include/kerberosV" \ KRB5_LDFLAGS="-lkrb5 -lgssapi -lssl -lcrypto" post-build: - sed 's,!!PREFIX!!,${PREFIX},' \ - < ${FILESDIR}/mod_auth_kerb-enable \ - > ${WRKBUILD}/mod_auth_kerb-enable + @${MODAPACHE_CREATE_ENABLE_SCRIPT} do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_auth_kerb ${INSTALL_DATA} ${FILESDIR}/README ${PREFIX}/share/doc/mod_auth_kerb - ${INSTALL_DATA} ${WRKBUILD}/src/mod_auth_kerb.so ${PREFIX}/lib - ${INSTALL_SCRIPT} ${WRKBUILD}/mod_auth_kerb-enable ${PREFIX}/sbin + ${MODAPACHE_INSTALL} .include diff --git a/www/mod_auth_kerb/files/mod_auth_kerb-enable b/www/mod_auth_kerb/files/mod_auth_kerb-enable deleted file mode 100644 index 8a37c1a3375..00000000000 --- a/www/mod_auth_kerb/files/mod_auth_kerb-enable +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: mod_auth_kerb-enable,v 1.1.1.1 2005/11/03 16:23:13 alek Exp $ - -MODULE=!!PREFIX!!/lib/mod_auth_kerb.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_krb module (${MODULE})" - exit 1 -else - echo "Enabling Kerberos Authentication module..." - /usr/sbin/apxs -i -a -n auth_kerb ${MODULE} -fi diff --git a/www/mod_auth_kerb/pkg/MESSAGE b/www/mod_auth_kerb/pkg/MESSAGE index f86e5219a92..89580d689b2 100644 --- a/www/mod_auth_kerb/pkg/MESSAGE +++ b/www/mod_auth_kerb/pkg/MESSAGE @@ -1,7 +1,7 @@ To finish the install of mod_auth_kerb, you need to enable the module using the following command - ${PREFIX}/sbin/mod_auth_kerb-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_auth_kerb/pkg/PLIST b/www/mod_auth_kerb/pkg/PLIST index 6cd078f0db4..02808a77b6a 100644 --- a/www/mod_auth_kerb/pkg/PLIST +++ b/www/mod_auth_kerb/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2005/11/03 16:23:13 alek Exp $ -lib/mod_auth_kerb.so -sbin/mod_auth_kerb-enable +@comment $OpenBSD: PLIST,v 1.2 2007/06/21 20:59:13 simon Exp $ +lib/${MODAPACHE_MODULE} +@exec-update test -f ${MODAPACHE_FINAL} && cp -fp %D/%F ${MODAPACHE_FINAL} +sbin/${MODAPACHE_ENABLE} share/doc/mod_auth_kerb/ share/doc/mod_auth_kerb/README -@unexec rm -f /usr/lib/apache/modules/mod_auth_kerb.so +@unexec-delete rm -f ${MODAPACHE_FINAL}