5 files changed, 42 insertions, 20 deletions
diff --git a/security/pcsc-tools/DESCR b/security/pcsc-tools/DESCR
index 3020931fdd8..4be563fc249 100644
--- a/security/pcsc-tools/DESCR
+++ b/security/pcsc-tools/DESCR
@@ -2,8 +2,8 @@ Provides several tools that are useful when working
 with smart cards: csc_scan regularly scans every
 PC/SC reader connected to the host and reports when
 a card is inserted or removed. ATR_analysis is a Perl
-script used to parse the smart card ATR. The 
+script used to parse the smart card ATR. The
 smartcard_list.txt contains ATR of some cards. It is
 used by ATR_analysis to find a card model corresponding
-to the ATR. The perl script scriptortis used to send 
-commands to a smart card using a batch file or stdin. 
+to the ATR. The perl script scriptortis used to send
+commands to a smart card using a batch file or stdin.
diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index 1ddb88b80e7..82d9264acce 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 18:16:49 asau Exp $
+# $NetBSD: Makefile,v 1.8 2012/12/15 00:53:26 pettai Exp $
 #
 
-DISTNAME=	pcsc-tools-1.4.15
-PKGREVISION=	3
+DISTNAME=	pcsc-tools-1.4.21
 CATEGORIES=	security
 MASTER_SITES=	http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 
diff --git a/security/pcsc-tools/PLIST b/security/pcsc-tools/PLIST
index a8205e42ec6..c4ec49649fb 100644
--- a/security/pcsc-tools/PLIST
+++ b/security/pcsc-tools/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2010/11/28 10:47:40 shattered Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/12/15 00:53:26 pettai Exp $
 bin/ATR_analysis
 bin/gscriptor
 bin/pcsc_scan
 bin/scriptor
-man/man1/ATR_analysis.1p.gz
-man/man1/gscriptor.1p.gz
-man/man1/pcsc_scan.1.gz
-man/man1/scriptor.1p.gz
+man/man1/ATR_analysis.1p
+man/man1/gscriptor.1p
+man/man1/pcsc_scan.1
+man/man1/scriptor.1p
 share/pcsc/smartcard_list.txt
diff --git a/security/pcsc-tools/distinfo b/security/pcsc-tools/distinfo
index c5e1f4b9c90..5dde61c9948 100644
--- a/security/pcsc-tools/distinfo
+++ b/security/pcsc-tools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2011/05/26 13:32:26 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/12/15 00:53:26 pettai Exp $
 
-SHA1 (pcsc-tools-1.4.15.tar.gz) = cdc37f7763ebeb927487585d4eecd84d8e366421
-RMD160 (pcsc-tools-1.4.15.tar.gz) = e5f278a43cf138a6bcdaa1ac478d64fb123bab5b
-Size (pcsc-tools-1.4.15.tar.gz) = 64090 bytes
-SHA1 (patch-aa) = 493587f97261ae8b5fa822cf13de5008f3f510d8
+SHA1 (pcsc-tools-1.4.21.tar.gz) = c6bb26e5a925f2205555d2f5b8dbb914665d100c
+RMD160 (pcsc-tools-1.4.21.tar.gz) = d4c13f616751753506dd7f1b30eb1464fe8c1a12
+Size (pcsc-tools-1.4.21.tar.gz) = 101331 bytes
+SHA1 (patch-aa) = e993bb146b32eaec52d8feb3da8075bae2fcbca7
diff --git a/security/pcsc-tools/patches/patch-aa b/security/pcsc-tools/patches/patch-aa
index 9330ba50021..f33b38abd64 100644
--- a/security/pcsc-tools/patches/patch-aa
+++ b/security/pcsc-tools/patches/patch-aa
@@ -1,10 +1,19 @@
-$NetBSD: patch-aa,v 1.4 2011/05/26 13:32:26 obache Exp $
+$NetBSD: patch-aa,v 1.5 2012/12/15 00:53:26 pettai Exp $
 
-* honor PKGMANDIR
+honor PKGMANDIR
 
---- Makefile.orig	2008-09-07 11:51:40.000000000 +0000
+--- Makefile.orig	2012-06-16 10:33:32.000000000 +0000
 +++ Makefile
-@@ -33,8 +33,8 @@ install: all
+@@ -18,7 +18,7 @@ LDLIBS := $(PCSC_LDLIBS)
+ 
+ BIN = pcsc_scan
+ BIN_SCRIPT = ATR_analysis gscriptor scriptor
+-MAN = pcsc_scan.1.gz gscriptor.1p.gz scriptor.1p.gz ATR_analysis.1p.gz
++MAN = pcsc_scan.1 gscriptor.1p scriptor.1p ATR_analysis.1p
+ 
+ all: $(BIN) $(MAN)
+ 
+@@ -33,17 +33,17 @@ install: all
  	install -d $(DESTDIR)/share/pcsc
  	install -m 644 smartcard_list.txt $(DESTDIR)/share/pcsc
  
@@ -15,3 +24,17 @@ $NetBSD: patch-aa,v 1.4 2011/05/26 13:32:26 obache Exp $
  
  clean:
  	rm -f pcsc_scan.o $(BIN) $(MAN)
+ 
+-%.1.gz: %.1
+-	gzip --best $^ --to-stdout > $@
+-
+-%.1p.gz: %.1p
+-	gzip --best $^ --to-stdout > $@
++#%.1.gz: %.1
++#	gzip --best $^ --to-stdout > $@
++#
++#%.1p.gz: %.1p
++#	gzip --best $^ --to-stdout > $@
+ 
+ .PHONY: clean all install
+