ports/129161: [PATCH] sysutils/pciutils: update to 3.0.3

[Yi-Jheng Lin]

>Number:         129161
>Category:       ports
>Synopsis:       [PATCH] sysutils/pciutils: update to 3.0.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 25 07:50:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Yi-Jheng Lin
>Release:        FreeBSD 7.0-RELEASE-p4 amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD stucgi 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #0: Fri Sep  5 14:56:26 CST
>Description:
- Update to 3.0.3

Port maintainer (sbahra at gwu.edu) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- pciutils-3.0.3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/pciutils/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	28 Oct 2007 21:18:12 -0000	1.11
+++ Makefile	25 Nov 2008 07:46:11 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pciutils
-PORTVERSION=	2.2.8
+PORTVERSION=	3.0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
 		ftp://ftp.kernel.org/pub/software/utils/pciutils/ \
@@ -16,17 +16,22 @@
 COMMENT=	PCI configuration utilities
 
 USE_GMAKE=	yes
-MAKE_ENV=	LANG=C
 
 MAN8=		lspci.8 setpci.8 update-pciids.8
 
 do-install:
-	@${INSTALL_MAN} ${WRKSRC}/lspci.8 ${PREFIX}/man/man8
-	@${INSTALL_MAN} ${WRKSRC}/setpci.8 ${PREFIX}/man/man8
-	@${INSTALL_MAN} ${WRKSRC}/update-pciids.8 ${PREFIX}/man/man8
-	@${INSTALL_PROGRAM} ${WRKSRC}/lspci ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/setpci ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/update-pciids ${PREFIX}/sbin
-	@${INSTALL_DATA} ${WRKSRC}/pci.ids ${PREFIX}/share
+	${INSTALL_MAN} ${WRKSRC}/lspci.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/setpci.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/update-pciids.8 ${PREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/lspci ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/setpci ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/update-pciids ${PREFIX}/sbin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/pci.ids ${DATADIR}/pci.ids.sample
+
+post-install:
+	@if [ ! -f ${DATADIR}/pci.ids ]; then \
+		${CP} -p ${DATADIR}/pci.ids.sample ${DATADIR}/pci.ids ; \
+	fi
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/pciutils/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	28 Oct 2007 21:18:12 -0000	1.6
+++ distinfo	25 Nov 2008 07:46:11 -0000
@@ -1,3 +1,3 @@
-MD5 (pciutils-2.2.8.tar.gz) = c0b742521a13ef624b9a0a237f46c1c8
-SHA256 (pciutils-2.2.8.tar.gz) = 8bdbcac28a80e05799c3e788bbb24417059537aff53b8bf16c7c8e08b3979fa2
-SIZE (pciutils-2.2.8.tar.gz) = 232602
+MD5 (pciutils-3.0.3.tar.gz) = d07da501bb11e6af40acd036536c2e9a
+SHA256 (pciutils-3.0.3.tar.gz) = 6f9b244e1581940bb59e729cf844dc1a47d06a1238475f78725336f4423fba02
+SIZE (pciutils-3.0.3.tar.gz) = 280329
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/pciutils/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	13 Jun 2003 18:48:01 -0000	1.1
+++ pkg-plist	25 Nov 2008 07:46:11 -0000
@@ -1,4 +1,8 @@
 bin/lspci
 bin/setpci
 sbin/update-pciids
-share/pci.ids
+ at unexec if cmp -s %D/share/pciutils/pci.ids.sample %D/share/pciutils/pci.ids; then rm -f %D/share/pciutils/pci.ids; fi
+%%DATADIR%%/pci.ids.sample
+ at exec [ -f %B/pci.ids ] || cp -p %B/%f %B/pci.ids
+ at unexec rm -f %D/share/pciutils/pci.ids.old 2> /dev/null || true
+ at dirrmtry %%DATADIR%%
Index: files/patch-Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/pciutils/files/patch-Makefile,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile
--- files/patch-Makefile	28 Oct 2007 21:18:12 -0000	1.5
+++ files/patch-Makefile	25 Nov 2008 07:46:11 -0000
@@ -1,17 +1,39 @@
---- Makefile.orig	Fri May  5 21:46:32 2006
-+++ Makefile	Mon Nov 27 22:12:24 2006
-@@ -1,13 +1,11 @@
+--- Makefile.orig	2008-11-10 04:28:18.000000000 +0800
++++ Makefile	2008-11-25 15:08:08.000000000 +0800
+@@ -1,8 +1,7 @@
  # Makefile for The PCI Utilities
- # (c) 1998--2007 Martin Mares <mj at ucw.cz>
+ # (c) 1998--2008 Martin Mares <mj at ucw.cz>
  
 -OPT=-O2
 -CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS+=-Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
  
- VERSION=2.2.8
- DATE=2007-10-19
+ VERSION=3.0.3
+ DATE=2008-11-09
+@@ -13,7 +12,7 @@
+ CROSS_COMPILE=
  
--PREFIX=/usr/local
+ # Support for compressed pci.ids (yes/no, default: detect)
+-ZLIB=
++ZLIB=no
+ 
+ # Support for resolving ID's by DNS (yes/no, default: detect)
+ DNS=
+@@ -28,7 +27,7 @@
+ PREFIX=/usr/local
  SBINDIR=$(PREFIX)/sbin
  SHAREDIR=$(PREFIX)/share
- IDSDIR=$(SHAREDIR)
+-IDSDIR=$(SHAREDIR)
++IDSDIR=$(SHAREDIR)/pciutils
+ MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
+ INCDIR=$(PREFIX)/include
+ LIBDIR=$(PREFIX)/lib
+@@ -38,7 +37,7 @@
+ INSTALL=install
+ DIRINSTALL=install -d
+ STRIP=-s
+-CC=$(CROSS_COMPILE)gcc
++CC?=$(CROSS_COMPILE)gcc
+ AR=$(CROSS_COMPILE)ar
+ RANLIB=$(CROSS_COMPILE)ranlib
+ 
--- pciutils-3.0.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: