diff options
author | bjs <bjs> | 2008-11-03 22:01:29 +0000 |
---|---|---|
committer | bjs <bjs> | 2008-11-03 22:01:29 +0000 |
commit | 110bb031b75e2d5284a359c7e9c92c6dc8a5d65a (patch) | |
tree | a863023be06d675c3716bc57f85decf89ddaa95f /sysutils/pciutils | |
parent | f21e8af781bc972dfa6347f43393913f2aa2d8b1 (diff) | |
download | pkgsrc-110bb031b75e2d5284a359c7e9c92c6dc8a5d65a.tar.gz |
Update to version-3.0.2. Many, many changes--please see
the ChangeLog for details, they are way too numerous to
list here.
Bump BUILDLINK_API_DEPENDS.
TODO: use misc/pciids?
Diffstat (limited to 'sysutils/pciutils')
-rw-r--r-- | sysutils/pciutils/Makefile | 28 | ||||
-rw-r--r-- | sysutils/pciutils/PLIST | 6 | ||||
-rw-r--r-- | sysutils/pciutils/buildlink3.mk | 5 | ||||
-rw-r--r-- | sysutils/pciutils/distinfo | 12 | ||||
-rw-r--r-- | sysutils/pciutils/patches/patch-aa | 120 | ||||
-rw-r--r-- | sysutils/pciutils/patches/patch-ab | 13 | ||||
-rw-r--r-- | sysutils/pciutils/patches/patch-ac | 11 |
7 files changed, 141 insertions, 54 deletions
diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile index ee0560ba12f..74f5ebd4815 100644 --- a/sysutils/pciutils/Makefile +++ b/sysutils/pciutils/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2007/10/26 15:06:19 joerg Exp $ +# $NetBSD: Makefile,v 1.12 2008/11/03 22:01:29 bjs Exp $ -DISTNAME= pciutils-2.1.11 -PKGREVISION= 1 +DISTNAME= pciutils-3.0.2 CATEGORIES= sysutils MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \ ftp://ftp.kernel.org/pub/software/utils/pciutils/ \ @@ -13,19 +12,30 @@ COMMENT= PCI bus manipulation utility similar to NetBSD pcictl(8) PKG_DESTDIR_SUPPORT= user-destdir -# subdir build in libs, followed by linking with it, without .WAIT -MAKE_JOBS_SAFE= NO +MAKE_JOBS_SAFE= no +ONLY_FOR_PLATFORM= AIX-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* -USE_TOOLS+= gmake +INSTALL_TARGET= install install-lib +USE_TOOLS+= gmake pkg-config +REPLACE_SH= *.sh + +PKGCONFIG_OVERRIDE= lib/libpci.pc.in -ONLY_FOR_PLATFORM+= AIX-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -PLIST_SUBST+= PCIUTILS_LIBNAME="pciutils" +PCIUTILS_LIBNAME= pciutils .else -PLIST_SUBST+= PCIUTILS_LIBNAME="pci" +PCIUTILS_LIBNAME= pci .endif +PLIST_SUBST+= PCIUTILS_LIBNAME=${PCIUTILS_LIBNAME} + +SUBST_CLASSES= pc +SUBST_FILES.pc= lib/libpci.pc.in +SUBST_MESSAGE.pc= Fixing library link specification in pkg-config file. +SUBST_STAGE.pc= pre-configure +SUBST_VARS.pc= PCIUTILS_LIBNAME + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/pciutils/PLIST b/sysutils/pciutils/PLIST index a281d86f1c5..85809b54e2b 100644 --- a/sysutils/pciutils/PLIST +++ b/sysutils/pciutils/PLIST @@ -1,15 +1,17 @@ -@comment $NetBSD: PLIST,v 1.2 2003/09/19 09:30:43 cube Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/11/03 22:01:29 bjs Exp $ include/pciutils/config.h include/pciutils/header.h include/pciutils/pci.h +include/pciutils/types.h lib/lib${PCIUTILS_LIBNAME}.a +lib/pkgconfig/libpci.pc +man/man7/pcilib.7 man/man8/lspci.8 man/man8/setpci.8 man/man8/update-pciids.8 sbin/lspci sbin/setpci sbin/update-pciids -share/pciutils/README share/pciutils/pci.ids @dirrm share/pciutils @dirrm include/pciutils diff --git a/sysutils/pciutils/buildlink3.mk b/sysutils/pciutils/buildlink3.mk index b8d8a2b3110..27c7c1b7a66 100644 --- a/sysutils/pciutils/buildlink3.mk +++ b/sysutils/pciutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:09 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2008/11/03 22:01:29 bjs Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PCIUTILS_BUILDLINK3_MK:= ${PCIUTILS_BUILDLINK3_MK}+ @@ -12,8 +12,7 @@ BUILDLINK_PACKAGES+= pciutils BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pciutils .if !empty(PCIUTILS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.pciutils+= pciutils>=2.1.11 -BUILDLINK_ABI_DEPENDS.pciutils?= pciutils>=2.1.11nb1 +BUILDLINK_API_DEPENDS.pciutils+= pciutils>=3.0.2 BUILDLINK_PKGSRCDIR.pciutils?= ../../sysutils/pciutils BUILDLINK_DEPMETHOD.pciutils?= build .endif # PCIUTILS_BUILDLINK3_MK diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo index 15a4757c5c6..23e903b9ca2 100644 --- a/sysutils/pciutils/distinfo +++ b/sysutils/pciutils/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.4 2007/10/26 15:06:19 joerg Exp $ +$NetBSD: distinfo,v 1.5 2008/11/03 22:01:29 bjs Exp $ -SHA1 (pciutils-2.1.11.tar.gz) = bb1e107a745a40e208f676cffc0826ca8b928688 -RMD160 (pciutils-2.1.11.tar.gz) = 46b6aed92fb9a8b81e7bd0da23ed13963ce15456 -Size (pciutils-2.1.11.tar.gz) = 120948 bytes -SHA1 (patch-aa) = 03031ebefda815b1fc0cac1dbdfd5fc5cada463c +SHA1 (pciutils-3.0.2.tar.gz) = 4591785f6f70ed44e593933bb34012d83b4c3853 +RMD160 (pciutils-3.0.2.tar.gz) = bab0a8261267dd7be50c29984c1d813174c4a0f7 +Size (pciutils-3.0.2.tar.gz) = 270474 bytes +SHA1 (patch-aa) = fd5bbbc34e64ee9d989256d0defac03c581f8e80 +SHA1 (patch-ab) = 1448bb418cdc908eb6652cc98994d23d0d78cea0 +SHA1 (patch-ac) = c917e8ad2d1e87fa65a2d8f3256afd40d5a87396 diff --git a/sysutils/pciutils/patches/patch-aa b/sysutils/pciutils/patches/patch-aa index 80dabb76af8..1f4844723a7 100644 --- a/sysutils/pciutils/patches/patch-aa +++ b/sysutils/pciutils/patches/patch-aa @@ -1,48 +1,98 @@ -$NetBSD: patch-aa,v 1.3 2007/10/26 15:06:19 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2008/11/03 22:01:29 bjs Exp $ ---- Makefile.orig 2003-01-04 13:53:01.000000000 +0100 +--- Makefile.orig 2008-09-19 14:09:09.000000000 -0400 +++ Makefile -@@ -10,13 +10,15 @@ VERSION=2.1.11 - #SUFFIX=-pre2 - DATE=2003-01-04 +@@ -1,8 +1,7 @@ + # Makefile for The PCI Utilities + # (c) 1998--2008 Martin Mares <mj@ucw.cz> +-OPT=-O2 +-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes ++CFLAGS+=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes + + VERSION=3.0.2 + DATE=2008-09-19 +@@ -12,7 +11,7 @@ HOST= + RELEASE= + + # Support for compressed pci.ids (yes/no, default: detect) +-ZLIB= ++ZLIB=no + + # Support for resolving ID's by DNS (yes/no, default: detect) + DNS= +@@ -21,22 +20,22 @@ DNS= + SHARED=no + + # ABI version suffix in the name of the shared library +-ABI_VERSION=.3 ++ABI_VERSION=-version-info 3:0 + + # Installation directories -PREFIX=/usr/local +#PREFIX=/usr/local SBINDIR=$(PREFIX)/sbin -SHAREDIR=$(PREFIX)/share --MANDIR=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) +SHAREDIR=$(PREFIX)/share/pciutils -+MANDIR=$(PREFIX)/${PKGMANDIR} - INSTALL=install + IDSDIR=$(SHAREDIR) +-MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi) +-INCDIR=$(PREFIX)/include ++MANDIR=$(PREFIX)/$(PKGMANDIR) ++INCDIR=$(PREFIX)/include/pciutils + LIBDIR=$(PREFIX)/lib + PKGCFDIR=$(LIBDIR)/pkgconfig + + # Commands +-INSTALL=install -DIRINSTALL=install -d -+DIRINSTALL=$(INSTALL) -d - PCILIB=libpci.a -+LIBDIR=$(PREFIX)/lib -+INCLUDEDIR=$(PREFIX)/include/pciutils +-STRIP=-s ++#INSTALL=install ++#DIRINSTALL=$(INSTALL) -d ++#STRIP=-s + AR=ar + RANLIB=ranlib - ifeq ($(shell uname),NetBSD) - PCILIB=libpciutils.a -@@ -58,11 +60,18 @@ clean: +@@ -90,23 +89,31 @@ distclean: clean install: all # -c is ignored on Linux, but required on FreeBSD -- $(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8 -- $(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR) -- $(INSTALL) -c -m 755 update-pciids $(SBINDIR) -- $(INSTALL) -c -m 644 pci.ids $(SHAREDIR) -- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8 -+ $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) -+ $(DIRINSTALL) -m 755 $(DESTDIR)$(SHAREDIR) -+ $(DIRINSTALL) -m 755 $(DESTDIR)$(MANDIR)/man8 -+ $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR) -+ $(DIRINSTALL) -m 755 $(DESTDIR)$(INCLUDEDIR) -+ $(INSTALL) -c -m 755 -s lspci setpci $(DESTDIR)$(SBINDIR) -+ $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) -+ $(INSTALL) -c -m 644 pci.ids $(DESTDIR)$(SHAREDIR) -+ $(INSTALL) -c -m 644 README $(DESTDIR)$(SHAREDIR) -+ $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 -+ $(INSTALL) -c -m 444 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -c -m 644 lib/pci.h lib/header.h lib/config.h $(DESTDIR)$(INCLUDEDIR) - - uninstall: all - rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids +- $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 +- $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR) +- $(INSTALL) -c -m 755 update-pciids $(DESTDIR)$(SBINDIR) +- $(INSTALL) -c -m 644 $(PCI_IDS) $(DESTDIR)$(IDSDIR) +- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 +- $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7 ++ $(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_PROGRAM) lspci $(DESTDIR)$(SBINDIR) ++ $(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 + ifeq ($(SHARED),yes) +- $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR) +- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) ++ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LIBDIR) ++ $(BSD_INSTALL_LIB) lib/$(PCILIB) $(DESTDIR)$(LIBDIR) + ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION) + endif + + install-lib: $(PCIINC_INS) lib/$(PCILIB) lib/$(PCILIBPC) +- $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR) +- $(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci +- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) +- $(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR) ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INCDIR) ++ $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(LIBDIR) ++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PKGCFDIR) ++ $(BSD_INSTALL_DATA) $(PCIINC_INS) $(DESTDIR)$(INCDIR) ++ $(BSD_INSTALL_LIB) lib/$(PCILIB) $(DESTDIR)$(LIBDIR) ++ $(BSD_INSTALL_DATA) lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR) + ifeq ($(SHARED),yes) + ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so + endif diff --git a/sysutils/pciutils/patches/patch-ab b/sysutils/pciutils/patches/patch-ab new file mode 100644 index 00000000000..3d875460b5d --- /dev/null +++ b/sysutils/pciutils/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2008/11/03 22:01:29 bjs Exp $ + +--- lib/configure.orig 2008-09-19 14:04:37.000000000 -0400 ++++ lib/configure +@@ -179,7 +179,7 @@ else + echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).so$(ABI_VERSION)' + fi + fi +-echo >>$m 'PCILIBPC=$(LIBNAME).pc' ++echo >>$m 'PCILIBPC=libpci.pc' + + echo >>$c "#define PCILIB_VERSION \"$VERSION\"" + sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m diff --git a/sysutils/pciutils/patches/patch-ac b/sysutils/pciutils/patches/patch-ac new file mode 100644 index 00000000000..844b2ebaa4b --- /dev/null +++ b/sysutils/pciutils/patches/patch-ac @@ -0,0 +1,11 @@ +$NetBSD: patch-ac,v 1.1 2008/11/03 22:01:29 bjs Exp $ + +--- lib/libpci.pc.in.orig 2008-04-10 15:15:47.000000000 -0400 ++++ lib/libpci.pc.in +@@ -6,5 +6,5 @@ idsdir=@IDSDIR@ + Name: libpci + Description: libpci + Version: @VERSION@ +-Libs: -L${libdir} -lpci @LDLIBS@ ++Libs: -L${libdir} -l@PCIUTILS_LIBNAME@ @LDLIBS@ + Cflags: -I${includedir} |