Remove old versions; update with Vincent Hardy's new udev rules, and a build patch to be able to use autotools-utils (getting this ready for multilib).

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD4301342

6 files changed, 218 insertions, 97 deletions

diff --git a/app-crypt/acr38u/ChangeLog b/app-crypt/acr38u/ChangeLog
index 3894661ed0d7..09a0c10d50ca 100644
--- a/app-crypt/acr38u/ChangeLog
+++ b/app-crypt/acr38u/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/acr38u
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/ChangeLog,v 1.7 2013/03/17 15:16:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/ChangeLog,v 1.8 2013/12/06 06:09:09 flameeyes Exp $
+
+*acr38u-1.7.11-r2 (06 Dec 2013)
+
+  06 Dec 2013; Diego E. Pettenò <flameeyes@gentoo.org> +acr38u-1.7.11-r2.ebuild,
+  +files/1.7.11-bis.rules, +files/acr38u-1.7.11-build.patch,
+  -acr38u-1.7.10-r1.ebuild, -acr38u-1.7.11.ebuild, -files/92-pcscd-acr38u.rules:
+  Remove old versions; update with Vincent Hardy's new udev rules, and a build
+  patch to be able to use autotools-utils (getting this ready for multilib).
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
index 4e177d3b7d66..8cdc0df62745 100644
--- a/app-crypt/acr38u/Manifest
+++ b/app-crypt/acr38u/Manifest
@@ -1,31 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.7.11-bis.rules 590 SHA256 afb057dd48cbb46a24e358edfe5a8e100fb25642194ef2e8df688c72d15f7add SHA512 9e2d806a13a978f1a27a9b3bb6bf4f63809bc3cd03057b513f48bee0d2f2589f75484ff4e0e18dcf8b1b37b9af2465014fc3bcf87b48dd330a375fee3baef52f WHIRLPOOL 7fb9d3406fde2a37941ad8d32ec9dbc45e2e5b2c1d2cfc08543d1542ecb4c6d0c0ae781d14da370e7fa3cd052fe23f135190558ad7b1239990849012acc041c9
 AUX 1.7.11.rules 490 SHA256 f6eacc386ab6d74aefecb106dd8ead0acce9c2d950b03352191ae9b71f318b05 SHA512 c7c86eb37ee21d0955bab4517a2a38c8216cf49a42ea164335944a87c27ade021b9ec416e30f6b27e001cc20122e0a405a316e544dbf8d3e97a7f8d2bab3aa6f WHIRLPOOL bda21d7e76b3665c2211f4e1af17b3ddf2b4e62ca29cfd406a14a9a8c664fe43bfa8163cce06eda3dc5e428b95de63531d8c12b5d7d84aa04e9e6f0a7c4e4b35
-AUX 92-pcscd-acr38u.rules 424 SHA256 404357743827908d988b739caa8c16a09f84271e6169bc9412522b26c96e53f3 SHA512 458b1125cf18280a8ff2bf37b8e7c06f975d127c9c90bf6185f6125717e41dc361f1434861ec36ca841cf7b367480b014133c742a55f37c7454b1ad8e32dd239 WHIRLPOOL 20c92bcab641f13db4c0044705fb248b8c08af0be999b6f2233cc12dd1fc0d2ea89359abd329dd9b81b95a06193301f9d3dcee908d937c6d18be8f7056e9a84c
-DIST ACR38U_driver_Lnx_1710_P.tar.gz 736041 SHA256 acb035152decfcee072fbffa8853932aa04df72c31796c18c9536eb9ba4ebad4 SHA512 4d74bedf123f0c4a1269866658754f497c826667467e1de452d3b68b7387ca0b4159e104e7cfd78bed1eb2951d9859094a974fc4b7e3be7210a56839126f5b08 WHIRLPOOL 9d9b70ffc03c3781a961b400a8344f8274a08a2a0853450056f0a31e315c6f7a3060001bc83f73efe2935c75ea1c63a9dea95a08ee058deb8de1d74910e93ec5
+AUX acr38u-1.7.11-build.patch 6295 SHA256 86e48a74a5acf5d6432936db57329d852774cff96e9b497202ce4025b8f02ecd SHA512 ff640b3fdbd4f160449aef4900329fca09bd1efa24d67e939772fed630be1c81f973134327036fbf79aa194b2438bb9c8df2be95eadd43cde58e467fc2df9cbb WHIRLPOOL 865f31859a44c1c86fb81b2a4ac352deff2e8cf8191fdaf0ef2d37cf1e3df6860aee02745b57425124d17aa309f8046611465b245d0cd6f0ab12c1330e2292e9
 DIST ACR38_LINUX_100711_P.tar.bz2 274137 SHA256 7d7e4fa97def2415f4b5c9e90cfedc2f7acbe94ca8b1653a5d8a85e24fc0ab53 SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7 WHIRLPOOL d63f7d1a8ff51ff131e0e0bcf943bbb5c38773b707019e695377fc42b5a91029ac22736dae95f10342a8d44370f90f766c9bdbf23f5c445c8f41c051303f87c3
