Page MenuHomeFreeBSD
Files F167315035

D57953.id180953.diff
No OneTemporary
Actions

D57953.id180953.diff
View Options

diff --git a/lib/libpkgconf/Makefile b/lib/libpkgconf/Makefile
--- a/lib/libpkgconf/Makefile
+++ b/lib/libpkgconf/Makefile
@@ -7,9 +7,10 @@
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
+SRCS= argvsplit.c audit.c bsdstubs.c buffer.c bufferset.c bytecode.c
+SRCS+= cache.c client.c dependency.c fileio.c fragment.c license.c
+SRCS+= output.c parser.c path.c personality.c pkg.c queue.c tuple.c
+SRCS+= variable.c version.c
INCS= bsdstubs.h iter.h libpkgconf-api.h libpkgconf.h stdinc.h
WARNS?= 3
diff --git a/packages/pkgconf/pkgconf.ucl b/packages/pkgconf/pkgconf.ucl
--- a/packages/pkgconf/pkgconf.ucl
+++ b/packages/pkgconf/pkgconf.ucl
@@ -25,8 +25,8 @@
pkg-config from freedesktop.org, but does not provide bug-compatibility with
the original pkg-config.
-Also provided is bomtool(1), a program which generates a textual SPDX 2.0
-software bill of materials (SBOM) for a given set of pkg-config modules. The
-output of this tool can then be translated into other SBOM formats as
-necessary.
+Also provided are bomtool(1) and spdxtool(1), programs generating software bill
+of materials (SBOM) for a given set of pkg-config modules, in the SPDX version
+2.2 and 3.0.1 file formats, respectively. The output of these tools can then be
+translated into other SBOM formats as necessary.
EOD
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -236,6 +236,7 @@
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
diff --git a/usr.bin/pkgconf/Makefile b/usr.bin/pkgconf/Makefile
--- a/usr.bin/pkgconf/Makefile
+++ b/usr.bin/pkgconf/Makefile
@@ -2,6 +2,7 @@
PROG= pkgconf
SRCS= main.c
+SRCS+= core.c
SRCS+= getopt_long.c
SRCS+= renderer-msvc.c
diff --git a/usr.bin/spdxtool/Makefile b/usr.bin/spdxtool/Makefile
new file mode 100644
--- /dev/null
+++ b/usr.bin/spdxtool/Makefile
@@ -0,0 +1,23 @@
+PACKAGE= pkgconf
+
+PROG= spdxtool
+SRCS= main.c core.c software.c serialize.c simplelicensing.c util.c
+SRCS+= generate.c 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/spdxtool
+.PATH: ${PKGCONFDIR}/cli
+.PATH: ${PKGCONFDIR}/man
+
+.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 21, 8:49 PM (1 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37053256
Default Alt Text
D57953.id180953.diff (2 KB)

Event Timeline