From owner-svn-ports-all@freebsd.org Wed Nov 4 02:29:39 2015 Return-Path: Delivered-To: svn-ports-all@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 EB3A0A25D7A; Wed, 4 Nov 2015 02:29:39 +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 B09B214AF; Wed, 4 Nov 2015 02:29:39 +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 tA42TcEB071320; Wed, 4 Nov 2015 02:29:38 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA42TcN7071319; Wed, 4 Nov 2015 02:29:38 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201511040229.tA42TcN7071319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Wed, 4 Nov 2015 02:29:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400730 - 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Nov 2015 02:29:40 -0000 Author: cy Date: Wed Nov 4 02:29:38 2015 New Revision: 400730 URL: https://svnweb.freebsd.org/changeset/ports/400730 Log: Simplify and standardize port structure. Submitted by: hrs Modified: head/security/pam_krb5/Makefile Modified: head/security/pam_krb5/Makefile ============================================================================== --- head/security/pam_krb5/Makefile Wed Nov 4 02:16:18 2015 (r400729) +++ head/security/pam_krb5/Makefile Wed Nov 4 02:29:38 2015 (r400730) @@ -23,36 +23,16 @@ OPTIONS_SINGLE= LINK OPTIONS_SINGLE_LINK= MIT HEIMDAL_BASE HEIMDAL_PORT OPTIONS_DEFAULT= MIT MIT_DESC= Link against MIT Kerberos +MIT_USES= gssapi:mit HEIMDAL_PORT_DESC= Link against Heimdal in ports Kerberos +HEIMDAL_PORT_USES= gssapi:heimdal HEIMDAL_BASE_DESC= Link against Heimdal in base Kerberos +HEIMDAL_BASE_USES= gssapi:base -.include - -.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}" \ - --with-krb5-include="${KRB5_DIR}/include/heimdal" \ - --with-krb5-lib="${KRB5_DIR}/lib/heimdal" -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= KRB5_IMPL option must be set -.endif +CONFIGURE_ARGS+= --with-krb5="${GSSAPIBASEDIR}" \ + --with-krb5-include="${GSSAPIINCDIR}" \ + --with-krb5-lib="${GSSAPILIBDIR}" +CONFIGURE_ENV= PATH_KRB5_CONFIG="${KRB5CONFIG}" MANDIR= ${STAGEDIR}${MANPREFIX}/man