Attachment 191637 Details for Bug 226396 – [patch] add KERBEROS option (plus a couple other changes)

[patch] [patch] add KERBEROS option (plus a couple other changes)

pr-krbopt-v6.diff (text/plain), 3.40 KB, created by John Hein on 2018-03-19 18:26:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2018-03-19 18:26:12 UTC

Size: 3.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 465006)
>+++ Makefile	(working copy)
>@@ -27,16 +27,12 @@
> CONFLICTS_INSTALL=	wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \
> 			i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
> 
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--verbose \
>-		--disable-kerberos \
> 		--disable-tests \
> 		--without-alsa --without-capi --without-dbus \
> 		--without-gettext --without-gettextpo \
> 		--without-gphoto --without-gsm --without-gstreamer \
>-		--without-krb5 \
> 		--without-opencl \
> 		--without-osmesa \
> 		--with-oss \
>@@ -46,7 +42,7 @@
> 		--without-udev
> CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
> WINELIBDIR?=	${PREFIX}/lib
>-USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:xz
>+USES=		bison compiler:c11 desktop-file-utils gmake pkgconfig shebangfix tar:xz
> .if !defined(USE_LDCONFIG32)
> USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
> .endif
>@@ -59,7 +55,12 @@
> PORTDATA=	l_intl.nls wine.inf
> 
> OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L WINEMAKER X11 GECKO MONO
>-OPTIONS_DEFAULT=GNUTLS X11
>+OPTIONS_DEFAULT=GNUTLS GSSAPI_NONE X11
>+
>+OPTIONS_SINGLE=		GSSAPI
>+#OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
>+OPTIONS_SINGLE_GSSAPI=	GSSAPI_MIT GSSAPI_NONE
>+
> OPTIONS_SUB=	yes
> 
> DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
>@@ -70,6 +71,7 @@
> 
> CUPS_CONFIGURE_WITH=	cups
> CUPS_LIB_DEPENDS=	libcups.so:print/cups
>+CUPS_USES=		localbase
> 
> DOSBOX_RUN_DEPENDS=	dosbox:emulators/dosbox
> 
>@@ -78,11 +80,21 @@
> GNUTLS_CONFIGURE_WITH=	gnutls
> GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
> 
>+GSSAPI_NONE_CONFIGURE_OFF=	KRB5CONFIG="${KRB5CONFIG}" --with-gssapi
>+#GSSAPI_NONE_CONFIGURE_ON=	--disable-kerberos --without-gssapi
>+GSSAPI_NONE_CONFIGURE_ON=	--disable-kerberos
>+# XXX comment out base for now... need to address #include krb5/krb5.h (patch or sym link)
>+#GSSAPI_BASE_USES=	gssapi
>+# XXX HEIMDAL does not have gssapi_ext.h
>+#GSSAPI_HEIMDAL_USES=	gssapi:heimdal
>+GSSAPI_MIT_USES=	gssapi:mit
>+
> HAL_CONFIGURE_WITH=	hal
> HAL_LIB_DEPENDS=	libhal.so:sysutils/hal
> 
> LDAP_CONFIGURE_WITH=	ldap
> LDAP_USE=		OPENLDAP=yes
>+LDAP_USES=		localbase
> 
> LIBXSLT_CONFIGURE_WITH=	xslt
> LIBXSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
>@@ -91,13 +103,15 @@
> 
> MPG123_CONFIGURE_WITH=	mpg123
> MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
>+MPG123_USES=		localbase
> 
> OPENAL_CONFIGURE_WITH=	openal
>-OPENAL_USES=		openal
>+OPENAL_USES=		localbase openal
> 
> V4L_CONFIGURE_WITH=	v4l
> V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
> V4L_LIB_DEPENDS=	libv4l1.so:multimedia/libv4l
>+V4L_USES=		localbase
> 
> WINEMAKER_RUN_DEPENDS=	p5-XML-LibXML>0:textproc/p5-XML-LibXML
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 465006)
>+++ pkg-plist	(working copy)
>@@ -1868,6 +1868,7 @@
> lib/wine/fakedlls/joy.cpl
> lib/wine/fakedlls/jscript.dll
> lib/wine/fakedlls/jsproxy.dll
>+%%NO_GSSAPI_NONE%%lib/wine/fakedlls/kerberos.dll
> lib/wine/fakedlls/kernel32.dll
> lib/wine/fakedlls/kernelbase.dll
> %%WINE32%%lib/wine/fakedlls/keyboard.drv16
>@@ -2346,6 +2347,7 @@
> lib/wine/joy.cpl.so
> lib/wine/jscript.dll.so
> lib/wine/jsproxy.dll.so
>+%%NO_GSSAPI_NONE%%lib/wine/kerberos.dll.so
> lib/wine/kernel32.dll.so
> lib/wine/kernelbase.dll.so
> %%WINE32%%lib/wine/keyboard.drv16.so

Actions: View | Diff

Attachments on bug 226396: 191254 | 191637 | 191640