$NetBSD: patch-aa,v 1.31 2023/05/08 02:06:37 dholland Exp $ Adapt the Makefile to make it compliant with pkgsrc. --- Makefile.orig 2023-05-01 12:59:54.000000000 +0000 +++ Makefile @@ -1,8 +1,7 @@ # Makefile for The PCI Utilities # (c) 1998--2023 Martin Mares -OPT=-O2 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes +CFLAGS=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes VERSION=3.10.0 DATE=2023-05-01 @@ -13,7 +12,7 @@ RELEASE= CROSS_COMPILE= # Support for compressed pci.ids (yes/no, default: detect) -ZLIB= +ZLIB=no # Support for resolving ID's by DNS (yes/no, default: detect) DNS= @@ -46,10 +45,10 @@ PKGCFDIR=$(LIBDIR)/pkgconfig INSTALL=install DIRINSTALL=install -d ifdef CROSS_COMPILE -STRIP=--strip-program $(CROSS_COMPILE)-strip +#STRIP=--strip-program $(CROSS_COMPILE)-strip CC=$(CROSS_COMPILE)gcc else -STRIP=-s +#STRIP=-s CC=cc endif AR=$(CROSS_COMPILE)ar @@ -148,18 +147,21 @@ distclean: clean install: all # -c is ignored on Linux, but required on FreeBSD - $(DIRINSTALL) -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 $(DESTDIR)$(MANDIR)/man5 - $(INSTALL) -c -m 755 $(STRIP) lspci$(EXEEXT) $(DESTDIR)$(LSPCIDIR) - $(INSTALL) -c -m 755 $(STRIP) setpci$(EXEEXT) $(DESTDIR)$(SBINDIR) - $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) -ifneq ($(IDSDIR),) - $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) -else - $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(SBINDIR) -endif - $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 - $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7 - $(INSTALL) -c -m 644 pci.ids.5 $(DESTDIR)$(MANDIR)/man5 + $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(BINDIR) + $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(SBINDIR) + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(IDSDIR) + $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man8 + $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(MANDIR)/man7 + $(BSD_INSTALL_MAN_DIR) $(DESTDIR)/$(MANDIR)/man5 + $(BSD_INSTALL_PROGRAM) lspci $(DESTDIR)$(LSPCIDIR) + $(BSD_INSTALL_PROGRAM) setpci $(DESTDIR)$(SBINDIR) + $(BSD_INSTALL_SCRIPT) update-pciids $(DESTDIR)$(SBINDIR) + $(BSD_INSTALL_DATA) $(PCI_IDS) $(DESTDIR)$(IDSDIR) + for fn in lspci.8 setpci.8 update-pciids.8; do \ + $(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(MANDIR)/man8; \ + done + $(BSD_INSTALL_MAN) pcilib.7 $(DESTDIR)$(MANDIR)/man7 + $(BSD_INSTALL_MAN) pci.ids.5 $(DESTDIR)$(MANDIR)/man5 ifeq ($(SHARED),yes) ifeq ($(LIBEXT),dylib) ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(ABI_VERSION).$(LIBEXT) @@ -173,19 +175,14 @@ install: install-pcilib endif install-pcilib: lib/$(PCILIB) - $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR) -ifeq ($(SHARED)_$(LIBEXT),yes_dll) -# DLL library must have executable flag on disk and be placed in same directory as where are EXE files - $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) - $(INSTALL) -c -m 755 lib/$(PCILIB) $(DESTDIR)$(SBINDIR) -else - $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) -endif + $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LIBDIR) + $(BSD_INSTALL_LIB) lib/$(PCILIB) $(DESTDIR)$(LIBDIR) install-lib: $(PCIINC_INS) install-pcilib - $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR) - $(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci - $(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR) + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INCDIR)/pci + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PKGCFDIR) + $(BSD_INSTALL_DATA) $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci + $(BSD_INSTALL_DATA) lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR) ifneq ($(PCIIMPLIB),$(PCILIB)) $(INSTALL) -c -m 644 lib/$(PCIIMPLIB) $(DESTDIR)$(LIBDIR) endif