summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/bacula-libs3/Makefile2
-rw-r--r--sysutils/brasero/Makefile2
-rw-r--r--sysutils/cfengine-devel/Makefile1
-rw-r--r--sysutils/cfengine-lts/Makefile1
-rw-r--r--sysutils/cfengine321/Makefile1
-rw-r--r--sysutils/cfengine322/Makefile1
-rw-r--r--sysutils/cfengine323/Makefile1
-rw-r--r--sysutils/cfengine324/Makefile1
-rw-r--r--sysutils/cfengine325/Makefile1
-rw-r--r--sysutils/cfengine326/Makefile1
-rw-r--r--sysutils/cluster-glue/Makefile2
-rw-r--r--sysutils/createrepo_c/Makefile1
-rw-r--r--sysutils/gdmap/Makefile2
-rw-r--r--sysutils/gnome-control-center/Makefile1
-rw-r--r--sysutils/graveman/Makefile2
-rw-r--r--sysutils/khelpcenter/Makefile1
-rw-r--r--sysutils/libcpuid/files/patch-Makefile.in13
-rw-r--r--sysutils/localsearch/Makefile2
-rw-r--r--sysutils/mate-control-center/Makefile2
-rw-r--r--sysutils/mate-system-monitor/Makefile1
-rw-r--r--sysutils/osinfo-db-tools/Makefile2
-rw-r--r--sysutils/podman/Makefile12
-rw-r--r--sysutils/podman/distinfo6
-rw-r--r--sysutils/sysctltui/Makefile1
-rw-r--r--sysutils/x86info/Makefile43
-rw-r--r--sysutils/x86info/distinfo3
-rw-r--r--sysutils/x86info/files/patch-Makefile29
-rw-r--r--sysutils/x86info/files/patch-lsmsr_Makefile15
-rw-r--r--sysutils/x86info/files/patch-lsmsr_lsmsr.c100
-rw-r--r--sysutils/x86info/pkg-descr4
31 files changed, 38 insertions, 217 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile
index f31ade8c88cf..5798873e3860 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1551,7 +1551,6 @@
SUBDIR += wmupmon
SUBDIR += worldtools
SUBDIR += wuzzah
- SUBDIR += x86info
SUBDIR += xbatt
SUBDIR += xbattbar
SUBDIR += xcdroast
diff --git a/sysutils/bacula-libs3/Makefile b/sysutils/bacula-libs3/Makefile
index d6a95873bcdf..39e921186072 100644
--- a/sysutils/bacula-libs3/Makefile
+++ b/sysutils/bacula-libs3/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bacula11-libs3
PORTVERSION= 20200523
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= https://www.bacula.org/downloads/
DISTNAME= libs3-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index a16d627d78eb..60cb1b91f567 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,6 +1,6 @@
PORTNAME= brasero
PORTVERSION= 3.12.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils audio multimedia gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
index a9a08bc64d46..53931940a9e8 100644
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cfengine
PORTVERSION= 3.25.${CFENGINE_COMMIT_DATE}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= sysutils
PKGNAMESUFFIX= -devel
diff --git a/sysutils/cfengine-lts/Makefile b/sysutils/cfengine-lts/Makefile
index 5127ea44669f..2fbfc6311697 100644
--- a/sysutils/cfengine-lts/Makefile
+++ b/sysutils/cfengine-lts/Makefile
@@ -1,6 +1,7 @@
VERSIONS= 321 324
# Upgrade to LTS versions only: https://cfengine.com/supported-versions/
CFENGINE_VERSION?= 324
+PORTREVISION= 1
PKGNAMESUFFIX= -lts
MASTERDIR= ${.CURDIR}/../cfengine${CFENGINE_VERSION}
diff --git a/sysutils/cfengine321/Makefile b/sysutils/cfengine321/Makefile
index 8cffbc2026fd..68b8587b9d79 100644
--- a/sysutils/cfengine321/Makefile
+++ b/sysutils/cfengine321/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cfengine
DISTVERSION= 3.21.3
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/
DISTNAME= ${PORTNAME}-community-${DISTVERSION}
diff --git a/sysutils/cfengine322/Makefile b/sysutils/cfengine322/Makefile
index 91de35d33b1d..5481233737c7 100644
--- a/sysutils/cfengine322/Makefile
+++ b/sysutils/cfengine322/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cfengine
DISTVERSION= 3.22.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/
DISTNAME= ${PORTNAME}-community-${DISTVERSION}
diff --git a/sysutils/cfengine323/Makefile b/sysutils/cfengine323/Makefile
index e0d9faea2b85..6ddd2fc73593 100644
--- a/sysutils/cfengine323/Makefile
+++ b/sysutils/cfengine323/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cfengine
DISTVERSION= 3.23.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/
DISTNAME= ${PORTNAME}-community-${DISTVERSION}
diff --git a/sysutils/cfengine324/Makefile b/sysutils/cfengine324/Makefile
index cb4abb288e0e..efd097803bb8 100644
--- a/sysutils/cfengine324/Makefile
+++ b/sysutils/cfengine324/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cfengine
DISTVERSION= 3.24.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/
DISTNAME= ${PORTNAME}-community-${DISTVERSION}
diff --git a/sysutils/cfengine325/Makefile b/sysutils/cfengine325/Makefile
index 2a5f20c53195..d4d32d61711a 100644
--- a/sysutils/cfengine325/Makefile
+++ b/sysutils/cfengine325/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cfengine
DISTVERSION= 3.25.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/
DISTNAME= ${PORTNAME}-community-${DISTVERSION}
diff --git a/sysutils/cfengine326/Makefile b/sysutils/cfengine326/Makefile
index 97fa75ecefdc..ab418bf9ac57 100644
--- a/sysutils/cfengine326/Makefile
+++ b/sysutils/cfengine326/Makefile
@@ -1,5 +1,6 @@
PORTNAME= cfengine
DISTVERSION= 3.26.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= https://s3.amazonaws.com/cfengine-package-repos/tarballs/
DISTNAME= ${PORTNAME}-community-${DISTVERSION}
diff --git a/sysutils/cluster-glue/Makefile b/sysutils/cluster-glue/Makefile
index 3acdb915b594..c0965bed5a7d 100644
--- a/sysutils/cluster-glue/Makefile
+++ b/sysutils/cluster-glue/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cluster-glue
PORTVERSION= 1.0.12
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://hg.linux-ha.org/glue/archive/
DISTNAME= 0a7add1d9996
diff --git a/sysutils/createrepo_c/Makefile b/sysutils/createrepo_c/Makefile
index ba3fe4a76c83..d9fe6fd24cba 100644
--- a/sysutils/createrepo_c/Makefile
+++ b/sysutils/createrepo_c/Makefile
@@ -1,5 +1,6 @@
PORTNAME= createrepo_c
DISTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= ktk@netlabs.org
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index b6923ec4ea01..181bf2578cfc 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gdmap
PORTVERSION= 0.8.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils gnome
MASTER_SITES= SF
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index a31a4e275cb5..f5f4c56a1801 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gnome-control-center
PORTVERSION= 47.6
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/sysutils/graveman/Makefile b/sysutils/graveman/Makefile
index c8ac85bf1685..254ba2bebf63 100644
--- a/sysutils/graveman/Makefile
+++ b/sysutils/graveman/Makefile
@@ -1,6 +1,6 @@
PORTNAME= graveman
DISTVERSION= 0.3.12-5
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= sysutils
MASTER_SITES= http://graveman.tuxfamily.org/sources/
diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile
index f19b66b5eaf0..273be8e965af 100644
--- a/sysutils/khelpcenter/Makefile
+++ b/sysutils/khelpcenter/Makefile
@@ -1,5 +1,6 @@
PORTNAME= khelpcenter
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
+PORTREVISION= 1
CATEGORIES= sysutils kde kde-applications
MAINTAINER= kde@FreeBSD.org
diff --git a/sysutils/libcpuid/files/patch-Makefile.in b/sysutils/libcpuid/files/patch-Makefile.in
new file mode 100644
index 000000000000..d12f5cd9ebf6
--- /dev/null
+++ b/sysutils/libcpuid/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+https://github.com/anrieff/libcpuid/pull/216
+
+--- Makefile.in.orig 2025-06-30 13:19:06 UTC
++++ Makefile.in
+@@ -895,7 +895,7 @@ test-fast:
+ test: test-fast
+
+ test-fast:
+- LD_PRELOAD=$(top_builddir)/libcpuid/.libs/libcpuid.so $(top_srcdir)/tests/run_tests.py $(top_builddir)/cpuid_tool/.libs/cpuid_tool --show-test-fast-warning $(top_srcdir)/tests
++ LD_PRELOAD=$(top_builddir)/libcpuid/.libs/libcpuid.so $(top_srcdir)/tests/run_tests.py --show-test-fast-warning $(top_builddir)/cpuid_tool/.libs/cpuid_tool $(top_srcdir)/tests
+
+ test-old:
+ $(top_srcdir)/tests/run_tests.py $(top_builddir)/cpuid_tool/cpuid_tool $(top_srcdir)/tests
diff --git a/sysutils/localsearch/Makefile b/sysutils/localsearch/Makefile
index f6bbcd8fc890..a800e81bced7 100644
--- a/sysutils/localsearch/Makefile
+++ b/sysutils/localsearch/Makefile
@@ -1,6 +1,6 @@
PORTNAME= localsearch
PORTVERSION= 3.8.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
diff --git a/sysutils/mate-control-center/Makefile b/sysutils/mate-control-center/Makefile
index 297e3f3bc18d..39fead4e5bf8 100644
--- a/sysutils/mate-control-center/Makefile
+++ b/sysutils/mate-control-center/Makefile
@@ -1,7 +1,7 @@
PORTNAME= mate-control-center
PORTVERSION= 1.28.1
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils mate
DIST_SUBDIR= mate
diff --git a/sysutils/mate-system-monitor/Makefile b/sysutils/mate-system-monitor/Makefile
index 11c42059d67d..08fc1295b815 100644
--- a/sysutils/mate-system-monitor/Makefile
+++ b/sysutils/mate-system-monitor/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mate-system-monitor
PORTVERSION= 1.28.1
+PORTREVISION= 1
CATEGORIES= sysutils mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
diff --git a/sysutils/osinfo-db-tools/Makefile b/sysutils/osinfo-db-tools/Makefile
index ff4947f36265..36019a6ba630 100644
--- a/sysutils/osinfo-db-tools/Makefile
+++ b/sysutils/osinfo-db-tools/Makefile
@@ -1,6 +1,6 @@
PORTNAME= osinfo-db-tools
DISTVERSION= 1.12.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= https://releases.pagure.org/libosinfo/
diff --git a/sysutils/podman/Makefile b/sysutils/podman/Makefile
index 65c6a1c00031..ecf20d4b523b 100644
--- a/sysutils/podman/Makefile
+++ b/sysutils/podman/Makefile
@@ -1,6 +1,6 @@
PORTNAME= podman
DISTVERSIONPREFIX= v
-DISTVERSION= 5.5.1
+DISTVERSION= 5.5.2
CATEGORIES= sysutils
MAINTAINER= dfr@FreeBSD.org
@@ -26,20 +26,10 @@ USE_RC_SUBR= podman podman_service
SHEBANG_FILES= ${WRKSRC}/hack/markdown-preprocess
MAKE_ARGS= SHELL=${LOCALBASE}/bin/bash
-# Parallel builds are flaky due to some kind of file race in the
-# markdown-preprocess phase of the docs build.
-MAKE_JOBS_UNSAFE= yes
-
USE_GITHUB= yes
GH_ACCOUNT= containers
GH_PROJECT= podman
INSTALL_TARGET= install install.completions
-# Temporary until https://github.com/containers/podman/pull/16422 lands
-do-install:
- ${GMAKE} -C ${WRKSRC} ${MAKE_ARGS} DESTDIR=${STAGEDIR} GO=${GO_CMD} install
- ${GMAKE} -C ${WRKSRC} ${MAKE_ARGS} DESTDIR=${STAGEDIR} GO=${GO_CMD} install.completions
- ${RM} ${STAGEDIR}${PREFIX}/lib/tmpfiles.d/podman.conf
-
.include <bsd.port.mk>
diff --git a/sysutils/podman/distinfo b/sysutils/podman/distinfo
index 48cdbe5f6f89..a0bc4f5ae4ef 100644
--- a/sysutils/podman/distinfo
+++ b/sysutils/podman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750101580
-SHA256 (containers-podman-v5.5.1_GH0.tar.gz) = 00d02f85ad27a46e77456fef1be81865a43147544ed2487e6c4c8decd0e3748f
-SIZE (containers-podman-v5.5.1_GH0.tar.gz) = 21338501
+TIMESTAMP = 1750872455
+SHA256 (containers-podman-v5.5.2_GH0.tar.gz) = a2dbd8280cd92d4741f32f5a99d385d7fc6f0dd36bc9cc90a7273767e26d43d9
+SIZE (containers-podman-v5.5.2_GH0.tar.gz) = 21334872
diff --git a/sysutils/sysctltui/Makefile b/sysutils/sysctltui/Makefile
index b4b60a11802a..dca3d889036e 100644
--- a/sysutils/sysctltui/Makefile
+++ b/sysutils/sysctltui/Makefile
@@ -1,5 +1,6 @@
PORTNAME= sysctltui
DISTVERSION= 0.0.2
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= alfix86@gmail.com
diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile
deleted file mode 100644
index 7e8f2c09720a..000000000000
--- a/sysutils/x86info/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-PORTNAME= x86info
-DISTVERSION= 1.31snap03
-PORTREVISION= 1
-CATEGORIES= sysutils
-
-MAINTAINER= ler@FreeBSD.org
-COMMENT= x86 CPU identification and feature display utility
-WWW= https://github.com/kernelslacker/x86info
-
-LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-DEPRECATED= Abandoned upstream, fails to identify anything remotely new according to upstream issue reports
-EXPIRATION_DATE=2025-06-30
-
-LIB_DEPENDS= libpci.so:devel/libpci
-
-ONLY_FOR_ARCHS= i386 amd64
-
-USE_GITHUB= yes
-GH_ACCOUNT= kernelslacker
-GH_TAGNAME= 1b41e8b
-
-USES= gmake pkgconfig python:build
-
-PLIST_FILES= bin/lsmsr bin/x86info share/man/man8/lsmsr.8.gz share/man/man1/x86info.1.gz
-
-post-patch:
- @${REINPLACE_CMD} \
- -e 's|python createheader.py|${PYTHON_CMD} createheader.py|' \
- ${WRKSRC}/lsmsr/Makefile
-
-do-build:
- @cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
- @cd ${WRKSRC}/lsmsr ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/x86info ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/lsmsr/lsmsr ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/x86info.1 ${STAGEDIR}${PREFIX}/share/man/man1
- ${INSTALL_MAN} ${WRKSRC}/lsmsr/lsmsr.8 ${STAGEDIR}${PREFIX}/share/man/man8
-
-.include <bsd.port.mk>
diff --git a/sysutils/x86info/distinfo b/sysutils/x86info/distinfo
deleted file mode 100644
index c2b9c85d65ad..000000000000
--- a/sysutils/x86info/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1537051964
-SHA256 (kernelslacker-x86info-1.31snap03-1b41e8b_GH0.tar.gz) = a3fd00224315a07b9cc2009ea87d1c3f627795b818608149c1f257669ee441c9
-SIZE (kernelslacker-x86info-1.31snap03-1b41e8b_GH0.tar.gz) = 85780
diff --git a/sysutils/x86info/files/patch-Makefile b/sysutils/x86info/files/patch-Makefile
deleted file mode 100644
index 4f80b57aad83..000000000000
--- a/sysutils/x86info/files/patch-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig 2017-09-06 10:17:13.000000000 -0600
-+++ Makefile 2018-01-11 10:23:07.741490000 -0700
-@@ -39,7 +39,7 @@
- LDFLAGS += $(shell pkg-config --libs libpci)
-
- ifeq ($(CC),"")
--CC = gcc
-+CC ?= gcc
- endif
-
- ifdef STATIC_LIBPCI
-@@ -52,7 +52,7 @@
-
- V = @
- Q = $(V:1=)
--QUIET_CC = $(Q:@=@echo ' CC '$@;)
-+#QUIET_CC = $(Q:@=@echo ' CC '$@;)
-
- all: x86info
-
-@@ -69,7 +69,7 @@
-
- x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS)
- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \
-- $(LIBPCI)
-+ `pkg-config --libs libpci` $(LIBPCI)
-
- DEPDIR= .deps
- -include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d)
diff --git a/sysutils/x86info/files/patch-lsmsr_Makefile b/sysutils/x86info/files/patch-lsmsr_Makefile
deleted file mode 100644
index 85f95c391314..000000000000
--- a/sysutils/x86info/files/patch-lsmsr_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- lsmsr/Makefile.orig 2016-10-12 19:04:55 UTC
-+++ lsmsr/Makefile
-@@ -14,12 +14,10 @@ CFLAGS += -Wdeclaration-after-statement
- CFLAGS += -Wformat=2
- CFLAGS += -Wimplicit
- CFLAGS += -Winit-self
--CFLAGS += -Wlogical-op
- CFLAGS += -Wmissing-declarations -Wredundant-decls
- CFLAGS += -Wnested-externs
- CFLAGS += -Wpacked
- CFLAGS += -Wshadow
--CFLAGS += -Wstrict-aliasing=3
- CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
- CFLAGS += -Wswitch-enum
- CFLAGS += -Wundef
diff --git a/sysutils/x86info/files/patch-lsmsr_lsmsr.c b/sysutils/x86info/files/patch-lsmsr_lsmsr.c
deleted file mode 100644
index 929e3feadfc1..000000000000
--- a/sysutils/x86info/files/patch-lsmsr_lsmsr.c
+++ /dev/null
@@ -1,100 +0,0 @@
---- lsmsr/lsmsr.c.orig 2016-10-12 19:04:55 UTC
-+++ lsmsr/lsmsr.c
-@@ -34,6 +34,18 @@
- #include "AMD_fam15h.h"
- #include "generic_msr.h"
-
-+#if defined(__FreeBSD__)
-+# include <sys/param.h>
-+# include <sys/ioctl.h>
-+# if __FreeBSD_version < 701102
-+# define CPUDEV "/dev/cpu%d"
-+# include <cpu.h>
-+# else
-+# define CPUDEV "/dev/cpuctl%d"
-+# include <sys/cpuctl.h>
-+# endif
-+#endif
-+
- /* Todos:
- * - add (list and eventually write) support for write-only MSR
- * - add decoding support for bit fields
-@@ -119,13 +131,40 @@ static void version(void)
- fprintf(stdout, "%s version %s\n", g.prog, LSMSR_VERSION);
- }
-
-+#if defined(__FreeBSD__)
-+
-+static int get_msr_val(unsigned int msr, unsigned long long *val)
-+{
-+#if __FreeBSD_version < 701102
-+ cpu_msr_args_t args;
-+#else
-+ cpuctl_msr_args_t args;
-+#endif
-+
-+ args.msr = msr;
-+#if __FreeBSD_version < 701102
-+ if (ioctl(g.fd, CPU_RDMSR, &args) != 0) {
-+#else
-+ if (ioctl(g.fd, CPUCTL_RDMSR, &args) != 0) {
-+#endif
-+ fflush(stdout);
-+ fprintf(stderr,
-+ "could not read MSR 0x%8.8x (%s): %s\n",
-+ msr, get_reg_name(msr, g.msr_table), strerror(errno));
-+ return 0;
-+ }
-+ *val = args.data;
-+
-+ return 0;
-+}
-+#else /* !__FreeBSD__ */
- static int get_msr_val(unsigned int msr, unsigned long long *val)
- {
- off64_t off;
- int err;
-
- *val = 0;
-- off = lseek64(g.fd, (off64_t) msr, SEEK_SET);
-+ off = lseek(g.fd, (off64_t) msr, SEEK_SET);
- if (off == (off_t) -1) {
- perror("invalid MSR");
- return 1;
-@@ -144,11 +183,17 @@ static int get_msr_val(unsigned int msr,
- return 0;
- }
-
-+#endif
-+
- static int open_dev(int cpu)
- {
- char s[20];
-
-+#ifdef __FreeBSD__
-+ snprintf(s, sizeof(s), CPUDEV, cpu);
-+#else
- snprintf(s, sizeof(s), "/dev/cpu/%d/msr", cpu);
-+#endif
- g.fd = open(s, O_RDONLY);
- if (g.fd < 0)
- fprintf(stderr, "could not open device %s: %s\n", s,
-@@ -317,6 +362,7 @@ static int set_msr_table(void)
- }
-
- struct reg_spec unknown_msr = {0, "unknown", "(at your own risk)", NULL, NULL};
-+unsigned int nrCPUs = 1;
-
- #define OPT_MAX 32
- int main(int argc, char *argv[])
-@@ -325,6 +371,10 @@ int main(int argc, char *argv[])
- int i, li, ret;
- struct reg_spec *reg;
-
-+ nrCPUs = sysconf(_SC_NPROCESSORS_ONLN);
-+ if (nrCPUs > 65535)
-+ nrCPUs = 1;
-+
- ret = 1;
- if((g.prog = rindex(argv[0], '/')))
- ++g.prog;
diff --git a/sysutils/x86info/pkg-descr b/sysutils/x86info/pkg-descr
deleted file mode 100644
index 22b84139e5ef..000000000000
--- a/sysutils/x86info/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The x86info utility displays information about each of the x86 CPUs found in
-the system. Cache information, flags, registers, frequency, processor name,
-family, and model are all displayed. It works with all Intel, AMD, Centaur,
-Cyrix, VIA processors.