-EBUILD acr38u-1.7.10-r1.ebuild 1418 SHA256 98b4c9193d86ba586d3ede3bbc56ff2a52c2ae6ae2bb8ef56589186892ece8db SHA512 6db7b7421604c327c73236cd9d8ac43727cab8a283072c8e4ba0e5809443b36e651745178ff802dff7556f09b6f763d77c27f3854f37c3e1e308c88a0b484c5f WHIRLPOOL e8083c210b144f34e0b7f505738f82cc8eabd396e3abb38e3baa8bbbc3993e4e7b6d76d7e2008ad9c060b3e1083b5f4a37d1c182e9379e08ea123ba128ec11d0
 EBUILD acr38u-1.7.11-r1.ebuild 1709 SHA256 0929e209d4bf55a6ef980c3886be745df206597c3ee2f167a77c9315c2a992b8 SHA512 6eff54485300c685fc9c19eb0c999f18fc139a6c7e57f205566d33ec2b0e3dbce9d2494297f633cd59b85356c56a336ca5dd56f0f9fae36b8ea7fb3e45839741 WHIRLPOOL 664871ac8b7bb5ebdc473e988c11c991d1fe280a4c1f186549f508b18d43140e19187635b911cd3da1a80797c171c3d571013134c44e7a55c1dd8a0cfc2e9a6e
-EBUILD acr38u-1.7.11.ebuild 1549 SHA256 c03ab381a6ccfa7f101485e4bf49d6c60e26e1e72ef0685431440ef584584e31 SHA512 d8cb53ecc34b72650dbc04917d936b3649d3cb9a54f323a7574357bc5a7da13c7fb09845f6e930a5cb49a49b46069fa2fc64f2265f94a6608dad05ccb390f8c6 WHIRLPOOL ad9137e576b2319ed1021aaf5296003bbbb3b427ebbecc859d8affba74af3a490823f2468df8c06b15b7cb30948b31270675f97e78d51a0164c771e4c9aec1a5
-MISC ChangeLog 1414 SHA256 900f739c84bc270a2eb17f701d27373657867be9260d80fcd0a34c73b654fbda SHA512 33682f984d7be85e05b1caafcfd956813d78d87774b296b36cf20044a7fb20ff6ca2ae22689649cd8e79077cbee335b918755e481cb4f95ec9f336ef45609ebf WHIRLPOOL 09aec0949645e548dfc00d1c56fa95d2f54df4910395cdf211174c7c245f22033bd80c2b2774a8781bf6179794a6e76a00073cb9921a484f145450bd285234a4
+EBUILD acr38u-1.7.11-r2.ebuild 1530 SHA256 1e101b94dc0399a6ba7ce2025d6da3836027821565b2b6a2a27b6bb41fa3a194 SHA512 b49425189923dcf6b2387bd6a7d06914148bc9391be347d5d6a26cd1a8fcdd4aacf26dccf96f9245cfcd150633aa026e031e19bb1b815851b2a131543aa5143a WHIRLPOOL b1f2c1cdb4d4bf6fbb9b50de5089c3a84e4950b63d52099c3f497312626a4c5f60c80ea661abd0b6f6fc396cac2339d4398ec581236004ae8b08686594e77bee
+MISC ChangeLog 1829 SHA256 441b1535abef0ea2394dff5b55170c0a0e9dcc7415fa78bccb18c4bfe5a20b22 SHA512 12c81f6833bff1edf334373f88327ed06fdacacdd3677f06da6fb8f2fd68c5e5b96225434031c7e8959042389f03eb836ebf529b85eab7f79c5e677c1206d2fb WHIRLPOOL e0c03a003756626c87e4f6db1078259c4951ee9e13988e18bf5f144904d9f2fab28bd0b16d24509f28a80941e50faac862719076ae915df5db7f1ba76f9c5d8b
 MISC metadata.xml 476 SHA256 90e292da781a8dcb52676b4bb497337bcc7fc0942edc7b522a2881254b6c0a39 SHA512 a839d4f727c02f1dbf3ccac1cfd715594d77468989ef973bc03ff1ffdf80fdcf69c71b7783621ac102c3c79678fc547d6eb6b3eb00fc9a263525226352b2596c WHIRLPOOL 1dbbec7e3d455768ca09c0d57368fee3e521518d44775d85c978920de42e9a7d617dba6b5f74d12fbf228e1f058b0e89fbd87b55f82b9da4dcead320710329c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRRd5FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88kQIP/AtWqE6442IZGwCfVIC4+l62
