From 28175ba51109f6b53562420991122c5620117e93 Mon Sep 17 00:00:00 2001 From: obache Date: Mon, 13 Dec 2010 07:51:45 +0000 Subject: [PATCH] Add "Require: xproto" to fake *.pc files for the case xproto.pc exists. PR#44122. --- x11/libXau/builtin.mk | 9 +++++++-- x11/libXdmcp/builtin.mk | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/x11/libXau/builtin.mk b/x11/libXau/builtin.mk index 3b9b354be3e7..0059864cd325 100644 --- a/x11/libXau/builtin.mk +++ b/x11/libXau/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2010/12/10 08:45:15 obache Exp $ +# $NetBSD: builtin.mk,v 1.4 2010/12/13 07:51:45 obache Exp $ BUILTIN_PKG:= libXau @@ -66,10 +66,15 @@ xau-fake-pc: if ${TEST} -f $${src}; then \ ${LN} -sf $${src} $${dst}; \ else \ + req=""; \ + if ${TEST} -f \ + ${BUILDLINK_PREFIX.xproto}/lib/pkgconfig/xproto.pc; then \ + req="xproto"; \ + fi; \ { ${ECHO} "Name: Xau"; \ ${ECHO} "Description: X authorization file management library"; \ ${ECHO} "Version: 1.0.1"; \ - ${ECHO} "Requires: xproto"; \ + ${ECHO} "Requires: $${req}"; \ ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.libXau}/include"; \ ${ECHO} "Libs: -L${BUILDLINK_PREFIX.libXau}/lib" \ "${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXau}/lib" \ diff --git a/x11/libXdmcp/builtin.mk b/x11/libXdmcp/builtin.mk index 0fee67142efd..631b8306d4b1 100644 --- a/x11/libXdmcp/builtin.mk +++ b/x11/libXdmcp/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.3 2010/12/10 08:45:16 obache Exp $ +# $NetBSD: builtin.mk,v 1.4 2010/12/13 07:51:45 obache Exp $ BUILTIN_PKG:= libXdmcp @@ -66,10 +66,15 @@ xdmcp-fake-pc: if ${TEST} -f $${src}; then \ ${LN} -sf $${src} $${dst}; \ else \ + req=""; \ + if ${TEST} -f \ + ${BUILDLINK_PREFIX.xproto}/lib/pkgconfig/xproto.pc; then \ + req="xproto"; \ + fi; \ { ${ECHO} "Name: Xdmcp"; \ ${ECHO} "Description: X Display Manager Control Protocol library"; \ ${ECHO} "Version: 0.99"; \ - ${ECHO} "Requires: xproto"; \ + ${ECHO} "Requires: $${req}"; \ ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.libXdmcp}/include"; \ ${ECHO} "Libs: -L${BUILDLINK_PREFIX.libXdmcp}/lib" \ "${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXdmcp}/lib" \