Mon Sep 8 07:02:52 2008 UTC ()
Make these fail with a comprehensible error message when X11_TYPE != native.


(dholland)
diff -r1.23 -r1.24 pkgsrc/x11/Xfixes/Makefile
diff -r1.33 -r1.34 pkgsrc/x11/Xrender/Makefile
cvs diff -r1.23 -r1.24 pkgsrc/x11/Xfixes/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/Xfixes/Attic/Makefile 2007/02/22 19:27:25 1.23
+++ pkgsrc/x11/Xfixes/Attic/Makefile 2008/09/08 07:02:52 1.24
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
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
4DISTNAME= libXfixes-2.0.1 4DISTNAME= libXfixes-2.0.1
5PKGNAME= ${DISTNAME:S/libX/X/} 5PKGNAME= ${DISTNAME:S/libX/X/}
6PKGREVISION= 4 6PKGREVISION= 4
7CATEGORIES= x11 devel 7CATEGORIES= x11 devel
8MASTER_SITES= http://xlibs.freedesktop.org/release/ 8MASTER_SITES= http://xlibs.freedesktop.org/release/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://freedesktop.org/ 12HOMEPAGE= http://freedesktop.org/
13COMMENT= X Fixes extension of X RandR 13COMMENT= X Fixes extension of X RandR
14 14
15CONFLICTS+= libXfixes-[0-9]* 15CONFLICTS+= libXfixes-[0-9]*
 16.if "${X11_TYPE}" != "native"
 17PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead."
 18.endif
16 19
17PKG_INSTALLATION_TYPES= overwrite pkgviews 20PKG_INSTALLATION_TYPES= overwrite pkgviews
18 21
19USE_TOOLS+= pkg-config 22USE_TOOLS+= pkg-config
20USE_LIBTOOL= yes 23USE_LIBTOOL= yes
21GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
22 25
23PKGCONFIG_OVERRIDE+= xfixes.pc.in 26PKGCONFIG_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")
27CFLAGS+= -fno-common 30CFLAGS+= -fno-common
28.endif 31.endif
cvs diff -r1.33 -r1.34 pkgsrc/x11/Xrender/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/Xrender/Attic/Makefile 2007/01/03 22:12:25 1.33
+++ pkgsrc/x11/Xrender/Attic/Makefile 2008/09/08 07:02:52 1.34
@@ -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
3DISTNAME= libXrender-0.9.0 3DISTNAME= libXrender-0.9.0
4PKGNAME= ${DISTNAME:S/lib//} 4PKGNAME= ${DISTNAME:S/lib//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= http://xlibs.freedesktop.org/release/ 7MASTER_SITES= http://xlibs.freedesktop.org/release/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://fontconfig.org/ 11HOMEPAGE= http://fontconfig.org/
12COMMENT= Client library for the X Rendering Extension protocol 12COMMENT= Client library for the X Rendering Extension protocol
13 13
14CONFLICTS+= libXrender-[0-9]* 14CONFLICTS+= libXrender-[0-9]*
 15.if "${X11_TYPE}" != "native"
 16PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead."
 17.endif
15 18
16PKG_INSTALLATION_TYPES= overwrite pkgviews 19PKG_INSTALLATION_TYPES= overwrite pkgviews
17PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
18 21
19USE_TOOLS+= pkg-config 22USE_TOOLS+= pkg-config
20USE_LIBTOOL= YES 23USE_LIBTOOL= YES
21GNU_CONFIGURE= YES 24GNU_CONFIGURE= YES
22PKGCONFIG_OVERRIDE= xrender.pc.in 25PKGCONFIG_OVERRIDE= xrender.pc.in
23CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:Q} 26CONFIGURE_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"