diff --git a/lib/libpkgconf/Makefile b/lib/libpkgconf/Makefile index 3cfb2172a00e..7f742dcc4858 100644 --- a/lib/libpkgconf/Makefile +++ b/lib/libpkgconf/Makefile @@ -1,26 +1,51 @@ PKGCONFDIR= ${SRCTOP}/contrib/pkgconf PACKAGE= pkgconf PRIVATELIB= yes LIB= pkgconf MAN= pkg.m4.7 MANNODEV= pc.5 MANNODEV+= pkgconf-personality.5 -SRCS= audit.c buffer.c cache.c client.c pkg.c bsdstubs.c fragment.c -SRCS+= argvsplit.c fileio.c tuple.c dependency.c queue.c -SRCS+= path.c personality.c parser.c -INCS= bsdstubs.h iter.h libpkgconf-api.h libpkgconf.h stdinc.h +# from contrib/pkgconf/meson.build:171 +SRCS= argvsplit.c +SRCS+= audit.c +SRCS+= buffer.c +SRCS+= bufferset.c +SRCS+= bytecode.c +SRCS+= bsdstubs.c +SRCS+= cache.c +SRCS+= client.c +SRCS+= dependency.c +SRCS+= fileio.c +SRCS+= fragment.c +SRCS+= license.c +SRCS+= output.c +SRCS+= parser.c +SRCS+= path.c +SRCS+= personality.c +SRCS+= pkg.c +SRCS+= queue.c +SRCS+= tuple.c +SRCS+= variable.c +SRCS+= version.c + +# from contrib/pkgconf/libpkgconf/meson.build:6 +INCS= libpkgconf.h +INCS+= stdinc.h +INCS+= iter.h +INCS+= bsdstubs.h +INCS+= libpkgconf-api.h WARNS?= 3 CFLAGS+= -DPERSONALITY_PATH=\"/usr/share/pkgconfig/personality.d:/etc/pkgconfig/personality.d:${LOCALBASE:U/usr/local}/etc/pkgconfig/personality.d\" CFLAGS+= -DPKG_DEFAULT_PATH=\"${LOCALBASE:U/usr/local}/libdata/pkgconfig:/usr/libdata/pkgconfig:${LOCALBASE:U/usr/local}/share/pkgconfig\" CFLAGS+= -DSYSTEM_INCLUDEDIR=\"/usr/include\" CFLAGS+= -DSYSTEM_LIBDIR=\"/usr/lib\" CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} .PATH: ${PKGCONFDIR}/libpkgconf .PATH: ${PKGCONFDIR}/man .include diff --git a/lib/libpkgconf/libpkgconf/config.h b/lib/libpkgconf/libpkgconf/config.h index 49ae4a195137..2da1b4796e9d 100644 --- a/lib/libpkgconf/libpkgconf/config.h +++ b/lib/libpkgconf/libpkgconf/config.h @@ -1,77 +1,100 @@ +/* libpkgconf/config.h. Generated from config.h.in by configure. */ /* libpkgconf/config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if you have the `strlcat' function. */ -#define HAVE_STRLCAT 1 +/* Define to 1 if you have the declaration of 'nl_langinfo_l', and to 0 if you + don't. */ +#define HAVE_DECL_NL_LANGINFO_L 1 -/* Define to 1 if you have the `strlcpy' function. */ -#define HAVE_STRLCPY 1 +/* Define to 1 if you have the declaration of 'pledge', and to 0 if you don't. + */ +#define HAVE_DECL_PLEDGE 0 -/* Define to 1 if you have the `strndup' function. */ -#define HAVE_STRNDUP 1 +/* Define to 1 if you have the declaration of 'readlinkat', and to 0 if you + don't. */ +#define HAVE_DECL_READLINKAT 1 -/* Define to 1 if you have the `reallocarray' function. */ -#define HAVE_REALLOCARRAY 1 +/* Define to 1 if you have the declaration of 'reallocarray', and to 0 if you + don't. */ +#define HAVE_DECL_REALLOCARRAY 0 -/* Define to 1 if you have the `strlcat' function. */ -#define HAVE_DECL_STRLCAT 1 +/* Define to 1 if you have the declaration of 'strndup', and to 0 if you + don't. */ +#define HAVE_DECL_STRNDUP 1 -/* Define to 1 if you have the `strlcpy' function. */ -#define HAVE_DECL_STRLCPY 1 +/* Define to 1 if you have the declaration of 'unveil', and to 0 if you don't. + */ +#define HAVE_DECL_UNVEIL 0 -/* Define to 1 if you have the `strndup' function. */ -#define HAVE_DECL_STRNDUP 1 +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 -/* Define to 1 if you have the `reallocarray' function. */ -#define HAVE_DECL_REALLOCARRAY 1 +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 -/* Define to 1 if you have the `pledge' function. */ -/* #undef HAVE_DECL_PLEDGE */ +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 -/* Define to 1 if you have the `unveil' function. */ -/* #undef HAVE_DECL_UNVEIL */ +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" /* Name of package */ #define PACKAGE "pkgconf" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "https://github.com/pkgconf/pkgconf/issues/new" /* Define to the full name of this package. */ #define PACKAGE_NAME "pkgconf" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pkgconf 2.5.1" +#define PACKAGE_STRING "pkgconf 2.9.93" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pkgconf" /* Define to the home page for this package. */ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.5.1" +#define PACKAGE_VERSION "2.9.93" -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C89 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "2.5.1" - -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif +#define VERSION "2.9.93" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ -/* Define for large files, on AIX-style hosts. */ +/* Define to 1 on platforms where this makes off_t a 64-bit type. */ /* #undef _LARGE_FILES */ /* Number of bits in time_t, on hosts where this is settable. */ /* #undef _TIME_BITS */ -/* Enable Solaris extensions. */ -#ifndef __EXTENSIONS__ -# define __EXTENSIONS__ 1 -#endif +/* Define to 1 on platforms where this makes time_t a 64-bit type. */ +/* #undef __MINGW_USE_VC2005_COMPAT */ diff --git a/packages/pkgconf/pkgconf.ucl b/packages/pkgconf/pkgconf.ucl index 9ac124001350..027db32cb1a4 100644 --- a/packages/pkgconf/pkgconf.ucl +++ b/packages/pkgconf/pkgconf.ucl @@ -1,32 +1,32 @@ /* * SPDX-License-Identifier: ISC * * Copyright (c) 2026 Pierre Pronchery * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ comment = "Package compiler and linker metadata toolkit" desc = < SUBDIR= apply \ asa \ awk \ backlight \ banner \ basename \ bintrans \ brandelf \ bsdcat \ bsddialog \ bsdiff \ bzip2 \ bzip2recover \ cap_mkdb \ chat \ chpass \ cksum \ cmp \ col \ colrm \ column \ comm \ command \ compress \ cpio \ csplit \ ctlstat \ cut \ diff \ diff3 \ dirname \ dtc \ du \ elfctl \ elfdump \ enigma \ env \ etdump \ expand \ false \ fetch \ find \ fmt \ fold \ fstat \ fsync \ gcore \ gencat \ getaddrinfo \ getconf \ getent \ getopt \ grep \ gzip \ head \ hexdump \ id \ ident \ ipcrm \ ipcs \ join \ jot \ killall \ ktrace \ ktrdump \ lam \ ldd \ leave \ less \ lessecho \ lesskey \ limits \ locale \ localedef \ lock \ lockf \ logger \ login \ logins \ logname \ look \ lsvfs \ lzmainfo \ m4 \ mandoc \ mdo \ mesg \ ministat \ mkdep \ mkfifo \ mkimg \ mktemp \ mkuzip \ mt \ ncal \ ncurses \ netstat \ newgrp \ nfsstat \ nice \ nl \ nohup \ pagesize \ passwd \ paste \ patch \ pathchk \ perror \ posixmqcontrol \ posixshmcontrol \ pr \ printenv \ printf \ proccontrol \ procstat \ protect \ rctl \ renice \ resizewin \ rev \ revoke \ rpcinfo \ rs \ runat \ rup \ ruptime \ rusers \ rwall \ rwho \ script \ sdiff \ sed \ seq \ showmount \ sockstat \ soelim \ sort \ split \ stat \ stdbuf \ strings \ su \ systat \ tail \ tar \ tcopy \ tee \ time \ tip \ top \ touch \ tr \ true \ truncate \ ts \ tsort \ tty \ uname \ unexpand \ uniq \ unzip \ units \ unvis \ vis \ vmstat \ w \ wall \ wc \ wg \ what \ whereis \ which \ whois \ write \ xargs \ xinstall \ xo \ xz \ xzdec \ yes \ zstd # NB: keep these sorted by MK_* knobs SUBDIR.${MK_ACCT}+= lastcomm SUBDIR.${MK_AT}+= at SUBDIR.${MK_BLUETOOTH}+= bluetooth SUBDIR.${MK_CALENDAR}+= calendar .if ${MK_CLANG} != "no" || ${MK_LLVM_BINUTILS} != "no" || \ ${MK_LLD} != "no" || ${MK_LLDB} != "no" SUBDIR+= clang .endif SUBDIR.${MK_DIALOG}+= dpv SUBDIR.${MK_EE}+= ee SUBDIR.${MK_FILE}+= file SUBDIR.${MK_FINGER}+= finger SUBDIR.${MK_FTP}+= ftp SUBDIR.${MK_GAMES}+= caesar SUBDIR.${MK_GAMES}+= factor SUBDIR.${MK_GAMES}+= fortune SUBDIR.${MK_GAMES}+= grdc SUBDIR.${MK_GAMES}+= morse SUBDIR.${MK_GAMES}+= number SUBDIR.${MK_GAMES}+= pom SUBDIR.${MK_GAMES}+= primes SUBDIR.${MK_GAMES}+= random SUBDIR+= gh-bc SUBDIR.${MK_HESIOD}+= hesinfo SUBDIR.${MK_ICONV}+= iconv SUBDIR.${MK_ICONV}+= mkcsmapper SUBDIR.${MK_ICONV}+= mkesdb SUBDIR.${MK_ISCSI}+= iscsictl SUBDIR.${MK_KDUMP}+= kdump SUBDIR.${MK_KDUMP}+= truss .if ${MK_MITKRB5} == "no" SUBDIR.${MK_KERBEROS}+= compile_et .endif SUBDIR.${MK_LDNS_UTILS}+= drill SUBDIR.${MK_LDNS_UTILS}+= host SUBDIR.${MK_LIB32}+= ldd32 SUBDIR.${MK_LOCATE}+= locate # XXX msgs? SUBDIR.${MK_MAIL}+= biff SUBDIR.${MK_MAIL}+= from SUBDIR.${MK_MAIL}+= mail SUBDIR.${MK_MAIL}+= msgs SUBDIR.${MK_MAKE}+= bmake SUBDIR.${MK_MAN_UTILS}+= man SUBDIR.${MK_NETCAT}+= nc SUBDIR.${MK_NETLINK}+= genl SUBDIR.${MK_NIS}+= ypcat SUBDIR.${MK_NIS}+= ypmatch SUBDIR.${MK_NIS}+= ypwhich SUBDIR.${MK_OPENSSH}+= ssh-copy-id SUBDIR.${MK_PKGCONF}+= bomtool SUBDIR.${MK_PKGCONF}+= pkgconf +SUBDIR.${MK_PKGCONF}+= spdxtool SUBDIR.${MK_QUOTAS}+= quota SUBDIR.${MK_SENDMAIL}+= vacation SUBDIR.${MK_SOUND}+= beep SUBDIR.${MK_SOUND}+= mididump SUBDIR.${MK_TALK}+= talk SUBDIR.${MK_TELNET}+= telnet SUBDIR.${MK_TESTS_SUPPORT}+= kyua SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_TEXTPROC}+= ul SUBDIR.${MK_TFTP}+= tftp .if ${MK_LLVM_BINUTILS} == "no" # Only build the elftoolchain tools if we aren't using the LLVM ones. SUBDIR.${MK_TOOLCHAIN}+= addr2line SUBDIR.${MK_TOOLCHAIN}+= ar SUBDIR.${MK_TOOLCHAIN}+= cxxfilt SUBDIR.${MK_TOOLCHAIN}+= nm SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size .endif SUBDIR.${MK_TOOLCHAIN}+= c89 SUBDIR.${MK_TOOLCHAIN}+= c99 SUBDIR.${MK_TOOLCHAIN}+= ctags # ELF Tool Chain elfcopy required for EFI objects (PR280771) SUBDIR.${MK_TOOLCHAIN}+= elfcopy SUBDIR.${MK_TOOLCHAIN}+= file2c SUBDIR.${MK_TOOLCHAIN}+= gprof SUBDIR.${MK_TOOLCHAIN}+= indent SUBDIR.${MK_TOOLCHAIN}+= lex SUBDIR.${MK_TOOLCHAIN}+= lorder SUBDIR.${MK_TOOLCHAIN}+= mkstr SUBDIR.${MK_TOOLCHAIN}+= rpcgen SUBDIR.${MK_TOOLCHAIN}+= unifdef SUBDIR.${MK_TOOLCHAIN}+= xstr SUBDIR.${MK_TOOLCHAIN}+= yacc SUBDIR.${MK_VI}+= vi SUBDIR.${MK_VT}+= vtfontcvt SUBDIR.${MK_USB}+= usbhidaction SUBDIR.${MK_USB}+= usbhidctl SUBDIR.${MK_UTMPX}+= last SUBDIR.${MK_UTMPX}+= users SUBDIR.${MK_UTMPX}+= who SUBDIR.${MK_OFED}+= ofed .include SUBDIR_PARALLEL= .include diff --git a/usr.bin/bomtool/Makefile b/usr.bin/bomtool/Makefile index 6074c0817756..540a163f5c97 100644 --- a/usr.bin/bomtool/Makefile +++ b/usr.bin/bomtool/Makefile @@ -1,19 +1,20 @@ PACKAGE= pkgconf +# from contrib/pkgconf/meson.build:257 PROG= bomtool SRCS= main.c SRCS+= getopt_long.c LIBADD= pkgconf PKGCONFDIR= ${SRCTOP}/contrib/pkgconf WARNS?= 3 CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} -I${PKGCONFDIR}/cli .PATH: ${PKGCONFDIR}/cli/bomtool .PATH: ${PKGCONFDIR}/cli .PATH: ${PKGCONFDIR}/man .include diff --git a/usr.bin/pkgconf/Makefile b/usr.bin/pkgconf/Makefile index 448e7047e116..bbe61cf09fb5 100644 --- a/usr.bin/pkgconf/Makefile +++ b/usr.bin/pkgconf/Makefile @@ -1,22 +1,24 @@ PACKAGE= pkgconf +# from contrib/pkgconf/meson.build:246 PROG= pkgconf SRCS= main.c +SRCS+= core.c SRCS+= getopt_long.c SRCS+= renderer-msvc.c LIBADD= pkgconf SYMLINKS= pkgconf ${BINDIR}/pkg-config PKGCONFDIR= ${SRCTOP}/contrib/pkgconf WARNS?= 3 CFLAGS+= -DSYSTEM_INCLUDEDIR=\"/usr/include\" -DSYSTEM_LIBDIR=\"/usr/lib\" CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} .PATH: ${PKGCONFDIR}/cli .PATH: ${PKGCONFDIR}/man .include diff --git a/usr.bin/bomtool/Makefile b/usr.bin/spdxtool/Makefile similarity index 51% copy from usr.bin/bomtool/Makefile copy to usr.bin/spdxtool/Makefile index 6074c0817756..aaa19c128a44 100644 --- a/usr.bin/bomtool/Makefile +++ b/usr.bin/spdxtool/Makefile @@ -1,19 +1,30 @@ PACKAGE= pkgconf -PROG= bomtool +# from contrib/pkgconf/meson.build:266 +PROG= spdxtool SRCS= main.c +SRCS+= core.c +SRCS+= software.c +SRCS+= serialize.c +SRCS+= simplelicensing.c +SRCS+= util.c +SRCS+= generate.c SRCS+= getopt_long.c LIBADD= pkgconf +.if defined(TOOLS_PREFIX) +NO_SHARED= yes +.endif + PKGCONFDIR= ${SRCTOP}/contrib/pkgconf WARNS?= 3 CFLAGS+= -I${SRCTOP}/lib/libpkgconf -I${PKGCONFDIR} -I${PKGCONFDIR}/cli -.PATH: ${PKGCONFDIR}/cli/bomtool +.PATH: ${PKGCONFDIR}/cli/spdxtool .PATH: ${PKGCONFDIR}/cli .PATH: ${PKGCONFDIR}/man .include