git: 4ffa67f5a454 - main - sysutils/pciutils: Update to 3.8.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Tue, 26 Apr 2022 15:04:32 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ffa67f5a45455734d7b7d7b140e1ee9e7daea4b

commit 4ffa67f5a45455734d7b7d7b140e1ee9e7daea4b
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-04-26 14:52:50 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-04-26 15:01:15 +0000

    sysutils/pciutils: Update to 3.8.0
    
    Changes:        https://github.com/pciutils/pciutils/blob/master/ChangeLog
---
 sysutils/pciutils/Makefile             |  2 +-
 sysutils/pciutils/distinfo             |  6 ++--
 sysutils/pciutils/files/patch-Makefile | 55 ++++++++++++++++++++--------------
 3 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index d2b4d9a7dff1..dc2ffd938cf3 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,7 +1,7 @@
 # Created by: Samy Al Bahra <samy@kerneled.org>
 
 PORTNAME=	pciutils
-PORTVERSION=	3.7.0
+PORTVERSION=	3.8.0
 CATEGORIES=	sysutils
 MASTER_SITES=	KERNEL_ORG/software/utils/pciutils \
 		LOCAL/sunpoet
diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo
index 985c7a6e09dc..91c3c3582872 100644
--- a/sysutils/pciutils/distinfo
+++ b/sysutils/pciutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590926981
-SHA256 (pciutils-3.7.0.tar.xz) = 9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb
-SIZE (pciutils-3.7.0.tar.xz) = 371612
+TIMESTAMP = 1650970055
+SHA256 (pciutils-3.8.0.tar.xz) = 91edbd0429a84705c9ad156d4ff38ccc724d41ea54c4c5b88e38e996f8a34f05
+SIZE (pciutils-3.8.0.tar.xz) = 410144
diff --git a/sysutils/pciutils/files/patch-Makefile b/sysutils/pciutils/files/patch-Makefile
index 26226b1887e6..f79f116c98cf 100644
--- a/sysutils/pciutils/files/patch-Makefile
+++ b/sysutils/pciutils/files/patch-Makefile
@@ -1,22 +1,23 @@
---- Makefile.orig	2020-05-30 22:17:26 UTC
+--- Makefile.orig	2022-04-18 16:47:28 UTC
 +++ Makefile
 @@ -1,8 +1,8 @@
  # Makefile for The PCI Utilities
- # (c) 1998--2020 Martin Mares <mj@ucw.cz>
+ # (c) 1998--2022 Martin Mares <mj@ucw.cz>
  
 -OPT=-O2
 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
-+# OPT=-O2
++#OPT=-O2
 +CFLAGS+=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=3.7.0
- DATE=2020-05-31
-@@ -32,10 +32,10 @@ HWDB=
+ VERSION=3.8.0
+ DATE=2022-04-18
+@@ -32,11 +32,11 @@ HWDB=
  ABI_VERSION=.3
  
  # Installation directories
 -PREFIX=/usr/local
-+# PREFIX=/usr/local
++#PREFIX=/usr/local
+ BINDIR=$(PREFIX)/bin
  SBINDIR=$(PREFIX)/sbin
  SHAREDIR=$(PREFIX)/share
 -IDSDIR=$(SHAREDIR)
@@ -24,41 +25,49 @@
  MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
  INCDIR=$(PREFIX)/include
  LIBDIR=$(PREFIX)/lib
-@@ -45,7 +45,7 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
+@@ -46,11 +46,11 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
  INSTALL=install
  DIRINSTALL=install -d
  STRIP=-s
+-ifdef CROSS_COMPILE
 -CC=$(CROSS_COMPILE)gcc
-+# CC=$(CROSS_COMPILE)gcc
+-else
+-CC=cc
+-endif
++#ifdef CROSS_COMPILE
++#CC=$(CROSS_COMPILE)gcc
++#else
++#CC=cc
++#endif
  AR=$(CROSS_COMPILE)ar
  RANLIB=$(CROSS_COMPILE)ranlib
  
-@@ -59,7 +59,7 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/typ
+@@ -64,7 +64,7 @@ PCIINC_INS=lib/config.h lib/header.h lib/pci.h lib/typ
  
  export
  
--all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS)
-+all: lspci setpci example lspci.8 setpci.8 pcilib.7 pci.ids.5 update-pciids update-pciids.8 $(PCI_IDS)
+-all: lib/$(PCILIB) 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/$(PCILIB): $(PCIINC) force
  	$(MAKE) -C lib all
-@@ -69,8 +69,8 @@ force:
- lib/config.h lib/config.mk:
- 	cd lib && ./configure
+@@ -80,8 +80,8 @@ PCIINC+=compat/getopt.h
+ COMMON+=compat/getopt.o
+ endif
  
--lspci: 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.o lib/$(PCILIB)
--setpci: setpci.o common.o lib/$(PCILIB)
-+lspci: 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.o
-+setpci: setpci.o common.o
+-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/$(PCILIB)
+-setpci$(EXEEXT): setpci.o $(COMMON) lib/$(PCILIB)
++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)
-@@ -92,7 +92,7 @@ update-pciids: update-pciids.sh
+@@ -104,7 +104,7 @@ update-pciids: update-pciids.sh
  	chmod +x $@
  
  # The example of use of libpci
--example: example.o lib/$(PCILIB)
-+example: example.o
+-example$(EXEEXT): example.o lib/$(PCILIB)
++example$(EXEEXT): example.o
  example.o: example.c $(PCIINC)
  
- %: %.o
+ %$(EXEEXT): %.o