diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -2,7 +2,7 @@ # # Feature: gssapi # Usage: USES=gssapi or USES=gssapi:ARGS -# Valid ARGS: base (default, implicit), heimdal, mit. +# Valid ARGS: base (default, implicit), heimdal, mit, mit-devel. # "bootstrap" is a special prefix only for krb5 or heimdal ports, # i.e. "bootstrap,mit". # flags is a special suffix to define CFLAGS, LDFLAGS, and LDADD, @@ -39,7 +39,7 @@ # A typical example: # # OPTIONS_SINGLE= GSSAPI -# OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE +# OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_MIT_DEVEL GSSAPI_NONE # # GSSAPI_BASE_USES= gssapi # GSSAPI_BASE_CONFIGURE_ON= \ @@ -53,6 +53,10 @@ # GSSAPI_MIT_CONFIGURE_ON= \ # --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} # +# GSSAPI_MIT_DEVEL_USES= gssapi:mit-devel +# GSSAPI_MIT_DEVEL_CONFIGURE_ON= \ +# --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} +# # GSSAPI_NONE_CONFIGURE_ON= --without-gssapi # # If pathname is required for Kerberos implementation, use ${GSSAPIBASEDIR}. @@ -124,7 +128,7 @@ GSSAPILIBS= -lkrb5 -lgssapi GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" _RPATH= ${GSSAPILIBDIR} -. elif ${_local} == "mit" +. elif ${_local} == "mit" -o ${_local} == "mit-devel" # MIT KRB5 port selected KRB5_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${KRB5_HOME} @@ -132,6 +136,9 @@ GSSAPIINCDIR= ${GSSAPIBASEDIR}/include _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h . if !defined(_KRB_BOOTSTRAP) +. if ${_local} == "mit-devel" +_MITKRB5_DEPENDS=${_MITKRB5_DEPENDS}-devel +. endif BUILD_DEPENDS+= ${_MITKRB5_DEPENDS} RUN_DEPENDS+= ${_MITKRB5_DEPENDS} . else diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk --- a/Mk/bsd.options.desc.mk +++ b/Mk/bsd.options.desc.mk @@ -148,6 +148,7 @@ GSSAPI_DESC?= GSSAPI Security API support GSSAPI_HEIMDAL_DESC?= GSSAPI support via security/heimdal GSSAPI_MIT_DESC?= GSSAPI support via security/krb5 +GSSAPI_MIT_DEVEL_DESC?= GSSAPI support via security/krb5-devel GSSAPI_NONE_DESC?= Disable GSSAPI support GSTREAMER_DESC?= Multimedia support via GStreamer GTA_DESC?= Generic Tagged Array (GTA) support