| @@ -1,62 +1,64 @@ | | | @@ -1,62 +1,64 @@ |
1 | # $NetBSD: Makefile,v 1.36 2014/04/29 10:27:33 obache Exp $ | | 1 | # $NetBSD: Makefile,v 1.37 2014/05/27 04:45:33 rodent Exp $ |
2 | | | 2 | |
3 | DISTNAME= libX11-1.6.2 | | 3 | DISTNAME= libX11-1.6.2 |
4 | CATEGORIES= x11 devel | | 4 | CATEGORIES= x11 devel |
5 | MASTER_SITES= ${MASTER_SITE_XORG:=lib/} | | 5 | MASTER_SITES= ${MASTER_SITE_XORG:=lib/} |
6 | EXTRACT_SUFX= .tar.bz2 | | 6 | EXTRACT_SUFX= .tar.bz2 |
7 | | | 7 | |
8 | MAINTAINER= joerg@NetBSD.org | | 8 | MAINTAINER= joerg@NetBSD.org |
9 | HOMEPAGE= http://xorg.freedesktop.org/ | | 9 | HOMEPAGE= http://xorg.freedesktop.org/ |
10 | COMMENT= Base X libraries from modular Xorg X11 | | 10 | COMMENT= Base X libraries from modular Xorg X11 |
11 | LICENSE= mit | | 11 | LICENSE= mit |
12 | | | 12 | |
13 | PKG_INSTALLATION_TYPES= overwrite pkgviews | | 13 | PKG_INSTALLATION_TYPES= overwrite pkgviews |
14 | | | 14 | |
15 | USE_LIBTOOL= yes | | 15 | USE_LIBTOOL= yes |
16 | GNU_CONFIGURE= yes | | 16 | GNU_CONFIGURE= yes |
17 | USE_TOOLS+= gmake pkg-config | | 17 | USE_TOOLS+= gmake pkg-config |
18 | | | 18 | |
19 | CONFIGURE_ARGS+= --enable-man-pages=3 | | 19 | CONFIGURE_ARGS+= --enable-man-pages=3 |
20 | CONFIGURE_ARGS+= --with-xcb | | 20 | CONFIGURE_ARGS+= --with-xcb |
21 | CONFIGURE_ARGS+= --disable-specs | | 21 | CONFIGURE_ARGS+= --disable-specs |
22 | PKGCONFIG_OVERRIDE+= x11.pc.in | | 22 | PKGCONFIG_OVERRIDE+= x11.pc.in |
23 | | | 23 | |
24 | CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 | | 24 | CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 |
25 | | | 25 | |
26 | .include "../../mk/bsd.prefs.mk" | | 26 | .include "../../mk/bsd.prefs.mk" |
27 | | | 27 | |
28 | .if ${OPSYS} == "NetBSD" | | 28 | .if ${OPSYS} == "NetBSD" |
29 | CONFIGURE_ARGS+= --disable-malloc0returnsnull | | 29 | CONFIGURE_ARGS+= --disable-malloc0returnsnull |
30 | .endif | | 30 | .endif |
31 | | | 31 | |
32 | CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h | | 32 | .include "../../mk/pthread.buildlink3.mk" |
33 | CPPFLAGS.MirBSD+= -pthread | | 33 | CPPFLAGS.OSF1+= ${PTHREAD_CFLAGS} # Required by compiler if including pthread.h |
34 | LDFLAGS.MirBSD+= -pthread | | 34 | CPPFLAGS.MirBSD+= ${PTHREAD_CFLAGS} |
| | | 35 | LDFLAGS.MirBSD+= ${PTHREAD_LDFLAGS} |
| | | 36 | LDFLAGS.OpenBSD+= ${PTHREAD_LDFLAGS} |
35 | | | 37 | |
36 | BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1 | | 38 | BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1 |
37 | BUILDLINK_API_DEPENDS.xproto+=xproto>=7.0.17 | | 39 | BUILDLINK_API_DEPENDS.xproto+=xproto>=7.0.17 |
38 | | | 40 | |
39 | TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp | | 41 | TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp |
40 | CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" | | 42 | CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" |
41 | | | 43 | |
42 | .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) | | 44 | .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) |
43 | CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} | | 45 | CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} |
44 | | | 46 | |
45 | # XXX This needs to match the version of xcb-proto we get for the | | 47 | # XXX This needs to match the version of xcb-proto we get for the |
46 | # target by buildlink3. | | 48 | # target by buildlink3. |
47 | TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto | | 49 | TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto |
48 | .endif | | 50 | .endif |
49 | | | 51 | |
50 | .include "../../x11/bigreqsproto/buildlink3.mk" | | 52 | .include "../../x11/bigreqsproto/buildlink3.mk" |
51 | .include "../../x11/inputproto/buildlink3.mk" | | 53 | .include "../../x11/inputproto/buildlink3.mk" |
52 | .include "../../x11/kbproto/buildlink3.mk" | | 54 | .include "../../x11/kbproto/buildlink3.mk" |
53 | .include "../../x11/libXau/buildlink3.mk" | | 55 | .include "../../x11/libXau/buildlink3.mk" |
54 | .include "../../x11/libXdmcp/buildlink3.mk" | | 56 | .include "../../x11/libXdmcp/buildlink3.mk" |
55 | .include "../../x11/libxcb/buildlink3.mk" | | 57 | .include "../../x11/libxcb/buildlink3.mk" |
56 | .include "../../x11/xcmiscproto/buildlink3.mk" | | 58 | .include "../../x11/xcmiscproto/buildlink3.mk" |
57 | .include "../../x11/xextproto/buildlink3.mk" | | 59 | .include "../../x11/xextproto/buildlink3.mk" |
58 | .include "../../x11/xf86bigfontproto/buildlink3.mk" | | 60 | .include "../../x11/xf86bigfontproto/buildlink3.mk" |
59 | .include "../../x11/xproto/buildlink3.mk" | | 61 | .include "../../x11/xproto/buildlink3.mk" |
60 | .include "../../x11/xtrans/buildlink3.mk" | | 62 | .include "../../x11/xtrans/buildlink3.mk" |
61 | | | 63 | |
62 | .include "../../mk/bsd.pkg.mk" | | 64 | .include "../../mk/bsd.pkg.mk" |