Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Mar 2020 18:17:45 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r527568 - in head/devel/libpci: . files
Message-ID:  <202003011817.021IHjOt007534@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Mar  1 18:17:45 2020
New Revision: 527568
URL: https://svnweb.freebsd.org/changeset/ports/527568

Log:
  Convert REINPLACE_CMD to patch files

Added:
  head/devel/libpci/files/
  head/devel/libpci/files/patch-Makefile   (contents, props changed)
  head/devel/libpci/files/patch-lib-pci.h   (contents, props changed)
Modified:
  head/devel/libpci/Makefile

Modified: head/devel/libpci/Makefile
==============================================================================
--- head/devel/libpci/Makefile	Sun Mar  1 18:17:38 2020	(r527567)
+++ head/devel/libpci/Makefile	Sun Mar  1 18:17:45 2020	(r527568)
@@ -37,8 +37,6 @@ LIBPCI_FILES=	include/pci/config.h \
 
 post-patch:
 	@${LN} -s . ${WRKSRC}/lib/pci
-	@${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/ s|=|+=|; /^IDSDIR=/ s|$$|/pciids|; /^OPT=/d; /^PREFIX=/d' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|^#include "|&pci/|' ${WRKSRC}/lib/pci.h
 
 do-configure:
 	@cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} lib/config.h

Added: head/devel/libpci/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libpci/files/patch-Makefile	Sun Mar  1 18:17:45 2020	(r527568)
@@ -0,0 +1,31 @@
+--- 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@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,7 +32,7 @@ HWDB=
+ ABI_VERSION=.3
+ 
+ # Installation directories
+-PREFIX=/usr/local
++# PREFIX=/usr/local
+ SBINDIR=$(PREFIX)/sbin
+ SHAREDIR=$(PREFIX)/share
+ IDSDIR=$(SHAREDIR)
+@@ -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
+ 

Added: head/devel/libpci/files/patch-lib-pci.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/libpci/files/patch-lib-pci.h	Sun Mar  1 18:17:45 2020	(r527568)
@@ -0,0 +1,17 @@
+--- lib/pci.h.orig	2020-01-25 19:42:39 UTC
++++ lib/pci.h
+@@ -10,11 +10,11 @@
+ #define _PCI_LIB_H
+ 
+ #ifndef PCI_CONFIG_H
+-#include "config.h"
++#include "pci/config.h"
+ #endif
+ 
+-#include "header.h"
+-#include "types.h"
++#include "pci/header.h"
++#include "pci/types.h"
+ 
+ #define PCI_LIB_VERSION 0x030604
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003011817.021IHjOt007534>