CVS commit: pkgsrc/x11/libXmu
"Thomas Klausner" <[email protected]>
| Newsgroups | gmane.os.netbsd.devel.pkgsrc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Module Name: pkgsrc Committed By: wiz Date: Tue Aug 18 07:39:41 UTC 2026 Modified Files: pkgsrc/x11/libXmu: builtin.mk Log Message: libXmu: use pkg-config file to detect existence/version of built-in libXmu To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXmu/builtin.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
(unnamed)
(text/x-diff, 1.9 KB)
Modified files:
Index: pkgsrc/x11/libXmu/builtin.mk
diff -u pkgsrc/x11/libXmu/builtin.mk:1.4 pkgsrc/x11/libXmu/builtin.mk:1.5
--- pkgsrc/x11/libXmu/builtin.mk:1.4 Wed Apr 3 21:26:00 2024
+++ pkgsrc/x11/libXmu/builtin.mk Tue Aug 18 07:39:40 2026
@@ -1,51 +1,8 @@
-# $NetBSD: builtin.mk,v 1.4 2024/04/03 21:26:00 wiz Exp $
+# $NetBSD: builtin.mk,v 1.5 2026/08/18 07:39:40 wiz Exp $
-BUILTIN_PKG:= libXmu
-
-BUILTIN_FIND_FILES_VAR:= H_XMU
-BUILTIN_FIND_FILES.H_XMU= ${X11BASE}/include/X11/Xmu/Xmu.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.libXmu= no
-.elif !defined(IS_BUILTIN.libXmu)
-IS_BUILTIN.libXmu= no
-. if empty(H_XMU:M__nonexistent__)
-IS_BUILTIN.libXmu= yes
-. endif
-.endif
-MAKEVARS+= IS_BUILTIN.libXmu
-
-###
-### 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.libXmu)
-. if ${PREFER.libXmu} == "pkgsrc"
-USE_BUILTIN.libXmu= no
-. else
-USE_BUILTIN.libXmu= ${IS_BUILTIN.libXmu}
-. if defined(BUILTIN_PKG.libXmu) && \
- ${IS_BUILTIN.libXmu:tl} == yes
-USE_BUILTIN.libXmu= yes
-. for _dep_ in ${BUILDLINK_API_DEPENDS.libXmu}
-. if ${USE_BUILTIN.libXmu:tl} == yes
-USE_BUILTIN.libXmu!= \
- if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXmu:Q}; then \
- ${ECHO} yes; \
- else \
- ${ECHO} no; \
- fi
-. endif
-. endfor
-. endif
-. endif # PREFER.libXmu
-.endif
-MAKEVARS+= USE_BUILTIN.libXmu
+BUILTIN_PKG:= libXmu
+PKGCONFIG_FILE.libXmu= ${X11BASE}/lib/pkgconfig/xmu.pc
+PKGCONFIG_FILE.libXmu+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xinerama.pc
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
.include "../../mk/x11.builtin.mk"