5 files changed, 67 insertions, 34 deletions
diff --git a/source/a/pciutils/pciutils.SlackBuild b/source/a/pciutils/pciutils.SlackBuild
index b3425b6a..03268420 100755
--- a/source/a/pciutils/pciutils.SlackBuild
+++ b/source/a/pciutils/pciutils.SlackBuild
@@ -24,7 +24,7 @@
 VERSION=${VERSION:-$(echo pciutils-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:--j6}
+NUMJOBS=${NUMJOBS:--j3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -65,21 +65,19 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Fetch the latest pci.ids:
-rm -f pci.ids
-sh update-pciids.sh
-# Now fix the update-pciids script and preinstall it before 'make install' 
-# decides that it knows best
-zcat $CWD/pciutils.ids.dest.diff.gz | patch -p1 --verbose || exit 1
-mkdir -p $PKG/usr/sbin
-cat update-pciids.sh > $PKG/usr/sbin/update-pciids
-chmod 0755 $PKG/usr/sbin/update-pciids
+zcat $CWD/pciutils.dontcompress.diff.gz | patch -p1 || exit 1
+zcat $CWD/pciutils.update.pci.ids.url.diff.gz | patch -p1 || exit 1
 
+# Make and install the shared library
 make \
   PREFIX=/usr \
   SBINDIR=/sbin \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
   MANDIR=/usr/man \
+  IDSDIR=/usr/share/hwdata \
+  PCI_IDS=pci.ids \
+  PCI_COMPRESSED_IDS=0 \
+  SHARED=no \
   OPT="$SLKCFLAGS" \
   $NUMJOBS || exit 1
 
@@ -88,26 +86,52 @@ make install install-lib \
   SBINDIR=/sbin \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
   MANDIR=/usr/man \
+  IDSDIR=/usr/share/hwdata \
+  PCI_IDS=pci.ids \
+  PCI_COMPRESSED_IDS=0 \
+  SHARED=no \
   DESTDIR=$PKG
 
-# Do not compress pci.ids - hal needs it uncompressed
+mkdir -p $PKG/usr/sbin
+mv $PKG/sbin/update-pciids $PKG/usr/sbin/update-pciids
+
+# Do not compress pci.ids
 ( cd $PKG/usr/share ; gzip -d pci.ids.gz )
-# Remove the update-pciids script that 'make install' placed
-rm -f $PKG/sbin/update-pciids
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+# Put a compat symlink in place 
+ln -s hwdata/pci.ids $PKG/usr/share/pci.ids
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+  ( cd $PKG/usr/man
+    for manpagedir in $(find . -type d -name "man*") ; do
+      ( cd $manpagedir
+        for eachpage in $( find . -type l -maxdepth 1) ; do
+          ln -s $( readlink $eachpage ).gz $eachpage.gz
+          rm $eachpage
+        done
+        gzip -9 *.?
+      )
+    done
+  )
+fi
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 mkdir -p $PKG/usr/doc/pciutils-$VERSION
 cp -a \
-  ChangeLog README TODO \
+  COPYING* README TODO \
   $PKG/usr/doc/pciutils-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/a/pciutils/pciutils.dontcompress.diff b/source/a/pciutils/pciutils.dontcompress.diff
new file mode 100644
index 00000000..91089b8e
--- /dev/null
+++ b/source/a/pciutils/pciutils.dontcompress.diff
@@ -0,0 +1,11 @@
+--- ./update-pciids.sh.orig	2012-01-14 08:29:38.000000000 -0600
++++ ./update-pciids.sh	2012-07-02 21:27:47.524912718 -0500
+@@ -5,7 +5,7 @@
+ set -e
+ SRC="http://pci-ids.ucw.cz/v2.2/pci.ids"
+ DEST=pci.ids
+-PCI_COMPRESSED_IDS=
++PCI_COMPRESSED_IDS=0
+ GREP=grep
+ 
+ # if pci.ids is read-only (because the filesystem is read-only),
diff --git a/source/a/pciutils/pciutils.ids.dest.diff b/source/a/pciutils/pciutils.ids.dest.diff
deleted file mode 100644
index 98d152c2..00000000
--- a/source/a/pciutils/pciutils.ids.dest.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur pciutils-3.1.3.orig/update-pciids.sh pciutils-3.1.3/update-pciids.sh
---- pciutils-3.1.3.orig/update-pciids.sh	2008-11-10 17:11:51.000000000 -0600
-+++ pciutils-3.1.3/update-pciids.sh	2009-07-29 02:23:53.102308103 -0500
-@@ -3,8 +3,8 @@
- [ "$1" = "-q" ] && quiet=true || quiet=false
- 
- set -e
--SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
--DEST=pci.ids
-+SRC="http://pciids.sourceforge.net/pci.ids"
-+DEST=/usr/share/pci.ids
- PCI_COMPRESSED_IDS=
- GREP=grep
- 
diff --git a/source/a/pciutils/pciutils.update.pci.ids.url.diff b/source/a/pciutils/pciutils.update.pci.ids.url.diff
new file mode 100644
index 00000000..1588f729
--- /dev/null
+++ b/source/a/pciutils/pciutils.update.pci.ids.url.diff
@@ -0,0 +1,11 @@
+--- ./update-pciids.sh.orig	2012-07-02 21:45:31.280890064 -0500
++++ ./update-pciids.sh	2012-07-02 21:46:03.875889369 -0500
+@@ -3,7 +3,7 @@
+ [ "$1" = "-q" ] && quiet=true || quiet=false
+ 
+ set -e
+-SRC="http://pci-ids.ucw.cz/v2.2/pci.ids"
++SRC="http://pciids.sourceforge.net/pci.ids"
+ DEST=pci.ids
+ PCI_COMPRESSED_IDS=0
+ GREP=grep
diff --git a/source/a/pciutils/pciutils.url b/source/a/pciutils/pciutils.url
index e77494b5..66d422ce 100644
--- a/source/a/pciutils/pciutils.url
+++ b/source/a/pciutils/pciutils.url
@@ -1,2 +1,3 @@
-#ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
-ftp.kernel.org:/pub/software/utils/pciutils/
+ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
+ftp://ftp.kernel.org/pub/software/utils/pciutils/
+ftp://metalab.unc.edu/pub/Linux/hardware/
+\ No newline at end of file