CVS commit: pkgsrc/sysutils/libudev

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Sun May  4 09:57:54 UTC 2025

Modified Files:
        pkgsrc/sysutils/libudev: Makefile builtin.mk

Log Message:
sysutils/libudev: simplify builtin.mk

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/libudev/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/libudev/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/sysutils/libudev/Makefile
diff -u pkgsrc/sysutils/libudev/Makefile:1.5 pkgsrc/sysutils/libudev/Makefile:1.6
--- pkgsrc/sysutils/libudev/Makefile:1.5        Sun May  4 07:18:03 2025
+++ pkgsrc/sysutils/libudev/Makefile    Sun May  4 09:57:54 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2025/05/04 07:18:03 vins Exp $
+# $NetBSD: Makefile,v 1.6 2025/05/04 09:57:54 vins Exp $
 
 DISTNAME=      libudev-3.2.14
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=eudev-project/}
 GITHUB_PROJECT=        eudev
@@ -16,10 +17,12 @@ TOOL_DEPENDS+=      gperf-[0-9]*:../../devel/
 BUILD_DEFS+=   VARBASE
 
 ONLY_FOR_PLATFORM=     Linux-*-*
-USE_TOOLS+=            autoconf automake gmake pkg-config
+
+USE_LANGUAGES= c c++
+
+USE_TOOLS+=            autoconf automake pkg-config
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
-USE_LANGUAGES=         c c++
 
 PKGCONFIG_OVERRIDE+=   src/libudev/libudev.pc.in
 

Index: pkgsrc/sysutils/libudev/builtin.mk
diff -u pkgsrc/sysutils/libudev/builtin.mk:1.2 pkgsrc/sysutils/libudev/builtin.mk:1.3
--- pkgsrc/sysutils/libudev/builtin.mk:1.2      Sun May  4 07:18:03 2025
+++ pkgsrc/sysutils/libudev/builtin.mk  Sun May  4 09:57:54 2025
@@ -1,41 +1,19 @@
-# $NetBSD: builtin.mk,v 1.2 2025/05/04 07:18:03 vins Exp $
+# $NetBSD: builtin.mk,v 1.3 2025/05/04 09:57:54 vins Exp $
 
-BUILTIN_PKG:=  libudev
-
-BUILTIN_FIND_PKGCONFIG_FILES_VAR:=             LIBUDEV_PC
-BUILTIN_FIND_PKGCONFIG_FILES.LIBUDEV_PC=       libudev.pc
-
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-.if !defined(IS_BUILTIN.libudev)
-IS_BUILTIN.libudev=    no
-.  if empty(LIBUDEV_PC:M__nonexistent__)
-IS_BUILTIN.libudev=    yes
+BUILTIN_PKG:=                  libudev
+PKGCONFIG_BASE.libudev=                /usr
+PKGCONFIG_FILE.libudev=                ${PKGCONFIG_BASE.libudev}/lib/pkgconfig/libudev.pc
+PKGCONFIG_FILE.libudev+=       ${PKGCONFIG_BASE.libudev}/lib${LIBABISUFFIX}/pkgconfig/libudev.pc
+
+.include "../../mk/buildlink3/pkgconfig-builtin.mk"
+
+CHECK_BUILTIN.libudev?=        no
+.if ${CHECK_BUILTIN.libudev:tl} == no
+
+.  if ${USE_BUILTIN.libudev:tl} == yes
+BUILDLINK_PREFIX.libudev=      /usr
+BUILDLINK_FILES.libudev+=      lib/pkgconfig/libudev.pc
+BUILDLINK_FILES.libudev+=      lib${LIBABISUFFIX}/pkgconfig/libudev.pc
 .  endif
-.endif
-MAKEVARS+=             IS_BUILTIN.libudev
-
-.if !defined(USE_BUILTIN.libudev)
-USE_BUILTIN.libudev=   ${IS_BUILTIN.libudev}
-.endif
-
-.PHONY: link-libudev-pkgconfig link-message-libudev-pkgconfig \
-       do-configure-pre-hook
 
-.if ${USE_BUILTIN.libudev:tl} == yes
-.  if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
-do-configure-pre-hook: link-libudev-pkgconfig
-
-BLKDIR_PKGCFG=         ${BUILDLINK_DIR}/lib/pkgconfig
-LIBUDEV_PKGCFGF=       ${BUILTIN_FIND_PKGCONFIG_FILES.LIBUDEV_PC}
-
-link-libudev-pkgconfig: link-message-libudev-pkgconfig
-link-message-libudev-pkgconfig:
-       @${STEP_MSG} "Linking ${LIBUDEV_PC} file into ${BUILDLINK_DIR}."
-
-link-libudev-pkgconfig:
-       ${RUN}                                          \
-       ${MKDIR} ${BLKDIR_PKGCFG};                      \
-       ${LN} -sf ${LIBUDEV_PC} ${BLKDIR_PKGCFG}/${LIBUDEV_PKGCFGF}
-.  endif
-.endif
+.endif  # CHECK_BUILTIN.libudev