-dQs81mRLfKU2H4l9cDxaTOh8+unH6Vlgpa8cfFNMBdoZZ1Zid7WD+aR6EkhgqgL0
-A+eXBLMS+j5YYVILRP6FphFkmX6lABrsoVsN4DwPnvfp83EAF80/Rtyr0rBmWL+c
-j9zFdiKd/haHXDCqI1DSc9Ml9rpbFLllQ4sOy5pPhlYc+d4IN+5GachJ2iIxyHRN
-WF/1aUhaZ7tUgeYUk5yEFxbd4+Whu0SjmKAlZRL3qL9scziCexjXzkloTndjKUGA
-0o9qGLoBPmWqfm8Hg+XcKI0pUUrVgqZcYKQL85TI2eANytvSLBPCkTvofUb9uA4V
-FBAVj3ww9q5lckOnw19ngZGQp/nYQTUTkUraR7E9drIxtcukDv0PEkw14zgAgnZo
-lz3tFd1Rve11+WTPCIbXbn8TeuNDKPGf2lGcIYxJdRxv5+5hHFQqP0bX1kiF/Ceu
-MQFTdNb0vUAUw3a3MIsibFhdHu5ifPzZrtVcUA2KKXFzo7+Szim+3Ed2wENP4QK4
-+qyqd23m1T/fhSrpCt1SL54qkZNb8APvtioqaks7P13kSjNVFD41KUZrK2lPVbwT
-HWtwCgAPGCKR35mIvXS4lL30u3vZKnuXckM/7hAFlOXMX4J5TSyRjDFKBanfdrkx
-FDO1MlYGlq1nRcEtWhGq
-=a8p1
+iQF8BAEBCABmBQJSoWo+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MUE3MTczOTAwRTQzNTc0RDJBOUJBMDIx
+Q0QxM0M4QUQ0MzAxMzQyAAoJEBzRPIrUMBNCJKoH/RCueyhn9mAlck0JYG/p2eWQ
+GIQC8nnaV2H9GyEHhgBLh1QzS3M60oc34pxjZM09Jxp516UiZYzI97MovKwsPl1M
+DfYydKcOiUk1Je2Ja3atyZSMN/zns9W9x7ADBUmtniPDuOBD8vdSU54AzSkSKXgi
+nq+TNTx5Q3SdbzVwIawIa7SzKPocMzLJJ0Qcpq7IbL47o6Yyi4OeQaaqHt7zIbe2
++F7FhuhN/SoqdcgVvKXIxP2SL6LCExUdNDJqxkrBFV6OkCN9/fhEA5GPhkPVtxFX
+ggh5SH+oBalsB2xGutTp0THr3UsEZWXXGxlM0PgOFEABGDp50XHvgQqJZ6x3INc=
+=wxbW
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/acr38u/acr38u-1.7.10-r1.ebuild b/app-crypt/acr38u/acr38u-1.7.10-r1.ebuild
deleted file mode 100644
index bb211c5b967a..000000000000
--- a/app-crypt/acr38u/acr38u-1.7.10-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.10-r1.ebuild,v 1.4 2012/12/11 14:50:43 ssuominen Exp $
-
-EAPI=3
-
-inherit multilib eutils versionator autotools udev
-
-MY_P=ACR38U_driver_Lnx_$(get_version_component_range 1)$(get_version_component_range 2)$(get_version_component_range 3)_P.tar.gz
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader."
-
-SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}"
-HOMEPAGE="http://www.acs.com.hk"
-
-# Make this safe from collisions, require a version of pcsc-lite that
-# uses libusb-1.0 and use the wrapper library instead.
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
-	dev-libs/libusb-compat"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P"
-
-IUSE=""
-
-src_prepare() {
-	epatch_user
-
-	sed -i -e '/pcdir/s:@prefix@/lib:$(libdir):' src/controllib/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-static=false \
-		--enable-usbdropdir="${D}/usr/$(get_libdir)/readers/usb"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete
-
-	udev_newrules "${FILESDIR}/92-pcscd-acr38u.rules"
-}
diff --git a/app-crypt/acr38u/acr38u-1.7.11.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r2.ebuild
index 30ee678c7d5a..9a537e63dacb 100644
--- a/app-crypt/acr38u/acr38u-1.7.11.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.11.ebuild,v 1.3 2012/12/11 14:50:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/acr38u/acr38u-1.7.11-r2.ebuild,v 1.1 2013/12/06 06:09:09 flameeyes Exp $
 
-EAPI=3
+EAPI=5
 
-inherit multilib eutils versionator autotools udev
+inherit multilib eutils versionator toolchain-funcs udev autotools-utils
 
 MY_P=ACR38_LINUX_$(get_version_component_range 1)00$(get_version_component_range 2)$(get_version_component_range 3)_P
 
@@ -22,34 +22,23 @@ HOMEPAGE="http://www.acs.com.hk"
 
 # Make this safe from collisions, require a version of pcsc-lite that
 # uses libusb-1.0 and use the wrapper library instead.
+# Changed back from dev-libs/libusb-compat to virtual/libusb:0 because
+# libusb-compat is marked stable and primary in the virtual. -ssuominen
 RDEPEND=">=sys-apps/pcsc-lite-1.6.4
-	dev-libs/libusb-compat"
+	virtual/libusb:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 IUSE=""
 
-src_prepare() {
-	epatch_user
-
-	sed -i -e '/pcdir/s:@prefix@/lib:$(libdir):' src/controllib/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-static=false \
-		--enable-usbdropdir="${D}/usr/$(get_libdir)/readers/usb"
-}
+AUTOTOOLS_AUTORECONF=yes
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -delete
+	autotools-utils_src_install
 
-	udev_newrules "${FILESDIR}/${PV}.rules" 92-pcscd-acr38u.rules
+	# note: for eudev support this pkg may always need to install rules to /usr
+	udev_newrules "${FILESDIR}"/${PV}-bis.rules 92-pcscd-acr38u.rules
 }
diff --git a/app-crypt/acr38u/files/92-pcscd-acr38u.rules b/app-crypt/acr38u/files/1.7.11-bis.rules
index 52077baf3f13..784c606f4044 100644
--- a/app-crypt/acr38u/files/92-pcscd-acr38u.rules
+++ b/app-crypt/acr38u/files/1.7.11-bis.rules
@@ -5,7 +5,11 @@ ACTION!="add", GOTO="pcscd_acr38u_rules_end"
 SUBSYSTEM!="usb", GOTO="pcscd_acr38u_rules_end"
 ENV{DEVTYPE}!="usb_device", GOTO="pcscd_acr38u_rules_end"
 
+# change group from default "root" to "pcscd"
+ENV{ID_USB_INTERFACES}=="*:0b0000:*", ENV{PCSCD}="1"
+
 ATTRS{idVendor}=="072f", ATTRS{idProduct}=="9000", ENV{PCSCD}="1"
 ATTRS{idVendor}=="072f", ATTRS{idProduct}=="9006", ENV{PCSCD}="1"
+ATTRS{idVendor}=="072f", ATTRS{idProduct}=="90CF", ENV{PCSCD}="1"
 
 LABEL="pcscd_acr38u_rules_end"
