From b3aeff09c3319c89759c466acd0f45d4bf531738 Mon Sep 17 00:00:00 2001 From: dholland Date: Mon, 8 Sep 2008 18:40:52 +0000 Subject: Fix my previous commit, which was borked in some cases. Noted by gson@. --- x11/Xrender/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'x11/Xrender') 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" -- cgit v1.2.3