Mon Apr 11 04:59:11 2016 UTC ()
match x11 and xcb options to cairo package


(dbj)
diff -r1.31 -r1.32 pkgsrc/graphics/cairo-gobject/Makefile
cvs diff -r1.31 -r1.32 pkgsrc/graphics/cairo-gobject/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cairo-gobject/Makefile 2015/11/06 11:15:52 1.31
+++ pkgsrc/graphics/cairo-gobject/Makefile 2016/04/11 04:59:10 1.32
@@ -1,22 +1,41 @@ @@ -1,22 +1,41 @@
1# $NetBSD: Makefile,v 1.31 2015/11/06 11:15:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2016/04/11 04:59:10 dbj Exp $
2 2
3.include "../../graphics/cairo/Makefile.common" 3.include "../../graphics/cairo/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-/-gobject-/} 5PKGNAME= ${DISTNAME:S/-/-gobject-/}
6 6
7BUILD_DIRS= util/cairo-gobject 7BUILD_DIRS= util/cairo-gobject
8INSTALL_DIRS= util/cairo-gobject 8INSTALL_DIRS= util/cairo-gobject
9 9
10INSTALLATION_DIRS+= lib/pkgconfig 10INSTALLATION_DIRS+= lib/pkgconfig
11 11
12.include "../../mk/bsd.prefs.mk" 12.include "../../mk/bsd.prefs.mk"
13 13
14post-install: 14post-install:
15 ${INSTALL_DATA} ${WRKSRC}/src/cairo-gobject.pc \ 15 ${INSTALL_DATA} ${WRKSRC}/src/cairo-gobject.pc \
16 ${DESTDIR}${PREFIX}/lib/pkgconfig 16 ${DESTDIR}${PREFIX}/lib/pkgconfig
17 17
 18.include "../../graphics/cairo/buildlink3.mk"
 19###
 20### X11 and XCB support (XCB implies X11)
 21###
 22### This matches the logic in ../../graphics/cairo/options.mk
 23###
 24.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11) || !empty(PKG_BUILD_OPTIONS.cairo:Mxcb)
 25CONFIGURE_ARGS+= --enable-xlib
 26CONFIGURE_ARGS+= --enable-xlib-xrender
 27. if !empty(PKG_BUILD_OPTIONS.cairo:Mxcb)
 28CONFIGURE_ARGS+= --enable-xcb
 29. else
 30CONFIGURE_ARGS+= --disable-xcb
 31. endif
 32.else
 33CONFIGURE_ARGS+= --disable-xlib
 34CONFIGURE_ARGS+= --disable-xlib-xrender
 35CONFIGURE_ARGS+= --disable-xcb
 36.endif
 37
18BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.14.0 38BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.14.0
19.include "../../devel/glib2/buildlink3.mk" 39.include "../../devel/glib2/buildlink3.mk"
20.include "../../graphics/cairo/buildlink3.mk" 
21.include "../../mk/pthread.buildlink3.mk" 40.include "../../mk/pthread.buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"