diff options
| author | dholland <dholland> | 2008-09-08 18:40:52 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2008-09-08 18:40:52 +0000 |
| commit | 3b9b44ba81674a7002368d1146d5e7f082239b42 (patch) | |
| tree | a0052e302e2364d05fbc7d016058fb55f2d22ff0 /x11 | |
| parent | 0eeca2a7e5051f998e9fc25d12f998b4acfcff22 (diff) | |
| download | pkgsrc-3b9b44ba81674a7002368d1146d5e7f082239b42.tar.gz | |
Fix my previous commit, which was borked in some cases. Noted by gson@.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/Xfixes/Makefile | 10 | ||||
| -rw-r--r-- | x11/Xrender/Makefile | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile index 992f025c962..27b0c478ac1 100644 --- a/x11/Xfixes/Makefile +++ b/x11/Xfixes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/09/08 07:02:52 dholland Exp $ +# $NetBSD: Makefile,v 1.25 2008/09/08 18:40:52 dholland Exp $ # DISTNAME= libXfixes-2.0.1 @@ -13,9 +13,6 @@ HOMEPAGE= http://freedesktop.org/ COMMENT= X Fixes extension of X RandR CONFLICTS+= libXfixes-[0-9]* -.if "${X11_TYPE}" != "native" -PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead." -.endif PKG_INSTALLATION_TYPES= overwrite pkgviews @@ -26,6 +23,11 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= xfixes.pc.in .include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} != "native" +PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead." +.endif + .if (${OPSYS} == "Darwin") CFLAGS+= -fno-common .endif diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile index 9a6c2970156..70a53f9f4ec 100644 --- a/x11/Xrender/Makefile +++ b/x11/Xrender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2008/09/08 07:02:52 dholland Exp $ +# $NetBSD: Makefile,v 1.35 2008/09/08 18:40:52 dholland Exp $ DISTNAME= libXrender-0.9.0 PKGNAME= ${DISTNAME:S/lib//} @@ -12,9 +12,6 @@ HOMEPAGE= http://fontconfig.org/ COMMENT= Client library for the X Rendering Extension protocol CONFLICTS+= libXrender-[0-9]* -.if "${X11_TYPE}" != "native" -PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead." -.endif PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir @@ -25,6 +22,12 @@ GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= xrender.pc.in CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:Q} +.include "../../mk/bsd.prefs.mk" + +.if ${X11_TYPE} != "native" +PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead." +.endif + .include "../../x11/renderproto/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |