Fix broken compilation when LDFLAGS=-Wl,--as-needed (#130796). Quote $S, $D, $ROOT, $WORKDIR and $FILESDIR.

Package-Manager: portage-2.0.54

6 files changed, 74 insertions, 104 deletions

diff --git a/net-dialup/slmodem/ChangeLog b/net-dialup/slmodem/ChangeLog
index e61135691247..86e0bb757b8b 100644
--- a/net-dialup/slmodem/ChangeLog
+++ b/net-dialup/slmodem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/slmodem
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.58 2006/04/08 16:12:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/ChangeLog,v 1.59 2006/04/22 11:44:08 mrness Exp $
+
+  22 Apr 2006; Alin Nastac <mrness@gentoo.org>
+  +files/slmodem-2.9.11-modem-makefile.patch, metadata.xml,
+  slmodem-2.9.11_pre20051101.ebuild:
+  Fix broken compilation when LDFLAGS=-Wl,--as-needed (#130796). Quote $S, $D,
+  $ROOT, $WORKDIR and $FILESDIR.
 
   08 Apr 2006; Stefan Schweizer <genstef@gentoo.org>
   slmodem-2.9.11_pre20051101.ebuild:
diff --git a/net-dialup/slmodem/Manifest b/net-dialup/slmodem/Manifest
index 42bf54e8bfb9..9468304b273c 100644
--- a/net-dialup/slmodem/Manifest
+++ b/net-dialup/slmodem/Manifest
@@ -1,81 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX slmodem-2.9.11.init 2182 RMD160 bbacb69c48be43feff80eb0e6936ab293d9f66d9 SHA1 53ebf95ee488553bef54df4e823934b803f8fe01 SHA256 af9974afbcede01304f2367e9163a59db2ecca0e0fca7406e72f402968829e51
+MD5 e7933fc8f63f49c97f19ed16130b3855 ChangeLog 13740
+MD5 66a7f4e6682670216c1497606c9c600b files/digest-slmodem-2.9.11_pre20051101 140
+MD5 fd55ef399408a109742263cd5b4a5219 files/digest-slmodem-2.9.9d 66
+MD5 5917f2af62708f83a73fd288c21a5e3d files/slmodem-2.9.11-modem-makefile.patch 676
 MD5 67168d0e7a1be3e5041ec3cb8dabb50d files/slmodem-2.9.11.init 2182
-RMD160 bbacb69c48be43feff80eb0e6936ab293d9f66d9 files/slmodem-2.9.11.init 2182
-SHA256 af9974afbcede01304f2367e9163a59db2ecca0e0fca7406e72f402968829e51 files/slmodem-2.9.11.init 2182
-AUX slmodem-2.9.11.modules 106 RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e SHA1 933fbb37e99e26b838d508c177cf69097903c36b SHA256 0ae1432fbae6e517190a841a6ae09806f24c16614e845d2e814a568285d96a7f
 MD5 e91d1df68be76c531a8514dba77c1886 files/slmodem-2.9.11.modules 106
-RMD160 41b949de0d6a2c47d0227c97b065336cc54ed50e files/slmodem-2.9.11.modules 106
-SHA256 0ae1432fbae6e517190a841a6ae09806f24c16614e845d2e814a568285d96a7f files/slmodem-2.9.11.modules 106
-AUX slmodem-2.9.9b-gcc4.patch 463 RMD160 8a140c171766869e685e5b9fb37b02706c58ebd6 SHA1 1338214218b51164c5cc7e28e3056763562c6b70 SHA256 235597209142527063109b9d155684004663fa36c8e15f85ee07c269410d3263
 MD5 fd0f0a405fb7f059cc2f5078d54fd884 files/slmodem-2.9.9b-gcc4.patch 463
-RMD160 8a140c171766869e685e5b9fb37b02706c58ebd6 files/slmodem-2.9.9b-gcc4.patch 463
-SHA256 235597209142527063109b9d155684004663fa36c8e15f85ee07c269410d3263 files/slmodem-2.9.9b-gcc4.patch 463
-AUX slmodem-2.9.conf 649 RMD160 7d3f89e8ad1831e0730924e421ab643368406c7c SHA1 627d9c8afb37275b0e147868f57bff2c25ebd0df SHA256 0f6cf3b88900d0b2717c7df33debd5247c46849fc3d92bc54cf84d4eb0b46bff
 MD5 1a0b854bbe34e01e918b855b7c81ffba files/slmodem-2.9.conf 649
-RMD160 7d3f89e8ad1831e0730924e421ab643368406c7c files/slmodem-2.9.conf 649
-SHA256 0f6cf3b88900d0b2717c7df33debd5247c46849fc3d92bc54cf84d4eb0b46bff files/slmodem-2.9.conf 649
-AUX slmodem-2.9.devfs 786 RMD160 bc7d4385206864b16cd315d14ea60ef99533618d SHA1 5f457c7f76b1981032ca99049afdf181ae6b352f SHA256 4349b9ffa2c5b9adf43722c7b71dbf33f3ffce767a4ddbc630397ee23599ffa6
 MD5 c80ecf5c3d5605220e4b0055850260a5 files/slmodem-2.9.devfs 786
-RMD160 bc7d4385206864b16cd315d14ea60ef99533618d files/slmodem-2.9.devfs 786
-SHA256 4349b9ffa2c5b9adf43722c7b71dbf33f3ffce767a4ddbc630397ee23599ffa6 files/slmodem-2.9.devfs 786
-AUX slmodem-2.9.init 2702 RMD160 c14a229721ae9cd6374882c846bb4e35b4d6f63f SHA1 d3fe06e3500233a32aa43b9aa693bd184a95431b SHA256 f3a37113a476b39b117fd2811729cea01bced4db339505802d5c13d6061e250a
 MD5 3d00e935ef9592cf6538298cacd92a02 files/slmodem-2.9.init 2702
-RMD160 c14a229721ae9cd6374882c846bb4e35b4d6f63f files/slmodem-2.9.init 2702
-SHA256 f3a37113a476b39b117fd2811729cea01bced4db339505802d5c13d6061e250a files/slmodem-2.9.init 2702
-AUX slmodem-2.9.modules 494 RMD160 164182ff4296e4bfe6d282f538cc472f0e378242 SHA1 4dbd63a895bc2a23fcb4377f7908f9039acbea3e SHA256 ae335121dc9aea137c031fe7306599d64f1ac76701f5f2025911a75c381d3283
 MD5 8834a62c67909059cef10887bfbcc853 files/slmodem-2.9.modules 494
-RMD160 164182ff4296e4bfe6d282f538cc472f0e378242 files/slmodem-2.9.modules 494
-SHA256 ae335121dc9aea137c031fe7306599d64f1ac76701f5f2025911a75c381d3283 files/slmodem-2.9.modules 494
-AUX slmodem-amd64-Makefile.diff 762 RMD160 61ac0eedcfd61095609b523804c381ff0dabf936 SHA1 e0af32ddfb3de4ec24fa8ff0dfb3bbd7156e2a4c SHA256 ae4082b38991e1dedbf52126c8d3536d782308794e76db530a0f93059859c9f1
 MD5 1561aebe43beb20809e47ea1dd62115f files/slmodem-amd64-Makefile.diff 762
-RMD160 61ac0eedcfd61095609b523804c381ff0dabf936 files/slmodem-amd64-Makefile.diff 762
-SHA256 ae4082b38991e1dedbf52126c8d3536d782308794e76db530a0f93059859c9f1 files/slmodem-amd64-Makefile.diff 762
-AUX slmodem-class-simple-to-class.diff 6847 RMD160 1b484b10f7308a77b155812273626dacffe678dd SHA1 914e2ee159cbde12d539470a898fbb66baa1fa24 SHA256 731e7771b1dfe1e79fe8b2a9f21f5f2d773fbdacf4d5d65e1d5007a4f123ce05
 MD5 618a9ebd35ccb49bf34e6ea522afcb8b files/slmodem-class-simple-to-class.diff 6847
-RMD160 1b484b10f7308a77b155812273626dacffe678dd files/slmodem-class-simple-to-class.diff 6847
-SHA256 731e7771b1dfe1e79fe8b2a9f21f5f2d773fbdacf4d5d65e1d5007a4f123ce05 files/slmodem-class-simple-to-class.diff 6847
-AUX slmodem-remove-URB_ASYNC_UNLINK.patch 436 RMD160 910fb64f4fb689e2311cf44700ac8e58d794174d SHA1 4f44684538f353a377db3848019f733ae13ab864 SHA256 7b23a4d08a8667bd61b6db22eb5547f0ad631ec8543ac1e106f0eddf79d54f5b
 MD5 9c47e598fd639d46a03493fe7a52595e files/slmodem-remove-URB_ASYNC_UNLINK.patch 436
-RMD160 910fb64f4fb689e2311cf44700ac8e58d794174d files/slmodem-remove-URB_ASYNC_UNLINK.patch 436
-SHA256 7b23a4d08a8667bd61b6db22eb5547f0ad631ec8543ac1e106f0eddf79d54f5b files/slmodem-remove-URB_ASYNC_UNLINK.patch 436
-AUX slusb.hotplug 262 RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 SHA1 79d922f24852a17385ff4ac82f586ca0ad477f3f SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed
 MD5 a5c2c40e3a6c4665033c97bb9088f03d files/slusb.hotplug 262
-RMD160 6ccb14b19191da17b0352525399ec8560eb89c04 files/slusb.hotplug 262
-SHA256 1806e732086915be8ca3c43d0abaf73bdde945eb1e11bd24a12c7309be4cdfed files/slusb.hotplug 262
-DIST slmodem-2.9.11-20051101.tar.gz 833644 RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 SHA1 bacd94800a83c86cc872c6afa75dfb3c90828815 SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172
-DIST slmodem-2.9.9d.tar.gz 709474
-DIST ungrab-winmodem.tar.gz 1872 RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf SHA1 d8c48969fd840b4f7b15f9d6b269470a44e4eed0 SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11
-EBUILD slmodem-2.9.11_pre20051101.ebuild 4681 RMD160 dd6d4236b885245dd106375b8cadfe9665ef6f1a SHA1 d8ea7363fc90481141eafb425bc49657b06f7b77 SHA256 7e4b762c590cc5c841d347954d6d2678c29623fa560daca1cbc8bc05294c9b3a
-MD5 afcd4da0119ec7108ba04e0bffeae414 slmodem-2.9.11_pre20051101.ebuild 4681
-RMD160 dd6d4236b885245dd106375b8cadfe9665ef6f1a slmodem-2.9.11_pre20051101.ebuild 4681
-SHA256 7e4b762c590cc5c841d347954d6d2678c29623fa560daca1cbc8bc05294c9b3a slmodem-2.9.11_pre20051101.ebuild 4681
-EBUILD slmodem-2.9.9d.ebuild 3553 RMD160 f1ca0a06fc2228fb0ef83dc9ce45c235fe3de9bb SHA1 28bfc380e679da03eb3b7ffb744e6993630e06dc SHA256 ca8ea2ac5d1eaa896b6c43576ffedd66561c5c900b4db301e53721c1a1db9c58
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 e213145d81321752e64ddfdc9dc30530 slmodem-2.9.11_pre20051101.ebuild 4553
 MD5 da3f5db025a3799ee1bdf5b9eef53601 slmodem-2.9.9d.ebuild 3553
-RMD160 f1ca0a06fc2228fb0ef83dc9ce45c235fe3de9bb slmodem-2.9.9d.ebuild 3553
-SHA256 ca8ea2ac5d1eaa896b6c43576ffedd66561c5c900b4db301e53721c1a1db9c58 slmodem-2.9.9d.ebuild 3553
-MISC ChangeLog 13484 RMD160 db5c83b874249f7c1fecdf1cd242cd5022e43412 SHA1 45afb70a0e3dbd7e782c32be989f171235a9be04 SHA256 b64f4238c19ea74c1df8331d351456fb47ee95bf57fc91c8c91bfd88b50ddf69
-MD5 f98afb4e2b9d9c4b4c220e458523961a ChangeLog 13484
-RMD160 db5c83b874249f7c1fecdf1cd242cd5022e43412 ChangeLog 13484
-SHA256 b64f4238c19ea74c1df8331d351456fb47ee95bf57fc91c8c91bfd88b50ddf69 ChangeLog 13484
-MISC metadata.xml 258 RMD160 b47a6e63612f9a63019ed0564245cafb4c086a28 SHA1 eacddce8eda2d78cc1a11e61c4f8e22715360a52 SHA256 64186ffb8c55be0e733edbec2cc5176a4079104e3f0ee8dbcce9f1bd49ad0037
-MD5 eeb22f4e1b5d94396c26c416cd9d6aed metadata.xml 258
-RMD160 b47a6e63612f9a63019ed0564245cafb4c086a28 metadata.xml 258
-SHA256 64186ffb8c55be0e733edbec2cc5176a4079104e3f0ee8dbcce9f1bd49ad0037 metadata.xml 258
-size 66 files/digest-slmodem-2.9.9d 66
-RMD160 e61cb7e83af1ad0d0b3b6ef7d4b5e76a7dc3b186 files/digest-slmodem-2.9.9d 66
-SHA256 2a2961aa4bfa8f92a1123663cdbca98e5c91ccb22be16779701c3ca912b08799 files/digest-slmodem-2.9.9d 66
-MD5 fd55ef399408a109742263cd5b4a5219 files/digest-slmodem-2.9.9d 66
-size 512 files/digest-slmodem-2.9.11_pre20051101 512
-RMD160 13e9984479cbd18a496255c6cc317da7cfd48e47 files/digest-slmodem-2.9.11_pre20051101 512
-SHA256 005100f76c5a3ffccbdfcbcc0b6569ed2ed5661a67124f1b74babd3cf026fbdf files/digest-slmodem-2.9.11_pre20051101 512
-MD5 bd3432246edbc20a20719bef640eb9ca files/digest-slmodem-2.9.11_pre20051101 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEN+P1NJowsmZ/PzARAsBDAKC4m9XgCtaiFXiw1NYtiZke8IqemgCgx1Mf
-B4SDDiLpdea3wgTKnrMUL5A=
-=7fup
+iD8DBQFEShcYjG8pv1lIUX4RAuGuAJ9kyS09YyHwzEyu/yBbIScES3h3jwCg3Aoj
+DejPnHGuyg/JMKD+CKxHAyc=
+=lUzj
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101 b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101
index 047a97ea184a..04107a868eff 100644
--- a/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101
+++ b/net-dialup/slmodem/files/digest-slmodem-2.9.11_pre20051101
@@ -1,6 +1,2 @@
 MD5 56bb1ddf621b2fe26caf746aed0ac26f slmodem-2.9.11-20051101.tar.gz 833644
-RMD160 044dd97f763c68ff5c5609cb925146c5302bfb61 slmodem-2.9.11-20051101.tar.gz 833644
-SHA256 d5c456b1bab05a1606f7deaf4d5f1b9151d23377e7eb421b81082f9285de5172 slmodem-2.9.11-20051101.tar.gz 833644
 MD5 a23326976632fe7774e110cbc0636f70 ungrab-winmodem.tar.gz 1872
-RMD160 c7058f884ddf6345ddcd15c984364f4741464fbf ungrab-winmodem.tar.gz 1872
-SHA256 b9d966fa13b05876c2921f4bd030dfb151e6810958202010fab661d1689e4e11 ungrab-winmodem.tar.gz 1872
diff --git a/net-dialup/slmodem/files/slmodem-2.9.11-modem-makefile.patch b/net-dialup/slmodem/files/slmodem-2.9.11-modem-makefile.patch
new file mode 100644
index 000000000000..9acbf2ce745e
--- /dev/null
+++ b/net-dialup/slmodem/files/slmodem-2.9.11-modem-makefile.patch
@@ -0,0 +1,29 @@
+diff -Nru modem.orig/Makefile modem/Makefile
+--- modem.orig/Makefile	2005-11-01 17:33:34.000000000 +0200
++++ modem/Makefile	2006-04-22 14:26:58.693947250 +0300
+@@ -16,7 +16,7 @@
+ CC:= gcc
+ RM:= rm -f
+ 
+-CFLAGS+= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM
++CFLAGS+= -Wall -g -I. -DCONFIG_DEBUG_MODEM
+ 
+ 
+ modem-objs:= \
+@@ -33,13 +33,13 @@
+ 
+ #SUPPORT_ALSA:=1
+ ifdef SUPPORT_ALSA
+-slmodemd: -lasound
++
+ CFLAGS+= -DSUPPORT_ALSA=1
+-LFLAGS+= -lasound
++LDLIBS+= -lasound
+ endif
+ 
+ slmodemd modem_test:
+-	$(CC) $(LFLAGS) -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ clean:
+ 	$(RM) slmodemd modem_test modem_main.o modem_cmdline.o modem_test.o $(modem-objs) $(dp-objs) $(sysdep-objs)
diff --git a/net-dialup/slmodem/metadata.xml b/net-dialup/slmodem/metadata.xml
index c7ef78512036..1e11e7bbd01b 100644
--- a/net-dialup/slmodem/metadata.xml
+++ b/net-dialup/slmodem/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-dialup</herd>
-<maintainer>
-	<email>net-dialup@gentoo.org</email>
-	<name>Net-dialup herd</name>
-</maintainer>
 </pkgmetadata>
diff --git a/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild b/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
index 1dc5ff6da4fb..ce9687ed079c 100644
--- a/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
+++ b/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild,v 1.3 2006/04/08 16:12:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/slmodem-2.9.11_pre20051101.ebuild,v 1.4 2006/04/22 11:44:08 mrness Exp $
 
 inherit eutils linux-mod multilib
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa usb"
 
-RDEPEND="virtual/libc
-	alsa? ( media-libs/alsa-lib )
+RDEPEND="alsa? ( media-libs/alsa-lib )
 	amd64? ( app-emulation/emul-linux-x86-soundlibs )"
 
 DEPEND="${RDEPEND}
@@ -40,17 +39,14 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${WORKDIR}/ungrab-winmodem:" \
-		${WORKDIR}/ungrab-winmodem/Makefile
-	convert_to_m ${WORKDIR}/ungrab-winmodem/Makefile
-
-	cd ${S}
-	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" \
-		${S}/drivers/Makefile
-	convert_to_m ${S}/drivers/Makefile
-	sed -i "s: -O::" ${S}/modem/Makefile
-	sed -i "s:LFLAGS:LDFLAGS:" ${S}/modem/Makefile
-	sed -i "s/^slmodemd: -lasound$//" ${S}/modem/Makefile
+		"${WORKDIR}/ungrab-winmodem/Makefile"
+	convert_to_m "${WORKDIR}/ungrab-winmodem/Makefile"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P%%_*}-modem-makefile.patch"
 	cd drivers
+	sed -i "s:SUBDIRS=\$(shell pwd):SUBDIRS=${S}/drivers:" Makefile
+	convert_to_m Makefile
 	sed -i "s:.*=[ \t]*THIS_MODULE.*::" st7554.c amrmo_init.c old_st7554.c
 	sed -i 's:MODULE_PARM(\([^,]*\),"i");:module_param(\1, int, 0);:' st7554.c \
 		amrmo_init.c old_st7554.c
@@ -70,68 +66,68 @@ src_compile() {
 src_install() {
 	linux-mod_src_install
 
-	cd ${S}
+	cd "${S}"
 	newsbin modem/modem_test slmodem_test
 	dosbin modem/slmodemd
 	dodir /var/lib/slmodem
 	fowners root:dialout /var/lib/slmodem
 	keepdir /var/lib/slmodem
 
-	insinto /etc/conf.d/; newins ${FILESDIR}/${PN}-2.9.conf ${PN}
-	exeinto /etc/init.d/; newexe ${FILESDIR}/${PN}-2.9.11.init ${PN}
+	newconfd "${FILESDIR}/${PN}-2.9.conf" ${PN}
+	newinitd "${FILESDIR}/${PN}-2.9.11.init" ${PN}
 
 	# configure for alsa - or not for alsa
 	if use alsa; then
 		sed -i -e "s/# MODULE=alsa/MODULE=alsa/" \
-			-e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" ${D}/etc/conf.d/slmodem
+			-e "s/# HW_SLOT=modem:1/HW_SLOT=modem:1/" "${D}/etc/conf.d/slmodem"
 	else
-		sed -i "s/# MODULE=slamr/MODULE=slamr/" ${D}/etc/conf.d/slmodem
+		sed -i "s/# MODULE=slamr/MODULE=slamr/" "${D}/etc/conf.d/slmodem"
 	fi
 
 
 	# Add module aliases and install hotplug script
-	insinto /etc/modules.d/; newins ${FILESDIR}/${PN}-2.9.11.modules ${PN}
+	insinto /etc/modules.d/; newins "${FILESDIR}/${PN}-2.9.11.modules" ${PN}
 	if use usb; then
-		exeinto /etc/hotplug/usb; newexe ${FILESDIR}/slusb.hotplug slusb
+		exeinto /etc/hotplug/usb; newexe "${FILESDIR}/slusb.hotplug" slusb
 	fi
 
 	dodir /etc/hotplug/blacklist.d
-	echo -e "slusb\nslamr\nsnd-intel8x0m" >> ${D}/etc/hotplug/blacklist.d/${PN}
+	echo -e "slusb\nslamr\nsnd-intel8x0m" >> "${D}/etc/hotplug/blacklist.d/${PN}"
 
 	# Add configuration for devfs, udev
-	if [ -e ${ROOT}/dev/.devfsd ] ; then
-		insinto /etc/devfs.d/; newins ${FILESDIR}/${PN}-2.9.devfs ${PN}
-	elif [ -e ${ROOT}/dev/.udev ] ; then
+	if [ -e "${ROOT}/dev/.devfsd" ] ; then
+		insinto /etc/devfs.d/; newins "${FILESDIR}/${PN}-2.9.devfs" ${PN}
+	elif [ -e "${ROOT}/dev/.udev" ] ; then
 		dodir /etc/udev/rules.d/
 		echo 'KERNEL="slamr", NAME="slamr0" GROUP="dialout"' > \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
+			 "${D}/etc/udev/rules.d/55-${PN}.rules"
 		echo 'KERNEL="slusb", NAME="slusb0" GROUP="dialout"' >> \
-			 ${D}/etc/udev/rules.d/55-${PN}.rules
+			 "${D}/etc/udev/rules.d/55-${PN}.rules"
 	fi
 
-	dodoc Changes README ${WORKDIR}/ungrab-winmodem/Readme.txt
+	dodoc Changes README "${WORKDIR}/ungrab-winmodem/Readme.txt"
 }
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
 
 	# Make some devices if we aren't using devfs or udev
-	if [ -e ${ROOT}/dev/.devfsd ]; then
+	if [ -e "${ROOT}/dev/.devfsd" ]; then
 		ebegin "Restarting devfsd to reread devfs rules"
 			killall -HUP devfsd
 		eend $?
 
-	elif [ -e ${ROOT}/dev/.udev ]; then
+	elif [ -e "${ROOT}/dev/.udev" ]; then
 		ebegin "Restarting udev to reread udev rules"
 			udevstart
 		eend $?
 	else
-		cd ${S}/drivers
-		make DESTDIR=${ROOT} install-devices
+		cd "${S}/drivers"
+		make DESTDIR="${ROOT}" install-devices
 	fi
 
-	if [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
+	if [ ! -e "${ROOT}/dev/ppp" ]; then
+		mknod "${ROOT}/dev/ppp" c 108 0
 	fi
 
 	ewarn "To avoid problems, slusb/slamr have been added to /etc/hotplug/blacklist"