Attachment 207409 Details for Bug 240526 – [patch] allow multiple values for XLOCKLIBS, fix KERBEROS5

[patch] [patch] allow multiple values for XLOCKLIBS, fix KERBEROS5

pr-xlockmore-fix-XLOCKLIBS.diff (text/plain), 1.43 KB, created by John Hein on 2019-09-12 09:04:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2019-09-12 09:04:08 UTC

Size: 1.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 511621)
>+++ Makefile	(working copy)
>@@ -52,6 +52,7 @@
> 
> JP_IMPLIES=	MB
> 
>+CONFIGURE_ENV+=	XLOCKLIBS="${XLOCKLIBS}"
> MAKE_ARGS+=	bindir=${PREFIX}/bin \
> 		mandir=${PREFIX}/man/man1 \
> 		datarootdir=${PREFIX}/share \
>@@ -58,13 +59,14 @@
> 		xapploaddir=${PREFIX}/lib/X11/app-defaults
> 
> MESAGL_CONFIGURE_WITH=	mesa
>-MESAGL_VARS=	CFLAGS+="-I${LOCALBASE}/include/FTGL -I${LOCALBASE}/include/freetype2" USE_GL=yes
>+MESAGL_USES=	gl
>+MESAGL_USE=	GL=gl,glu
>+MESAGL_VARS=	CFLAGS+="-I${LOCALBASE}/include/FTGL -I${LOCALBASE}/include/freetype2" XLOCKLIBS+="-lpthread"
> MESAGL_LIB_DEPENDS=	libftgl.so:graphics/ftgl
>-MESAGL_CONFIGURE_ENV=	XLOCKLIBS="-lpthread"
> MESAGL_CONFIGURE_OFF=	--without-opengl --without-ftgl
> KERBEROS5_CONFIGURE_ENABLE=	kerberos5
>-KERBEROS5_VARS=		CFLAGS+=-I${KRB5_HOME}/include KRB5LIB=-L${KRB5_HOME}/lib
>-KERBEROS5_CONFIGURE_ENV=	XLOCKLIBS="${KRB5LIB}"
>+KERBEROS5_VARS=		CFLAGS+=-I${KRB5_HOME}/include XLOCKLIBS+="-L${KRB5_HOME}/lib ${GSSAPILIBS} -lcom_err"
>+KERBEROS5_USES=		gssapi:mit
> BAD_PAM_CONFIGURE_ENABLE=	bad-pam
> PAM_CONFIGURE_ENABLE=	pam
> NICE_ONLY_CONFIGURE_ENABLE=	nice-only
>@@ -89,10 +91,6 @@
> CONFIGURE_ARGS+=	--with-lang=${XLOCKMORE_LANG}
> .endif
> 
>-.if ${PORT_OPTIONS:MKERBEROS5} && empty(KRB5_HOME)
>-BROKEN=	KRB5_HOME is undefined!
>-.endif
>-
> .if ${PORT_OPTIONS:MPAM} && empty(PORT_OPTIONS:MBAD_PAM)
> pre-extract:
> 	@${ECHO}

Flags:

jcfyecrayz: maintainer-approval? (jgh)

Actions: View | Diff

Attachments on bug 240526: 207409