[pkgsrc/trunk]: pkgsrc/x11 Fix my previous commit, which was borked in some c...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/75a4f764e415
branches:  trunk
changeset: 546863:75a4f764e415
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Sep 08 18:40:52 2008 +0000

description:
Fix my previous commit, which was borked in some cases. Noted by gson@.

diffstat:

 x11/Xfixes/Makefile  |  10 ++++++----
 x11/Xrender/Makefile |  11 +++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diffs (63 lines):

diff -r 22fa21604cc6 -r 75a4f764e415 x11/Xfixes/Makefile
--- a/x11/Xfixes/Makefile       Mon Sep 08 17:57:02 2008 +0000
+++ b/x11/Xfixes/Makefile       Mon Sep 08 18:40:52 2008 +0000
@@ -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 @@
 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 @@
 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 -r 22fa21604cc6 -r 75a4f764e415 x11/Xrender/Makefile
--- a/x11/Xrender/Makefile      Mon Sep 08 17:57:02 2008 +0000
+++ b/x11/Xrender/Makefile      Mon Sep 08 18:40:52 2008 +0000
@@ -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 @@
 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 @@
 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"