From owner-freebsd-apache@FreeBSD.ORG Thu Oct 6 17:40:19 2005 Return-Path: X-Original-To: apache@hub.freebsd.org Delivered-To: freebsd-apache@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49F2716A423 for ; Thu, 6 Oct 2005 17:40:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F32B143D5D for ; Thu, 6 Oct 2005 17:40:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j96HeHpG003861 for ; Thu, 6 Oct 2005 17:40:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j96HeHGL003860; Thu, 6 Oct 2005 17:40:17 GMT (envelope-from gnats) Date: Thu, 6 Oct 2005 17:40:17 GMT Message-Id: <200510061740.j96HeHGL003860@freefall.freebsd.org> To: apache@FreeBSD.org From: Brian Fundakowski Feldman Cc: Subject: Re: ports/86963: mod_auth_kerb defaults to installing MIT Kerberos and won't work with Heimdal X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Brian Fundakowski Feldman List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2005 17:40:19 -0000 The following reply was made to PR ports/86963; it has been noted by GNATS. From: Brian Fundakowski Feldman To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/86963: mod_auth_kerb defaults to installing MIT Kerberos and won't work with Heimdal Date: Thu, 6 Oct 2005 13:25:36 -0400 These changes fix a lot of the other problems -- letting you select between base versus port Kerberos 5, making the description more sane, fixing the plist for apache2 and passing portlint -C. Index: Makefile =================================================================== RCS file: /export/ncvs/ports/www/mod_auth_kerb/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- Makefile 1 Aug 2005 09:28:29 -0000 1.12 +++ Makefile 6 Oct 2005 17:22:45 -0000 @@ -9,10 +9,12 @@ PORTNAME= mod_auth_kerb PORTVERSION= 5.0.r6 -DISTNAME= mod_auth_kerb-5.0-rc6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=modauthkerb +DISTNAME= mod_auth_kerb-5.0-rc6 + MAINTAINER= apache@FreeBSD.org COMMENT= An Apache module for authenticating users with Kerberos v5 @@ -22,16 +24,31 @@ # (i.e., HTTP over SSL/TLS). Thus, we require as a dependency # a version of Apache which can do this. # -LIB_DEPENDS= krb5.3:${PORTSDIR}/security/krb5 - USE_APACHE= yes - -KRB5_HOME?= ${LOCALBASE} - # Don't fsck with CFLAGS CFLAGS:= - GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME} --without-krb4 +OPTIONS+= BASE_KERBEROS5 "Use the base Kerberos 5 (Heimdal)" +.if exists(/usr/lib/libkrb5.so) +OPTIONS+= on +.else +OPTIONS+= off +.endif + +.include + +.if exists(${PREFIX}/sbin/apxs) +APACHE_MODULE_DIR!=${PREFIX}/sbin/apxs -q LIBEXECDIR +.else +APACHE_MODULE_DIR=libexec/apache +.endif +PLIST_SUB+= APMODDIR=${APACHE_MODULE_DIR:S/^${PREFIX}\///} +.if defined(WITH_BASE_KERBEROS5) +KRB5_HOME= /usr +.else +LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 +KRB5_HOME= ${LOCALBASE} +.endif -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\