diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile index d091a566796e..1a1b73f2196c 100644 --- a/sysutils/pciutils/Makefile +++ b/sysutils/pciutils/Makefile @@ -1,37 +1,37 @@ PORTNAME= pciutils -PORTVERSION= 3.9.0 +PORTVERSION= 3.10.0 CATEGORIES= sysutils MASTER_SITES= KERNEL_ORG/software/utils/pciutils \ LOCAL/sunpoet MAINTAINER= sunpoet@FreeBSD.org COMMENT= PCI configuration utilities WWW= https://mj.ucw.cz/sw/pciutils/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= libpci>=${PORTVERSION}:devel/libpci LIB_DEPENDS= libpci.so:devel/libpci RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids USES= gmake localbase:ldflags tar:xz ALL_TARGET= lspci lspci.8 setpci setpci.8 CFLAGS+= -fPIC LDFLAGS+= -lpci PLIST_FILES= bin/lspci \ bin/setpci \ share/man/man8/lspci.8.gz \ share/man/man8/setpci.8.gz do-configure: ${CP} ${LOCALBASE}/include/pci/config.h ${WRKSRC}/lib/config.h ${CP} ${LOCALBASE}/share/libpci/config.mk ${WRKSRC}/lib/config.mk do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lspci ${WRKSRC}/setpci ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/lspci.8 ${WRKSRC}/setpci.8 ${STAGEDIR}${PREFIX}/share/man/man8/ .include diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo index fbbdbeb2adbd..4490fcd78285 100644 --- a/sysutils/pciutils/distinfo +++ b/sysutils/pciutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674589548 -SHA256 (pciutils-3.9.0.tar.xz) = cdea7ae97239dee23249a09c68a19a287a3f109fbeb2c232ebb616cb38599012 -SIZE (pciutils-3.9.0.tar.xz) = 431624 +TIMESTAMP = 1683227595 +SHA256 (pciutils-3.10.0.tar.xz) = 238a2e27166730e53a17fe07bfad229e07fa39b618117e5944b6d7eda9fbb0e9 +SIZE (pciutils-3.10.0.tar.xz) = 444080 diff --git a/sysutils/pciutils/files/patch-Makefile b/sysutils/pciutils/files/patch-Makefile index d6c4eaff5e3b..536b904e3597 100644 --- a/sysutils/pciutils/files/patch-Makefile +++ b/sysutils/pciutils/files/patch-Makefile @@ -1,73 +1,77 @@ ---- Makefile.orig 2022-11-20 11:58:03 UTC +--- Makefile.orig 2023-05-01 12:59:54 UTC +++ Makefile @@ -1,8 +1,8 @@ # Makefile for The PCI Utilities - # (c) 1998--2022 Martin Mares + # (c) 1998--2023 Martin Mares -OPT=-O2 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes +#OPT=-O2 +CFLAGS+=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes - VERSION=3.9.0 - DATE=2022-11-20 + VERSION=3.10.0 + DATE=2023-05-01 @@ -32,11 +32,11 @@ HWDB= ABI_VERSION=3 # Installation directories -PREFIX=/usr/local +#PREFIX=/usr/local BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin SHAREDIR=$(PREFIX)/share -IDSDIR=$(SHAREDIR) +IDSDIR=$(SHAREDIR)/pciids MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) INCDIR=$(PREFIX)/include LIBDIR=$(PREFIX)/lib -@@ -46,11 +46,11 @@ PKGCFDIR=$(LIBDIR)/pkgconfig +@@ -45,13 +45,13 @@ PKGCFDIR=$(LIBDIR)/pkgconfig + # Commands INSTALL=install DIRINSTALL=install -d - STRIP=-s -ifdef CROSS_COMPILE +-STRIP=--strip-program $(CROSS_COMPILE)-strip -CC=$(CROSS_COMPILE)gcc -else +-STRIP=-s -CC=cc -endif +#ifdef CROSS_COMPILE ++#STRIP=--strip-program $(CROSS_COMPILE)-strip +#CC=$(CROSS_COMPILE)gcc +#else ++#STRIP=-s +#CC=cc +#endif AR=$(CROSS_COMPILE)ar RANLIB=$(CROSS_COMPILE)ranlib DLLTOOL=$(CROSS_COMPILE)dlltool -@@ -66,7 +66,7 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/typ +@@ -67,7 +67,7 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/typ export -all: lib/$(PCIIMPLIB) lspci$(EXEEXT) setpci$(EXEEXT) example$(EXEEXT) lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS) +all: lspci$(EXEEXT) setpci$(EXEEXT) example$(EXEEXT) lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS) lib/$(PCIIMPLIB): $(PCIINC) force $(MAKE) -C lib all -@@ -82,8 +82,8 @@ PCIINC+=compat/getopt.h +@@ -83,8 +83,8 @@ PCIINC+=compat/getopt.h COMMON+=compat/getopt.o endif -lspci$(EXEEXT): lspci.o ls-vpd.o ls-caps.o ls-caps-vendor.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o $(COMMON) lib/$(PCIIMPLIB) -setpci$(EXEEXT): setpci.o $(COMMON) lib/$(PCIIMPLIB) +lspci$(EXEEXT): lspci.o ls-vpd.o ls-caps.o ls-caps-vendor.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o $(COMMON) +setpci$(EXEEXT): setpci.o $(COMMON) LSPCIINC=lspci.h pciutils.h $(PCIINC) lspci.o: lspci.c $(LSPCIINC) -@@ -106,7 +106,7 @@ update-pciids: update-pciids.sh +@@ -107,7 +107,7 @@ update-pciids: update-pciids.sh chmod +x $@ # The example of use of libpci -example$(EXEEXT): example.o lib/$(PCIIMPLIB) +example$(EXEEXT): example.o example.o: example.c $(PCIINC) %$(EXEEXT): %.o