From owner-svn-ports-head@freebsd.org Wed Oct 14 03:46:53 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6149DA126CF; Wed, 14 Oct 2015 03:46:53 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 305461B25; Wed, 14 Oct 2015 03:46:53 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9E3kqGA088230; Wed, 14 Oct 2015 03:46:52 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9E3kqE6088229; Wed, 14 Oct 2015 03:46:52 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201510140346.t9E3kqE6088229@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 14 Oct 2015 03:46:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399238 - head/security/pam_krb5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 03:46:53 -0000 Author: cy Date: Wed Oct 14 03:46:52 2015 New Revision: 399238 URL: https://svnweb.freebsd.org/changeset/ports/399238 Log: Replace HEIMDAL option with HEIMDAL_PORTS and HEIMDAL_BASE. Modified: head/security/pam_krb5/Makefile Modified: head/security/pam_krb5/Makefile ============================================================================== --- head/security/pam_krb5/Makefile Wed Oct 14 03:44:52 2015 (r399237) +++ head/security/pam_krb5/Makefile Wed Oct 14 03:46:52 2015 (r399238) @@ -16,31 +16,42 @@ CONFLICTS= pam_krb5-rh-2.* GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= gmake libtool perl5 +USE_PERL5= build OPTIONS_SINGLE= LINK -OPTIONS_SINGLE_LINK= MIT HEIMDAL +OPTIONS_SINGLE_LINK= MIT HEIMDAL_BASE HEIMDAL_PORT OPTIONS_DEFAULT= MIT MIT_DESC= Link against MIT Kerberos -HEIMDAL_DESC= Link against Heimdal Kerberos +HEIMDAL_PORT_DESC= Link against Heimdal in ports Kerberos +HEIMDAL_BASE_DESC= Link against Heimdal in base Kerberos .include -.if ${PORT_OPTIONS:MHEIMDAL} +.if ${PORT_OPTIONS:MHEIMDAL_BASE} +USES+= gssapi:base +.elif ${PORT_OPTIONS:MHEIMDAL_PORT} +USES+= gssapi:heimdal .if defined(HEIMDAL_HOME) KRB5_DIR?= ${HEIMDAL_HOME} +.else +KRB5_DIR?= ${LOCALBASE} .endif +CONFIGURE_ARGS+= --with-krb5="${KRB5_DIR}" +CONFIGURE_ENV= PATH_KRB5_CONFIG=${KRB5_DIR}/bin/krb5-config .elif ${PORT_OPTIONS:MMIT} +USES+= gssapi:mit LIB_DEPENDS= libkrb5.so.3:${PORTSDIR}/security/krb5 .if defined(KRB5_HOME) KRB5_DIR?= ${KRB5_HOME} +.else +KRB5_DIR?= ${LOCALBASE} .endif +CONFIGURE_ARGS+= --with-krb5="${KRB5_DIR}" .else -IGNORE= you must define KRB5_IMPL to be "mit" or "heimdal" +IGNORE= KRB5_IMPL option must be set .endif MANDIR= ${STAGEDIR}${MANPREFIX}/man -KRB5_DIR?= ${LOCALBASE} -CONFIGURE_ARGS= --with-krb5="${KRB5_DIR}" post-install: cd ${WRKSRC} && ${MAKE_CMD} install-man DESTDIR=${STAGEDIR}