diff options
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/gssapi.mk | 17 | ||||
| -rw-r--r-- | Mk/Uses/pathfix.mk | 3 | ||||
| -rw-r--r-- | Mk/Uses/xorg-cat.mk | 7 |
3 files changed, 18 insertions, 9 deletions
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk index 46eea2d10071..fecf29895a5a 100644 --- a/Mk/Uses/gssapi.mk +++ b/Mk/Uses/gssapi.mk @@ -86,6 +86,18 @@ _local:= ${_A} . if ${SSL_DEFAULT} != base IGNORE= You are using OpenSSL from ports and have selected GSSAPI from base, please select another GSSAPI value . endif +. if exists(/usr/libexec/krb5kdc) + # Base has MIT KRB5 installed +KRB5_HOME?= /usr +GSSAPIBASEDIR= ${KRB5_HOME} +GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib +GSSAPIINCDIR= ${GSSAPIBASEDIR}/include +_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h +GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" +GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 +GSSAPILDFLAGS= +. else + # Base has Heimdal KRB5 installed HEIMDAL_HOME= /usr GSSAPIBASEDIR= ${HEIMDAL_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib @@ -94,7 +106,9 @@ _HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h GSSAPICPPFLAGS= -I"${GSSAPIINCDIR}" GSSAPILIBS= -lkrb5 -lgssapi -lgssapi_krb5 GSSAPILDFLAGS= +. endif . elif ${_local} == "heimdal" + # Heimdal port selected HEIMDAL_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${HEIMDAL_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib/heimdal @@ -111,11 +125,12 @@ GSSAPILIBS= -lkrb5 -lgssapi GSSAPILDFLAGS= -L"${GSSAPILIBDIR}" _RPATH= ${GSSAPILIBDIR} . elif ${_local} == "mit" + # MIT KRB5 port selected KRB5_HOME?= ${LOCALBASE} GSSAPIBASEDIR= ${KRB5_HOME} GSSAPILIBDIR= ${GSSAPIBASEDIR}/lib GSSAPIINCDIR= ${GSSAPIBASEDIR}/include -_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h +_HEADERS+= gssapi/gssapi.h gssapi/gssapi_krb5.h krb5/krb5.h . if !defined(_KRB_BOOTSTRAP) BUILD_DEPENDS+= ${_MITKRB5_DEPENDS} RUN_DEPENDS+= ${_MITKRB5_DEPENDS} diff --git a/Mk/Uses/pathfix.mk b/Mk/Uses/pathfix.mk index 049224a15621..57c734f93cb3 100644 --- a/Mk/Uses/pathfix.mk +++ b/Mk/Uses/pathfix.mk @@ -54,8 +54,7 @@ pathfix: s|[{]datadir[}]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]prefix[)]/lib/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ s|[(]prefix[)]/share/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ - s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g; \ - s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' + s|[[:<:]]lib/pkgconfig|libdata/pkgconfig|g' . endfor . endif diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk index 0853fd6b3e3c..b81972b4ae5f 100644 --- a/Mk/Uses/xorg-cat.mk +++ b/Mk/Uses/xorg-cat.mk @@ -14,8 +14,6 @@ # * font don't install .pc file # * lib various dependencies, install .pc file, needs # pathfix -# * proto install .pc file, needs pathfix, most only needed at -# build time. # * util no particular notes # # These categories has to match upstream categories. Don't invent @@ -34,7 +32,7 @@ .if !defined(_INCLUDE_USES_XORG_CAT_MK) _INCLUDE_USES_XORG_CAT_MK=yes -_XORG_CATEGORIES= app data doc driver font lib proto util +_XORG_CATEGORIES= app data doc driver font lib util _XORG_BUILDSYSTEMS= autotools meson _XORG_CAT= # empty @@ -158,9 +156,6 @@ USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-malloc0returnsnull . endif -. elif ${_XORG_CAT} == proto -.include "${USESDIR}/pathfix.mk" - . endif # ${_XORG_CAT} == <category> # We only need to include xorg.mk if we want USE_XORG modules |