svn commit: r527571 - in head/sysutils/pciutils: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sun Mar  1 18:18:00 2020
New Revision: 527571
URL: https://svnweb.freebsd.org/changeset/ports/527571

Log:
  Convert REINPLACE_CMD to patch file

Added:
  head/sysutils/pciutils/files/
  head/sysutils/pciutils/files/patch-Makefile   (contents, props changed)
Modified:
  head/sysutils/pciutils/Makefile

Modified: head/sysutils/pciutils/Makefile
==============================================================================
--- head/sysutils/pciutils/Makefile	Sun Mar  1 18:17:55 2020	(r527570)
+++ head/sysutils/pciutils/Makefile	Sun Mar  1 18:18:00 2020	(r527571)
@@ -29,9 +29,6 @@ PLIST_FILES=	bin/lspci \
 		share/man/man8/lspci.8.gz \
 		share/man/man8/setpci.8.gz
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/ s|=|+=|; /^IDSDIR=/ s|$$|/pciids|; /^OPT=/d; /^PREFIX=/d; s| lib/$$(PCILIB)||' ${WRKSRC}/Makefile
-
 do-configure:
 	${CP} ${LOCALBASE}/include/pci/config.h ${WRKSRC}/lib/config.h
 	${CP} ${LOCALBASE}/share/libpci/config.mk ${WRKSRC}/lib/config.mk

Added: head/sysutils/pciutils/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/pciutils/files/patch-Makefile	Sun Mar  1 18:18:00 2020	(r527571)
@@ -0,0 +1,64 @@
+--- Makefile.orig	2020-01-25 19:42:39 UTC
++++ Makefile
+@@ -1,8 +1,8 @@
+ # Makefile for The PCI Utilities
+ # (c) 1998--2020 Martin Mares <mj at 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.6.4
+ DATE=2020-01-25
+@@ -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)/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
+ 
+@@ -59,7 +59,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)
+ 
+ lib/$(PCILIB): $(PCIINC) force
+ 	$(MAKE) -C lib all
+@@ -69,8 +69,8 @@ force:
+ lib/config.h lib/config.mk:
+ 	cd lib && ./configure
+ 
+-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
+ 
+ LSPCIINC=lspci.h pciutils.h $(PCIINC)
+ lspci.o: lspci.c $(LSPCIINC)
+@@ -92,7 +92,7 @@ update-pciids: update-pciids.sh
+ 	chmod +x $@
+ 
+ # The example of use of libpci
+-example: example.o lib/$(PCILIB)
++example: example.o
+ example.o: example.c $(PCIINC)
+ 
+ %: %.o