From 9af1a615825bbd51d8f100696a4a061e488d9483 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Tue, 14 Sep 2010 10:32:06 +0000
Subject: [PATCH] - update opensc to 0.11.13

from maintainer douglas santos, with some tweaks by me
---
 security/opensc/Makefile                      | 11 ++++++-----
 security/opensc/distinfo                      | 10 +++++-----
 security/opensc/patches/patch-doc_Makefile_in | 12 ------------
 security/opensc/pkg/PLIST                     |  7 ++++++-
 4 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 security/opensc/patches/patch-doc_Makefile_in

diff --git a/security/opensc/Makefile b/security/opensc/Makefile
index e67ac61e091..d427459d7a7 100644
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2010/01/13 08:42:35 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2010/09/14 10:32:06 jasper Exp $
 
 COMMENT=	set of libraries and utilities to access smart cards
 
-DISTNAME=	opensc-0.11.8
-PKGNAME=	${DISTNAME}p0
+DISTNAME=	opensc-0.11.13
 CATEGORIES=	security
 SHARED_LIBS +=  scconf               2.0      # .1.0
 SHARED_LIBS +=  opensc               2.0      # .1.0
@@ -28,9 +27,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${HOMEPAGE}/files/opensc/
 
-WANTLIB=	c crypto ltdl ncurses readline z
+WANTLIB=	c crypto ltdl ncurses readline z openct.>=1
 
-LIB_DEPENDS=	openct.>=1::security/openct
+LIB_DEPENDS=	::security/openct
 
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
@@ -45,6 +44,8 @@ CONFIGURE_ENV=	PTHREAD_LIBS=-pthread \
 		LTLIB_CFLAGS="-I${LOCALBASE}/include" \
 		LTLIB_LIBS="-L${LOCALBASE}/lib -lltdl" 
 
+FAKE_FLAGS=	mandir="${PREFIX}/man/"
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/opensc
 	${INSTALL_DATA} ${WRKSRC}/etc/opensc.conf \
diff --git a/security/opensc/distinfo b/security/opensc/distinfo
index 78bcaf331ab..ca87de4a622 100644
--- a/security/opensc/distinfo
+++ b/security/opensc/distinfo
@@ -1,5 +1,5 @@
-MD5 (opensc-0.11.8.tar.gz) = omm0eLGN3bZIub2TAga1qA==
-RMD160 (opensc-0.11.8.tar.gz) = 5twelwW5Ir+8temAStCM+p6GBdg=
-SHA1 (opensc-0.11.8.tar.gz) = SjILDMO8PeWEOravZ3CT2Y1M8xg=
-SHA256 (opensc-0.11.8.tar.gz) = NxPv9G0jHgs3wf26PT1kBxb+Dt2HXfV1eGQ/DZ8iE2E=
-SIZE (opensc-0.11.8.tar.gz) = 1434051
+MD5 (opensc-0.11.13.tar.gz) = mPoVHpR5QfnD8nQg/fR8EQ==
+RMD160 (opensc-0.11.13.tar.gz) = zZAIZuUc1k+nxaMofNWBk97CZSg=
+SHA1 (opensc-0.11.13.tar.gz) = QIs3QoYATD3xXsF4Vvaf1MKhrOs=
+SHA256 (opensc-0.11.13.tar.gz) = qaQtbVH7UA80JI/NDUCDyZ0lvF5032D+TvoZtbTm2JA=
+SIZE (opensc-0.11.13.tar.gz) = 1513327
diff --git a/security/opensc/patches/patch-doc_Makefile_in b/security/opensc/patches/patch-doc_Makefile_in
deleted file mode 100644
index 64a5ac44d5c..00000000000
--- a/security/opensc/patches/patch-doc_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.3 2009/05/31 16:51:07 jasper Exp $
---- doc/Makefile.in.orig	Thu May  7 07:23:20 2009
-+++ doc/Makefile.in	Sun May 31 09:48:51 2009
-@@ -234,7 +234,7 @@ libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
- lt_ECHO = @lt_ECHO@
--mandir = @mandir@
-+mandir = @prefix@/man
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- openscincludedir = @openscincludedir@
diff --git a/security/opensc/pkg/PLIST b/security/opensc/pkg/PLIST
index c616334d7b0..e0d6eb147c6 100644
--- a/security/opensc/pkg/PLIST
+++ b/security/opensc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/03/13 21:33:06 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2010/09/14 10:32:06 jasper Exp $
 %%SHARED%%
 bin/cardos-info
 @bin bin/cardos-tool
@@ -14,6 +14,7 @@ bin/opensc-config
 @bin bin/pkcs15-init
 @bin bin/pkcs15-tool
 @bin bin/rutoken-tool
+@bin bin/westcos-tool
 include/opensc/
 include/opensc/asn1.h
 include/opensc/cardctl.h
@@ -58,6 +59,7 @@ lib/pkgconfig/libscconf.pc
 @man man/man1/pkcs15-crypt.1
 @man man/man1/pkcs15-init.1
 @man man/man1/pkcs15-tool.1
+@man man/man1/westcos-tool.1
 @man man/man3/sc_app_info_t.3
 @man man/man3/sc_append_record.3
 @man man/man3/sc_asn1_decode.3
@@ -136,8 +138,11 @@ share/opensc/incrypto34.profile
 share/opensc/jcop.profile
 share/opensc/miocos.profile
 share/opensc/muscle.profile
+share/opensc/myeid.profile
 share/opensc/oberthur.profile
 share/opensc/pkcs15.profile
 share/opensc/rutoken.profile
+share/opensc/rutoken_ecp.profile
 share/opensc/setcos.profile
 share/opensc/starcos.profile
+share/opensc/westcos.profile