CVS commit: pkgsrc/x11/libXt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 19 11:12:17 UTC 2025

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

Log Message:
libXt: switch to detection by pkg-config file

Like many other xorg packages already do


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXt/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/libXt/builtin.mk
diff -u pkgsrc/x11/libXt/builtin.mk:1.4 pkgsrc/x11/libXt/builtin.mk:1.5
--- pkgsrc/x11/libXt/builtin.mk:1.4     Sun Apr  9 21:44:13 2023
+++ pkgsrc/x11/libXt/builtin.mk Wed Mar 19 11:12:17 2025
@@ -1,51 +1,9 @@
-# $NetBSD: builtin.mk,v 1.4 2023/04/09 21:44:13 wiz Exp $
+# $NetBSD: builtin.mk,v 1.5 2025/03/19 11:12:17 wiz Exp $
 
-BUILTIN_PKG:=  libXt
-
-BUILTIN_FIND_FILES_VAR:=       H_XTOS
-BUILTIN_FIND_FILES.H_XTOS=     ${X11BASE}/include/X11/Xtos.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.libXt=      no
-.elif !defined(IS_BUILTIN.libXt)
-IS_BUILTIN.libXt=      no
-.  if empty(H_XTOS:M__nonexistent__)
-IS_BUILTIN.libXt=      yes
-.  endif
-.endif
-MAKEVARS+=             IS_BUILTIN.libXt
-
-###
-### 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.libXt)
-.  if ${PREFER.libXt} == "pkgsrc"
-USE_BUILTIN.libXt=     no
-.  else
-USE_BUILTIN.libXt=     ${IS_BUILTIN.libXt}
-.    if defined(BUILTIN_PKG.libXt) && \
-        ${IS_BUILTIN.libXt:tl} == yes
-USE_BUILTIN.libXt=     yes
-.      for _dep_ in ${BUILDLINK_API_DEPENDS.libXt}
-.        if ${USE_BUILTIN.libXt:tl} == yes
-USE_BUILTIN.libXt!=                                                    \
-       if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXt:Q}; then \
-               ${ECHO} yes;                                            \
-       else                                                            \
-               ${ECHO} no;                                             \
-       fi
-.        endif
-.      endfor
-.    endif
-.  endif  # PREFER.libXt
-.endif
-MAKEVARS+=             USE_BUILTIN.libXt
+BUILTIN_PKG:=          libXt
+PKGCONFIG_FILE.libXt=  ${X11BASE}/lib/pkgconfig/xt.pc
+PKGCONFIG_FILE.libXt+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xt.pc
+PKGCONFIG_FILE.libXt+= ${X11BASE}/lib/libXt.so
 
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
 .include "../../mk/x11.builtin.mk"