# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1486640269 -3600
# Node ID 8b8fae260ab72c77a52a695ddf6eb00c4e7aa5ce
# Parent  b0072f522c1732c83f0b52378b46c44ba98ac700
isapnptools: shrink

diff -r b0072f522c17 -r 8b8fae260ab7 busybox-boot/receipt
--- a/busybox-boot/receipt	Wed Feb 08 16:11:24 2017 +0100
+++ b/busybox-boot/receipt	Thu Feb 09 12:37:49 2017 +0100
@@ -6,10 +6,10 @@
 SHORT_DESC="Many common UNIX utilities for core-5in1/boot flavor."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WANTED="busybox"
 WEB_SITE="http://www.busybox.net/"
 CONFIG_FILES=""
 
+WANTED="busybox"
 DEPENDS="linux syslinux"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -20,8 +20,10 @@
 	CHOICE=static
 	for i in uclibc musl diet ; do
 		[ -x $src/busybox-$i ] || continue
-		[ $(stat -c %s $src/busybox-$i) -lt \
-	          $(stat -c %s $src/busybox-$CHOICE) ] &&
+		[ -x $src/busybox-$CHOICE ] &&
+			[ $(stat -c %s $src/busybox-$i) -ge \
+			  $(stat -c %s $src/busybox-$CHOICE) ] &&
+			continue
 		CHOICE=$i
 	done
 	cp -a $src/busybox-$CHOICE $fs/usr/share/boot/bin/busybox
diff -r b0072f522c17 -r 8b8fae260ab7 busybox-static/receipt
--- a/busybox-static/receipt	Wed Feb 08 16:11:24 2017 +0100
+++ b/busybox-static/receipt	Thu Feb 09 12:37:49 2017 +0100
@@ -6,11 +6,12 @@
 SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-DEPENDS=""
-WANTED="busybox"
 WEB_SITE="http://www.busybox.net/"
 CONFIG_FILES=""
 
+WANTED="busybox"
+DEPENDS=""
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
@@ -18,8 +19,10 @@
 	CHOICE=static
 	for i in uclibc musl diet ; do
 		[ -x $src/busybox-$i ] || continue
-		[ $(stat -c %s $src/busybox-$i) -lt \
-	          $(stat -c %s $src/busybox-$CHOICE) ] &&
+		[ -x $src/busybox-$CHOICE ] &&
+			[ $(stat -c %s $src/busybox-$i) -ge \
+			  $(stat -c %s $src/busybox-$CHOICE) ] &&
+			continue
 		CHOICE=$i
 	done
 	cp -a $src/busybox-$CHOICE $fs/usr/share/boot/busybox-static
@@ -27,5 +30,5 @@
 
 post_install()
 {
-    chmod 4755 "$1/usr/share/boot/busybox-static"
+	chmod 4755 "$1/usr/share/boot/busybox-static"
 }
diff -r b0072f522c17 -r 8b8fae260ab7 isapnptools/receipt
--- a/isapnptools/receipt	Wed Feb 08 16:11:24 2017 +0100
+++ b/isapnptools/receipt	Thu Feb 09 12:37:49 2017 +0100
@@ -13,11 +13,12 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
+	sed -i 's/pnpdump_main.$(OBJEXT)/isapnp_main.$(OBJEXT) &/' src/Makefile.*
+	sed -i 's/return/if (!strcmp(basename(argv[0]),"isapnp")) return (isapnp_main(argc, argv));\n&/' src/pnpdump.c
 	./configure --prefix=/usr --bindir=/bin \
-	--libexecdir=/usr/bin --mandir=/usr/share/man \
-	$CONFIGURE_ARGS
-	make
+		--libexecdir=/usr/bin --mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
+	make &&
 	make DESTDIR=$DESTDIR install
 }
 
@@ -25,5 +26,7 @@
 genpkg_rules()
 {
 	# move /usr/sbin/* /sbin to use pnptools *before* mounting /usr
-	cp -a $install/usr/sbin $fs
+	mkdir -p $fs/sbin
+	cp -a $install/usr/sbin/pnpdump $fs/sbin
+	ln $fs/sbin/pnpdump $fs/sbin/isapnp
 }
diff -r b0072f522c17 -r 8b8fae260ab7 xarchive/receipt
--- a/xarchive/receipt	Wed Feb 08 16:11:24 2017 +0100
+++ b/xarchive/receipt	Thu Feb 09 12:37:49 2017 +0100
@@ -8,7 +8,7 @@
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 SUGGESTED="zip rar unace arj lha p7zip lzop linux-squashfs cromfs cabextract \
-xz lrzip nanozip"
+xz lrzip"
 WEB_SITE="http://xarchive.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"