diff options
| -rw-r--r-- | distrib/sets/lists/xbase/md.landisk | 6 | ||||
| -rw-r--r-- | share/mk/bsd.xconf.mk | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk index 32a1d5a87..5878ff70c 100644 --- a/distrib/sets/lists/xbase/md.landisk +++ b/distrib/sets/lists/xbase/md.landisk @@ -20,8 +20,6 @@ ./usr/X11R6/include/X11/dri/xf86dristr.h ./usr/X11R6/include/X11/extensions/dri2proto.h ./usr/X11R6/include/X11/extensions/dri2tokens.h -./usr/X11R6/include/pixman-1/pixman-version.h -./usr/X11R6/include/pixman-1/pixman.h ./usr/X11R6/include/xcb/bigreq.h ./usr/X11R6/include/xcb/composite.h ./usr/X11R6/include/xcb/damage.h @@ -116,9 +114,6 @@ ./usr/X11R6/lib/libfreetype.so.18.1 ./usr/X11R6/lib/libfreetype_pic.a ./usr/X11R6/lib/libpciaccess.so.1.0 -./usr/X11R6/lib/libpixman-1.a -./usr/X11R6/lib/libpixman-1.la -./usr/X11R6/lib/libpixman-1.so.24.4 ./usr/X11R6/lib/libpthread-stubs.a ./usr/X11R6/lib/libpthread-stubs.so.1.0 ./usr/X11R6/lib/libpthread-stubs_pic.a @@ -223,7 +218,6 @@ ./usr/X11R6/lib/pkgconfig/glu.pc ./usr/X11R6/lib/pkgconfig/glw.pc ./usr/X11R6/lib/pkgconfig/libdrm.pc -./usr/X11R6/lib/pkgconfig/pixman-1.pc ./usr/X11R6/lib/pkgconfig/pthread-stubs.pc ./usr/X11R6/lib/pkgconfig/x11-xcb.pc ./usr/X11R6/lib/pkgconfig/xcb-atom.pc diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk index c4fe5369b..ee122e671 100644 --- a/share/mk/bsd.xconf.mk +++ b/share/mk/bsd.xconf.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xconf.mk,v 1.20 2011/08/30 21:15:30 matthieu Exp $ +# $OpenBSD: bsd.xconf.mk,v 1.21 2012/03/08 07:29:29 matthieu Exp $ # Shared libs? .if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax" @@ -12,7 +12,7 @@ XENOCARA_BUILD_GL?=${XENOCARA_HAVE_SHARED_LIBS:L} XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L} # Build pixman? -.if ${MACHINE} == "vax" +.if ${MACHINE} == "vax" || ${MACHINE} == "landisk" XENOCARA_BUILD_PIXMAN?=no .else XENOCARA_BUILD_PIXMAN?=yes |