ports/86963: mod_auth_kerb defaults to installing MIT Kerberos and won't work with Heimdal

[Brian Fundakowski Feldman]

The following reply was made to PR ports/86963; it has been noted by GNATS.

From: Brian Fundakowski Feldman <green at FreeBSD.org>
To: FreeBSD-gnats-submit at 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 at 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 <bsd.port.pre.mk>
 +
 +.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 at FreeBSD.org                               \  The Power to Serve! \
  Opinions expressed are my own.                       \,,,,,,,,,,,,,,,,,,,,,,\