- Fix reader.conf handling.

- Fix references to the confdir.
- Fix headers so thirdparty apps can be built with pcsc-lite from pkgsrc.
- Some minor changes to fix pkglint warnings.
- Bump PKGREVISION.

11 files changed, 43 insertions, 83 deletions

diff --git a/security/pcsc-lite/DEINSTALL b/security/pcsc-lite/DEINSTALL
new file mode 100644
index 00000000000..acd68703fbb
--- /dev/null
+++ b/security/pcsc-lite/DEINSTALL
@@ -0,0 +1,8 @@
+#!/bin/sh
+# $NetBSD: DEINSTALL,v 1.1 2009/10/02 12:36:13 hasso Exp $
+
+case ${STAGE} in
+POST-DEINSTALL)
+	${RM} -f @PKG_SYSCONFDIR@/reader.conf
+	;;
+esac
diff --git a/security/pcsc-lite/DESCR b/security/pcsc-lite/DESCR
index 4c8246a6a27..6b9fcbde211 100644
--- a/security/pcsc-lite/DESCR
+++ b/security/pcsc-lite/DESCR
@@ -1,8 +1,5 @@
-The purpose of PC/SC Lite is to provide a
-Windows(R) SCard interface in a very small
-form factor for communicating to smartcards
-and readers.
+The purpose of PC/SC Lite is to provide a Windows(R) SCard interface in a
+very small form factor for communicating to smartcards and readers.
 
-The PC/SC Lite library is used to connect to
-the PC/SC daemon from a client application
-and provide access to the desired reader. 
+The PC/SC Lite library is used to connect to the PC/SC daemon from a
+client application and provide access to the desired reader.
diff --git a/security/pcsc-lite/INSTALL b/security/pcsc-lite/INSTALL
new file mode 100644
index 00000000000..8105728af7f
--- /dev/null
+++ b/security/pcsc-lite/INSTALL
@@ -0,0 +1,8 @@
+#!/bin/sh
+# $NetBSD: INSTALL,v 1.1 2009/10/02 12:36:13 hasso Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${PREFIX}/sbin/update-reader.conf
+	;;
+esac
diff --git a/security/pcsc-lite/Makefile b/security/pcsc-lite/Makefile
index 7880fc182b9..cd1e65bf3b0 100644
--- a/security/pcsc-lite/Makefile
+++ b/security/pcsc-lite/Makefile
@@ -1,47 +1,44 @@
-# $NetBSD: Makefile,v 1.7 2009/08/03 18:47:35 hasso Exp $
+# $NetBSD: Makefile,v 1.8 2009/10/02 12:36:13 hasso Exp $
 #
 
 DISTNAME=	pcsc-lite-1.5.5
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/3082/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	shannonjr@NetBSD.org
 HOMEPAGE=	http://pcsclite.alioth.debian.org/
-COMMENT=	Middleware to access a smart card using SCard API (PC/SC).
+COMMENT=	Middleware to access a smart card using SCard API (PC/SC)
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_TOOLS+=	autoconf automake aclocal autoheader
-AUTOMAKE_REQD=	1.10
-AUTOCONF_REQD=	2.58
 USE_LANGUAGES=	c c++
 
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--enable-confdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-ipcdir=${VARBASE}/pcsc-lite
 CONFIGURE_ARGS+=	--enable-usbdropdir=${PREFIX}/lib/pcsc-lite/drivers
 CONFIGURE_ARGS+=	--disable-libhal
 MAKE_DIRS+=		${VARBASE}/pcsc-lite
 MAKE_DIRS+=		${PREFIX}/lib/pcsc-lite
 MAKE_DIRS+=		${PREFIX}/lib/pcsc-lite/drivers
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/reader.conf.d
 
 EGDIR=			${PREFIX}/share/examples/pcsc-lite
-CONF_FILES+=		${EGDIR}/reader.conf ${PKG_SYSCONFDIR}/reader.conf
+CONF_FILES+=		${EGDIR}/reader.conf ${PKG_SYSCONFDIR}/reader.conf.d/reader.conf
 
 PKGCONFIG_OVERRIDE+=	src/libpcsclite.pc.in
 
+BUILD_DEFS+=		VARBASE
 INSTALLATION_DIRS=	${EGDIR}
 
-pre-configure:
-	cd ${WRKSRC} && ${SH} bootstrap
-
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/reader.conf ${DESTDIR}${EGDIR}
 
diff --git a/security/pcsc-lite/PLIST b/security/pcsc-lite/PLIST
index b2db139c3d7..bd4b884b63a 100644
--- a/security/pcsc-lite/PLIST
+++ b/security/pcsc-lite/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:13:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/10/02 12:36:13 hasso Exp $
 include/PCSC/debuglog.h
 include/PCSC/ifdhandler.h
 include/PCSC/pcsclite.h
@@ -11,6 +11,7 @@ man/man5/reader.conf.5
 man/man8/pcscd.8
 man/man8/update-reader.conf.8
 sbin/pcscd
+sbin/update-reader.conf
 share/doc/pcsc-lite/README.DAEMON
 share/doc/pcsc-lite/ifdhandler-3.tex
 share/doc/pcsc-lite/pcsc-lite.bib
