Index: branches/2020Q4/devel/libpci/Makefile
===================================================================
--- branches/2020Q4/devel/libpci/Makefile	(revision 551906)
+++ branches/2020Q4/devel/libpci/Makefile	(revision 551907)
@@ -1,54 +1,55 @@
 # Created by: Samy Al Bahra <samy@kerneled.org>
 # $FreeBSD$
 
 PORTNAME=	libpci
 PORTVERSION=	3.7.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/utils/pciutils \
 		LOCAL/sunpoet
 DISTNAME=	pciutils-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PCI configuration space I/O made easy
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/pciids/pci.ids:misc/pciids
 
 USES=		gmake tar:xz
 
 ALL_TARGET=	lib/libpci.a
 CFLAGS+=	-fPIC
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	${LIBPCI_FILES} \
 		lib/libpci.so
 PORTDATA=	config.mk
 
 LIBPCI_FILES=	include/pci/config.h \
 		include/pci/header.h \
 		include/pci/pci.h \
 		include/pci/types.h \
 		lib/libpci.a \
 		lib/libpci.so.3 \
 		libdata/pkgconfig/libpci.pc
 
 post-patch:
 	@${LN} -s . ${WRKSRC}/lib/pci
 
 do-configure:
 	@cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} lib/config.h
 
 post-build:
 	@cd ${WRKSRC}/lib/ && ${CC} ${CFLAGS} ${STRIP} -Wl,-soname=libpci.so.3 -shared *.o -lz -o libpci.so.3
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/pci/ ${STAGEDIR}${DATADIR}/
 .for file in ${LIBPCI_FILES}
 	${INSTALL_DATA} ${WRKSRC}/lib/${file:T} ${STAGEDIR}${PREFIX}/${file}
 .endfor
 	${LN} -fs libpci.so.3 ${STAGEDIR}${PREFIX}/lib/libpci.so
 	${INSTALL_DATA} ${WRKSRC}/lib/config.mk ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
Index: branches/2020Q4/devel/libpci/files/patch-Makefile
===================================================================
--- branches/2020Q4/devel/libpci/files/patch-Makefile	(revision 551906)
+++ branches/2020Q4/devel/libpci/files/patch-Makefile	(revision 551907)
@@ -1,31 +1,35 @@
 --- Makefile.orig	2020-05-30 22:17:26 UTC
 +++ Makefile
 @@ -1,8 +1,8 @@
  # Makefile for The PCI Utilities
  # (c) 1998--2020 Martin Mares <mj@ucw.cz>
  
 -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.7.0
  DATE=2020-05-31
-@@ -32,7 +32,7 @@ HWDB=
+@@ -32,10 +32,10 @@ HWDB=
  ABI_VERSION=.3
  
  # Installation directories
 -PREFIX=/usr/local
 +# PREFIX=/usr/local
  SBINDIR=$(PREFIX)/sbin
  SHAREDIR=$(PREFIX)/share
- IDSDIR=$(SHAREDIR)
+-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
 @@ -45,7 +45,7 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
  INSTALL=install
  DIRINSTALL=install -d
  STRIP=-s
 -CC=$(CROSS_COMPILE)gcc
 +# CC=$(CROSS_COMPILE)gcc
  AR=$(CROSS_COMPILE)ar
  RANLIB=$(CROSS_COMPILE)ranlib
  
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 551906)
+++ branches/2020Q4	(revision 551907)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r551866