Make these fail with a comprehensible error message when X11_TYPE != native.diff -r1.23 -r1.24 pkgsrc/x11/Xfixes/Makefile
(dholland)
@@ -1,32 +1,35 @@ | @@ -1,32 +1,35 @@ | |||
1 | # $NetBSD: Makefile,v 1.23 2007/02/22 19:27:25 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.24 2008/09/08 07:02:52 dholland Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= libXfixes-2.0.1 | 4 | DISTNAME= libXfixes-2.0.1 | |
5 | PKGNAME= ${DISTNAME:S/libX/X/} | 5 | PKGNAME= ${DISTNAME:S/libX/X/} | |
6 | PKGREVISION= 4 | 6 | PKGREVISION= 4 | |
7 | CATEGORIES= x11 devel | 7 | CATEGORIES= x11 devel | |
8 | MASTER_SITES= http://xlibs.freedesktop.org/release/ | 8 | MASTER_SITES= http://xlibs.freedesktop.org/release/ | |
9 | EXTRACT_SUFX= .tar.bz2 | 9 | EXTRACT_SUFX= .tar.bz2 | |
10 | 10 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://freedesktop.org/ | 12 | HOMEPAGE= http://freedesktop.org/ | |
13 | COMMENT= X Fixes extension of X RandR | 13 | COMMENT= X Fixes extension of X RandR | |
14 | 14 | |||
15 | CONFLICTS+= libXfixes-[0-9]* | 15 | CONFLICTS+= libXfixes-[0-9]* | |
16 | .if "${X11_TYPE}" != "native" | |||
17 | PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead." | |||
18 | .endif | |||
16 | 19 | |||
17 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 20 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
18 | 21 | |||
19 | USE_TOOLS+= pkg-config | 22 | USE_TOOLS+= pkg-config | |
20 | USE_LIBTOOL= yes | 23 | USE_LIBTOOL= yes | |
21 | GNU_CONFIGURE= yes | 24 | GNU_CONFIGURE= yes | |
22 | 25 | |||
23 | PKGCONFIG_OVERRIDE+= xfixes.pc.in | 26 | PKGCONFIG_OVERRIDE+= xfixes.pc.in | |
24 | 27 | |||
25 | .include "../../mk/bsd.prefs.mk" | 28 | .include "../../mk/bsd.prefs.mk" | |
26 | .if (${OPSYS} == "Darwin") | 29 | .if (${OPSYS} == "Darwin") | |
27 | CFLAGS+= -fno-common | 30 | CFLAGS+= -fno-common | |
28 | .endif | 31 | .endif | |
29 | 32 | |||
30 | .include "../../x11/fixesproto/buildlink3.mk" | 33 | .include "../../x11/fixesproto/buildlink3.mk" | |
31 | .include "../../mk/x11.buildlink3.mk" | 34 | .include "../../mk/x11.buildlink3.mk" | |
32 | .include "../../mk/bsd.pkg.mk" | 35 | .include "../../mk/bsd.pkg.mk" |
@@ -1,27 +1,30 @@ | @@ -1,27 +1,30 @@ | |||
1 | # $NetBSD: Makefile,v 1.33 2007/01/03 22:12:25 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.34 2008/09/08 07:02:52 dholland Exp $ | |
2 | 2 | |||
3 | DISTNAME= libXrender-0.9.0 | 3 | DISTNAME= libXrender-0.9.0 | |
4 | PKGNAME= ${DISTNAME:S/lib//} | 4 | PKGNAME= ${DISTNAME:S/lib//} | |
5 | PKGREVISION= 2 | 5 | PKGREVISION= 2 | |
6 | CATEGORIES= x11 | 6 | CATEGORIES= x11 | |
7 | MASTER_SITES= http://xlibs.freedesktop.org/release/ | 7 | MASTER_SITES= http://xlibs.freedesktop.org/release/ | |
8 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
9 | 9 | |||
10 | MAINTAINER= pkgsrc-users@NetBSD.org | 10 | MAINTAINER= pkgsrc-users@NetBSD.org | |
11 | HOMEPAGE= http://fontconfig.org/ | 11 | HOMEPAGE= http://fontconfig.org/ | |
12 | COMMENT= Client library for the X Rendering Extension protocol | 12 | COMMENT= Client library for the X Rendering Extension protocol | |
13 | 13 | |||
14 | CONFLICTS+= libXrender-[0-9]* | 14 | CONFLICTS+= libXrender-[0-9]* | |
15 | .if "${X11_TYPE}" != "native" | |||
16 | PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead." | |||
17 | .endif | |||
15 | 18 | |||
16 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 19 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
17 | PKG_DESTDIR_SUPPORT= user-destdir | 20 | PKG_DESTDIR_SUPPORT= user-destdir | |
18 | 21 | |||
19 | USE_TOOLS+= pkg-config | 22 | USE_TOOLS+= pkg-config | |
20 | USE_LIBTOOL= YES | 23 | USE_LIBTOOL= YES | |
21 | GNU_CONFIGURE= YES | 24 | GNU_CONFIGURE= YES | |
22 | PKGCONFIG_OVERRIDE= xrender.pc.in | 25 | PKGCONFIG_OVERRIDE= xrender.pc.in | |
23 | CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:Q} | 26 | CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:Q} | |
24 | 27 | |||
25 | .include "../../x11/renderproto/buildlink3.mk" | 28 | .include "../../x11/renderproto/buildlink3.mk" | |
26 | .include "../../mk/x11.buildlink3.mk" | 29 | .include "../../mk/x11.buildlink3.mk" | |
27 | .include "../../mk/bsd.pkg.mk" | 30 | .include "../../mk/bsd.pkg.mk" |