diff --git a/app-crypt/acr38u/files/acr38u-1.7.11-build.patch b/app-crypt/acr38u/files/acr38u-1.7.11-build.patch
new file mode 100644
index 000000000000..d64e06a3af36
--- /dev/null
+++ b/app-crypt/acr38u/files/acr38u-1.7.11-build.patch
@@ -0,0 +1,178 @@
+Index: ACR38_LINUX_100711_P/configure.ac
+===================================================================
+--- ACR38_LINUX_100711_P.orig/configure.ac
++++ ACR38_LINUX_100711_P/configure.ac
+@@ -58,74 +58,21 @@ if test x${debug} = xtrue ; then
+ 	AC_DEFINE(USBDEBUG, 1, [enable USB debug messaging.])
+ fi
+ 
+-# --enable-pcscdropdir=DIR	; pcsclite installation directory
+-AC_ARG_ENABLE([pcscdropdir],
+-            AS_HELP_STRING([--enable-pcscdropdir=DIR],
+-                           [installation directory of PCSCLITE (default to PREFIX)]),
+-            [pcscdropdir=$enableval],
+-            [pcscdropdir=false])
+-
+-if test "${pcscdropdir}" = false ; then
+-	if test "$prefix" = NONE ; then
+-		pcscdropdir="$ac_default_prefix"
+-	else
+-		pcscdropdir="$prefix"
+-	fi
+-fi
+-
+-# removed by ZETES
+-# AC_SUBST([PKG_PCSC_CONFIG_PATH],[$pcscdropdir/lib/pkgconfig])
+-# removed by ZETES
+-# AC_SUBST([PKG_PCSCLITE],[$pcscdropdir/lib/pkgconfig/libpcsclite.pc])
+-
+-# added by ZETES ...
+-PKG_PCSCLITE="libpcsclite"
+-# ... added by ZETES
+-
+-# Check if pkg-config exists
+-AC_CHECK_PROG([PKGCONFIG], [pkg-config], [yes])
+-if test "$PKGCONFIG" = "yes"; then
+-	if ! `pkg-config --print-errors --atleast-version=1.2.0 $PKG_PCSCLITE`
+-	then
+-		AC_MSG_ERROR([install pcsc-lite 1.2.0 or later])
+-	fi
+-fi
+-
+-# Check for libusb 0.1.12
+-PKG_LIBUSB="libusb"
+-if test "$PKGCONFIG" = "yes"; then
+-	if ! `pkg-config --print-errors --atleast-version=0.1.12 $PKG_LIBUSB`
+-	then
+-		AC_MSG_ERROR([install libusb 0.1.12 or later])
+-	fi
+-fi
++PKG_INSTALLDIR()
+ 
+-# --enable-usbdropdir=DIR
+-AC_ARG_ENABLE([usbdropdir],
+-			AC_HELP_STRING([--enable-usbdropdir=DIR],
+-						   [directory containing USB drivers (default to pcscd config or $(prefix)/pcsc/drivers)]),
+-			[usbdropdir="${enableval}"],
+-			[usbdropdir=false])
+-
+-if test "${usbdropdir}" = false ; then
+-	if test "$PKGCONFIG" = yes ; then
+-		usbdropdir=`pkg-config $PKG_PCSCLITE --variable=usbdropdir`
+-	else
+-		usbdropdir=""
+-	fi
+-	if test -z "$usbdropdir" ; then
++PKG_CHECK_MODULES([PCSCLITE], [libpcsclite >= 1.2.0])
++PKG_CHECK_VAR([USBDROPDIR], [libpcsclite], [usbdropdir], [
+ 		if test "$prefix" = NONE ; then
+-			usbdropdir="$ac_default_prefix/pcsc/drivers"
++			USBDROPDIR="$ac_default_prefix/pcsc/drivers"
+ 		else
+-			usbdropdir="$prefix/pcsc/drivers"
++			USBDROPDIR="$prefix/pcsc/drivers"
+ 		fi
+-	fi
+-fi
++	      ])
+ 
+-AC_SUBST(usbdropdir)
++# Check for libusb 0.1.12
++PKG_CHECK_MODULES([LIBUSB], [libusb >= 0.1.12])
+ 
+-AC_MSG_RESULT([USB drop directory      : $usbdropdir])
+-AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$usbdropdir", [directory containing USB drivers])
++AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR, "$USBDROPDIR", [directory containing USB drivers])
+ 
+ #AC_SUBST(CTRLLIBCFLAGS)
+ #AC_SUBST(CTRLLIBLIBS)
+@@ -141,7 +88,7 @@ AC_DEFINE_UNQUOTED(PCSCLITE_HP_DROPDIR,
+ 
+ # Checks for programs.
+ AC_PROG_CC
+-AC_PROG_LIBTOOL
++AC_PROG_LIBTOOL([disable-static])
+ 
+ # Checks for libraries.
+ # FIXME: Replace `main' with a function in `-lpcsclite':
+@@ -164,8 +111,8 @@ AC_CHECK_HEADERS([fcntl.h limits.h mallo
+ 
+ # Setup the compiler and linker flag
+ OLD_CFLAGS=$CFLAGS
+-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_PCSCLITE`"
+-CFLAGS="$CFLAGS `pkg-config --cflags $PKG_LIBUSB`"
++CFLAGS="$CFLAGS $PCSCLITE_CFLAGS"
++CFLAGS="$CFLAGS $LIBUSB_CFLAGS"
+ 
+ # Check for pcsclite header files
+ # removed by ZETES NO_PCSC_MSG="Please install PCSCLITE 1.2.0 or later before building the driver!!"
+@@ -173,12 +120,6 @@ CFLAGS="$CFLAGS `pkg-config --cflags $PK
+ 
+ # removed by ZETES CFLAGS=$OLD_CFLAGS
+ 
+-AC_SUBST(LIBPCSCLITE)
+-LIBPCSCLITE=`pkg-config --libs $PKG_PCSCLITE`
+-
+-AC_SUBST(LIBUSB)
+-LIBUSB=`pkg-config --libs $PKG_LIBUSB`
+-
+ # Select OS specific versions of source files.
+ AC_SUBST(BUNDLE_HOST)
+ AC_SUBST(DYN_LIB_EXT)
+Index: ACR38_LINUX_100711_P/src/controllib/Makefile.am
+===================================================================
+--- ACR38_LINUX_100711_P.orig/src/controllib/Makefile.am
++++ ACR38_LINUX_100711_P/src/controllib/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ ACR38_CONTROLLIB = libacr38ucontrol.$(DYN_LIB_EXT)
+ 
+-AM_CPPFLAGS = -I../driver `pkg-config libpcsclite --cflags` 
++AM_CPPFLAGS = -I$(srcdir)/../driver $(PCSCLITE_CFLAGS)
+ 
+ lib_LTLIBRARIES = libacr38ucontrol.la
+ include_HEADERS = ACS38DrvTools.h
+@@ -16,8 +16,6 @@ SRC_CONTROLLIB = ACS38DrvTools.c		\
+ 				 ACS38DrvTools.h
+ 
+ libacr38ucontrol_la_SOURCES = $(SRC_CONTROLLIB)
+-libacr38ucontrol_la_CFLAGS = `pkg-config libpcsclite --cflags`
++libacr38ucontrol_la_CFLAGS = $(PCSCLITE_CFLAGS)
+ 
+-#pcdir= $(PKG_PCSC_CONFIG_PATH)
+-pcdir= @prefix@/lib/pkgconfig
+-pc_DATA = libacr38ucontrol.pc
++pkgconfig_DATA = libacr38ucontrol.pc
+Index: ACR38_LINUX_100711_P/src/driver/Makefile.am
+===================================================================
+--- ACR38_LINUX_100711_P.orig/src/driver/Makefile.am
++++ ACR38_LINUX_100711_P/src/driver/Makefile.am
+@@ -9,7 +9,7 @@ DRIVER_LIB_NAME = lib$(DRIVER_NAME).$(DY
+ DRIVER_BUNDLE_DIR = $(DRIVER_NAME).bundle
+ DRIVER_INSTALL_HOME_DIR = pcsc/drivers/$(DRIVER_LIB_NAME).bundle/Contents/Linux
+ 
+-AM_CPPFLAGS = `pkg-config libpcsclite --cflags`
++AM_CPPFLAGS = $(PCSCLITE_CFLAGS)
+ 
+ EXTRA_DIST = Info.plist
+ 
+@@ -34,13 +34,13 @@ SRC_USB = usbserial_linux.c \
+ 	usbserial_linux.h
+ 
+ libACR38UDriver_la_SOURCES = $(SRC_DRV) $(SRC_USB)
+-libACR38UDriver_la_LIBADD = @LIBPCSCLITE@ @LIBUSB@ @COREFOUNDATION@ @IOKIT@
++libACR38UDriver_la_LIBADD = @PCSCLITE_LIBS@ @LIBUSB_LIBS@ @COREFOUNDATION@ @IOKIT@
+ 
+ install: libACR38UDriver.la
+-	$(mkinstalldirs) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/
+-	$(INSTALL) .libs/$(DRIVER_LIB_NAME) $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_NAME)
+-	$(INSTALL) Info.plist $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents
+-#	chmod 755 $(usbdropdir)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_LIB_NAME)
++	$(MKDIR_P) $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/
++	$(INSTALL) .libs/$(DRIVER_LIB_NAME) $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_NAME)
++	$(INSTALL) $(srcdir)/Info.plist $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents
++#	chmod 755 $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)/Contents/$(BUNDLE_HOST)/$(DRIVER_LIB_NAME)
+ 
+ uninstall:
+-	rm -rf $(usbdropdir)/$(DRIVER_BUNDLE_DIR)
++	rm -rf $(DESTDIR)$(USBDROPDIR)/$(DRIVER_BUNDLE_DIR)