Mon Sep 10 00:06:07 2018 UTC ()
xlockmore{,-lite}: restore CONFLICTS.


(maya)
diff -r1.133 -r1.134 pkgsrc/x11/xlockmore/Makefile
diff -r1.22 -r1.23 pkgsrc/x11/xlockmore-lite/Makefile
cvs diff -r1.133 -r1.134 pkgsrc/x11/xlockmore/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/Makefile 2018/04/17 22:29:53 1.133
+++ pkgsrc/x11/xlockmore/Makefile 2018/09/10 00:06:07 1.134
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.133 2018/04/17 22:29:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.134 2018/09/10 00:06:07 maya Exp $
2 2
3PKGREVISION= 14 3PKGREVISION= 14
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]*
 9
8CONFIGURE_ARGS+= --with-opengl 10CONFIGURE_ARGS+= --with-opengl
9CONFIGURE_ARGS+= --with-mesa 11CONFIGURE_ARGS+= --with-mesa
10CONFIGURE_ARGS+= --without-ttf 12CONFIGURE_ARGS+= --without-ttf
11XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib 13XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
12CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q} 14CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q}
13OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib 15OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
14CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q} 16CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q}
15MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib 17MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
16CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q} 18CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q}
17#BUILDLINK_TRANSFORM+= l:MesaGL:GL 19#BUILDLINK_TRANSFORM+= l:MesaGL:GL
18#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU 20#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU
19XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib 21XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
20CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q} 22CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q}
cvs diff -r1.22 -r1.23 pkgsrc/x11/xlockmore-lite/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore-lite/Makefile 2018/03/07 11:57:47 1.22
+++ pkgsrc/x11/xlockmore-lite/Makefile 2018/09/10 00:06:06 1.23
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1# $NetBSD: Makefile,v 1.22 2018/03/07 11:57:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.23 2018/09/10 00:06:06 maya Exp $
2 2
3.include "../../x11/xlockmore/Makefile.common" 3.include "../../x11/xlockmore/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-/-lite-/} 5PKGNAME= ${DISTNAME:S/-/-lite-/}
6PKGREVISION= 1 6PKGREVISION= 1
7COMMENT= "lite" version of xlockmore 7COMMENT= "lite" version of xlockmore
8 8
 9CONFLICTS+= xlockmore-[0-9]*
 10
9CONFIGURE_ARGS+= --without-xpm 11CONFIGURE_ARGS+= --without-xpm
10CONFIGURE_ARGS+= --without-gltt 12CONFIGURE_ARGS+= --without-gltt
11CONFIGURE_ARGS+= --without-ttf 13CONFIGURE_ARGS+= --without-ttf
12CONFIGURE_ARGS+= --without-freetype 14CONFIGURE_ARGS+= --without-freetype
13CONFIGURE_ARGS+= --without-opengl 15CONFIGURE_ARGS+= --without-opengl
14CONFIGURE_ARGS+= --without-magick 16CONFIGURE_ARGS+= --without-magick
15CONFIGURE_ARGS+= --without-mesa 17CONFIGURE_ARGS+= --without-mesa
16CONFIGURE_ARGS+= --without-rplay 18CONFIGURE_ARGS+= --without-rplay
17CONFIGURE_ARGS+= --without-esound 19CONFIGURE_ARGS+= --without-esound
18CONFIGURE_ARGS+= --without-gtk2 20CONFIGURE_ARGS+= --without-gtk2
19CONFIGURE_ARGS+= --without-gtk 21CONFIGURE_ARGS+= --without-gtk
20 22
21PLIST_SUBST+= LITE="@comment Not in lite version: " 23PLIST_SUBST+= LITE="@comment Not in lite version: "