[pkgsrc/pkgsrc-2015Q1]: pkgsrc/x11/xproto Pullup ticket #4713 - requested by ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5151c5a03355
branches:  pkgsrc-2015Q1
changeset: 649235:5151c5a03355
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed May 13 18:38:41 2015 +0000

description:
Pullup ticket #4713 - requested by hiramatsu
x11/xproto: packaging fix

Revisions pulled up:
- x11/xproto/builtin.mk                                         1.5

---
   Module Name: pkgsrc
   Committed By:        hiramatsu
   Date:                Tue May 12 13:59:11 UTC 2015

   Modified Files:
        pkgsrc/x11/xproto: builtin.mk

   Log Message:
   Converted to use mk/buildlink3/pkgconfig-builtin.mk to determine
   the version of system installed xproto.

diffstat:

 x11/xproto/builtin.mk |  51 ++++-----------------------------------------------
 1 files changed, 4 insertions(+), 47 deletions(-)

diffs (59 lines):

diff -r 8facfba98abe -r 5151c5a03355 x11/xproto/builtin.mk
--- a/x11/xproto/builtin.mk     Wed May 13 18:33:59 2015 +0000
+++ b/x11/xproto/builtin.mk     Wed May 13 18:38:41 2015 +0000
@@ -1,51 +1,8 @@
-# $NetBSD: builtin.mk,v 1.4 2008/10/05 21:36:34 cube Exp $
+# $NetBSD: builtin.mk,v 1.4.52.1 2015/05/13 18:38:41 tron Exp $
 
 BUILTIN_PKG:=  xproto
-
-BUILTIN_FIND_FILES_VAR:=       H_XFUNCPROTO
-BUILTIN_FIND_FILES.H_XFUNCPROTO=       ${X11BASE}/include/X11/Xfuncproto.h
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-###
-### Determine if there is a built-in implementation of the package and
-### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
-###
-.if ${X11BASE} == ${LOCALBASE}
-IS_BUILTIN.xproto=     no
-.elif !defined(IS_BUILTIN.xproto)
-IS_BUILTIN.xproto=     no
-.  if empty(H_XFUNCPROTO:M__nonexistent__)
-IS_BUILTIN.xproto=     yes
-.  endif
-.endif
-MAKEVARS+=     IS_BUILTIN.xproto
+PKGCONFIG_FILE.xproto= ${X11BASE}/lib/pkgconfig/xproto.pc
+PKGCONFIG_FILE.xproto+=        ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xproto.pc
 
-###
-### Determine whether we should use the built-in implementation if it
-### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
-###
-.if !defined(USE_BUILTIN.xproto)
-.  if ${PREFER.xproto} == "pkgsrc"
-USE_BUILTIN.xproto=    no
-.  else
-USE_BUILTIN.xproto=    ${IS_BUILTIN.xproto}
-.    if defined(BUILTIN_PKG.xproto) && \
-        !empty(IS_BUILTIN.xproto:M[yY][eE][sS])
-USE_BUILTIN.xproto=    yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.xproto}
-.        if !empty(USE_BUILTIN.xproto:M[yY][eE][sS])
-USE_BUILTIN.xproto!=                                                   \
-       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xproto:Q}; then \
-               ${ECHO} yes;                                            \
-       else                                                            \
-               ${ECHO} no;                                             \
-       fi
-.        endif
-.      endfor
-.    endif
-.  endif  # PREFER.xproto
-.endif
-MAKEVARS+=     USE_BUILTIN.xproto
-
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"