diff --git a/security/pcsc-lite/distinfo b/security/pcsc-lite/distinfo
index aa5d0ae71a7..fc38ac3cc85 100644
--- a/security/pcsc-lite/distinfo
+++ b/security/pcsc-lite/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.7 2009/08/03 18:47:35 hasso Exp $
+$NetBSD: distinfo,v 1.8 2009/10/02 12:36:13 hasso Exp $
 
 SHA1 (pcsc-lite-1.5.5.tar.bz2) = 6791a8bd07f69972f708d4bdd03d6b1056c7af3e
 RMD160 (pcsc-lite-1.5.5.tar.bz2) = 99f56839483d7364426e0d70ec6825f551b4c49e
 Size (pcsc-lite-1.5.5.tar.bz2) = 465947 bytes
 SHA1 (patch-aa) = a30db3af5181f7d37d16c25d2679070e2fdf6652
-SHA1 (patch-ab) = 40437e4db3295318942f292dcfc7dc7a59b5c77e
-SHA1 (patch-ac) = 92b6d3a1c2e330f633021cf662136c300e3af9bf
-SHA1 (patch-ad) = 3172e6063cc48b1302d08865cd8e9039b502a807
-SHA1 (patch-ae) = 79978e1a6e1b6cd11ba4411e69bbf6f7d83c90ae
-SHA1 (patch-af) = 931c031eba226336ceb1c12bc2ffd9193cb24e44
+SHA1 (patch-ab) = 3fe33345975fcd61611dae8d7aaf9b6ee5329d9e
diff --git a/security/pcsc-lite/patches/patch-ab b/security/pcsc-lite/patches/patch-ab
index 302e7112419..cac9d77cc7f 100644
--- a/security/pcsc-lite/patches/patch-ab
+++ b/security/pcsc-lite/patches/patch-ab
@@ -1,11 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2008/08/08 21:25:49 shannonjr Exp $
+$NetBSD: patch-ab,v 1.3 2009/10/02 12:36:13 hasso Exp $
 
---- src/Makefile.am.orig	2008-05-21 09:58:33 +0300
-+++ src/Makefile.am	2008-08-07 22:16:36 +0300
-@@ -152,3 +152,6 @@ tokenparser.c: tokenparser.l
- 
- EXTRA_DIST = README_INTERNALS.txt winscard_scf.c
- 
-+install-data-local:
-+	${INSTALL} -d ${DESTDIR}${includedir}/PCSC
-+
+--- etc/Makefile.in.orig	2009-10-02 14:30:34 +0300
++++ etc/Makefile.in	2009-10-02 14:31:11 +0300
+@@ -202,7 +202,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ usbdropdir = @usbdropdir@
+-conf_DATA = reader.conf
++conf_DATA =
+ sbin_SCRIPTS = update-reader.conf
+ EXTRA_DIST = StartupParameters.plist SmartcardServices
+ all: all-am
diff --git a/security/pcsc-lite/patches/patch-ac b/security/pcsc-lite/patches/patch-ac
deleted file mode 100644
index 40e7af7f890..00000000000
--- a/security/pcsc-lite/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/06/25 06:30:51 hasso Exp $
-
---- Makefile.am.orig	2009-05-27 05:34:51 +0300
-+++ Makefile.am	2009-06-25 08:57:16 +0300
-@@ -1,4 +1,4 @@
--SUBDIRS = m4 src etc doc
-+SUBDIRS = m4 src doc
- 
- ACLOCAL_AMFLAGS = -I m4
- 
diff --git a/security/pcsc-lite/patches/patch-ad b/security/pcsc-lite/patches/patch-ad
deleted file mode 100644
index 5a87d97c10f..00000000000
--- a/security/pcsc-lite/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/03/04 11:29:08 shannonjr Exp $
-
---- src/PCSC/pcsclite.h.in.orig	2007-11-23 09:48:26.000000000 -0700
-+++ src/PCSC/pcsclite.h.in
-@@ -16,7 +16,7 @@
- #ifndef __pcsclite_h__
- #define __pcsclite_h__
- 
--#include <wintypes.h>
-+#include <PCSC/wintypes.h>
- 
- #ifdef __cplusplus
- extern "C"
diff --git a/security/pcsc-lite/patches/patch-ae b/security/pcsc-lite/patches/patch-ae
deleted file mode 100644
index e1afcb50109..00000000000
--- a/security/pcsc-lite/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/03/04 11:29:08 shannonjr Exp $
-
---- src/PCSC/winscard.h.orig	2007-10-13 15:21:10.000000000 -0600
-+++ src/PCSC/winscard.h
-@@ -16,7 +16,7 @@
- #ifndef __winscard_h__
- #define __winscard_h__
- 
--#include <pcsclite.h>
-+#include <PCSC/pcsclite.h>
- 
- #ifdef __cplusplus
- extern "C"
diff --git a/security/pcsc-lite/patches/patch-af b/security/pcsc-lite/patches/patch-af
deleted file mode 100644
index b6e458fc78b..00000000000
--- a/security/pcsc-lite/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2008/03/04 11:29:08 shannonjr Exp $
-
---- src/PCSC/ifdhandler.h.orig	2007-10-20 07:56:43.000000000 -0600
-+++ src/PCSC/ifdhandler.h
-@@ -16,7 +16,7 @@
- #ifndef _ifd_handler_h_
- #define _ifd_handler_h_
- 
--#include <pcsclite.h>
-+#include <PCSC/pcsclite.h>
- 
- #ifdef __cplusplus
- extern "C"