Fri Oct 2 13:26:10 2020 UTC ()
xlockmore: ftgl should be disabled if tty is

avoids it being picked up by other means resulting in mysterious build
errors


(nia)
diff -r1.145 -r1.146 pkgsrc/x11/xlockmore/Makefile
cvs diff -r1.145 -r1.146 pkgsrc/x11/xlockmore/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/Makefile 2020/08/17 20:20:39 1.145
+++ pkgsrc/x11/xlockmore/Makefile 2020/10/02 13:26:09 1.146
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.145 2020/08/17 20:20:39 leot Exp $ 1# $NetBSD: Makefile,v 1.146 2020/10/02 13:26:09 nia Exp $
2 2
3PKGREVISION= 24 3PKGREVISION= 24
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Like the XLock session-locker/screensaver, but with more 6COMMENT= Like the XLock session-locker/screensaver, but with more
7 7
8CONFLICTS+= xlockmore-lite-[0-9]* 8CONFLICTS+= xlockmore-lite-[0-9]*
9 9
10CONFIGURE_ARGS+= --with-opengl 10CONFIGURE_ARGS+= --with-opengl
11CONFIGURE_ARGS+= --with-mesa 11CONFIGURE_ARGS+= --with-mesa
 12CONFIGURE_ARGS+= --without-ftgl
12CONFIGURE_ARGS+= --without-ttf 13CONFIGURE_ARGS+= --without-ttf
13XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib 14XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
14CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q} 15CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q}
15OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib 16OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
16CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q} 17CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q}
17MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib 18MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
18CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q} 19CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q}
19#BUILDLINK_TRANSFORM+= l:MesaGL:GL 20#BUILDLINK_TRANSFORM+= l:MesaGL:GL
20#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU 21#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU
21XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib 22XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
22CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q} 23CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q}
23 24
24PLIST_SUBST+= LITE="" 25PLIST_SUBST+= LITE=""