From 6e8cd3dbd0a5ad921642674c60a2297b4deb5a6f Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Thu, 26 May 2011 13:32:26 +0000
Subject: * LICENSE=gnu-gpl-v2 # or later * honor PKGMANDIR * add user-destdir
 installation support * use ${PERL5} as shebang, not /usr/bin/env.

Bump PKGREVISION.
---
 security/pcsc-tools/Makefile         | 15 ++++++++-------
 security/pcsc-tools/distinfo         |  4 ++--
 security/pcsc-tools/patches/patch-aa |  8 +++++---
 3 files changed, 15 insertions(+), 12 deletions(-)

(limited to 'security/pcsc-tools')

diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index 78269c108b3..69db7ca9bc8 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -1,32 +1,33 @@
-# $NetBSD: Makefile,v 1.4 2010/11/28 10:47:40 shattered Exp $
+# $NetBSD: Makefile,v 1.5 2011/05/26 13:32:26 obache Exp $
 #
 
 DISTNAME=	pcsc-tools-1.4.15
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 
 MAINTAINER=	shannonjr@NetBSD.org
 HOMEPAGE=	http://ludovic.rousseau.free.fr/softwares/pcsc-tools/
 COMMENT=	Tools useful for a PC/SC user
+LICENSE=	gnu-gpl-v2 # or later
 
 DEPENDS+=	p5-pcsc-perl>=1.4.6:../../security/p5-pcsc
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	pkg-config
 USE_TOOLS+=	gmake
 USE_TOOLS+=	perl:run
 
-INSTALL_ENV+=	DESTDIR=${PREFIX:Q}
+DESTDIR_VARNAME=	# empty
+INSTALL_ENV+=		DESTDIR=${DESTDIR}${PREFIX:Q}
 
 SUBST_CLASSES+=		prefix
 SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix=	ATR_analysis ./ATR_analysis.1p
 SUBST_SED.prefix=	-e 's,/usr/local/pcsc,${PREFIX}/share/pcsc,'
 
-SUBST_CLASSES+=		perl
-SUBST_STAGE.perl=	post-patch
-SUBST_FILES.perl=	scriptor gscriptor gscriptor.gtk1.2 ATR_analysis
-SUBST_SED.perl=		-e 's,perl,${PERL5},'
+REPLACE_PERL+=		scriptor gscriptor gscriptor.gtk1.2 ATR_analysis
 
 .include "../../security/pcsc-lite/buildlink3.mk"
 .include "../../security/ccid/buildlink3.mk"
diff --git a/security/pcsc-tools/distinfo b/security/pcsc-tools/distinfo
index c6c0a8708e4..c5e1f4b9c90 100644
--- a/security/pcsc-tools/distinfo
+++ b/security/pcsc-tools/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2010/11/28 10:47:40 shattered Exp $
+$NetBSD: distinfo,v 1.4 2011/05/26 13:32:26 obache 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) = c7d4bf02255ed0269c9fa388689801cc8db11be3
+SHA1 (patch-aa) = 493587f97261ae8b5fa822cf13de5008f3f510d8
diff --git a/security/pcsc-tools/patches/patch-aa b/security/pcsc-tools/patches/patch-aa
index 2c75be43125..9330ba50021 100644
--- a/security/pcsc-tools/patches/patch-aa
+++ b/security/pcsc-tools/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2010/11/28 10:47:40 shattered Exp $
+$NetBSD: patch-aa,v 1.4 2011/05/26 13:32:26 obache Exp $
+
+* honor PKGMANDIR
 
 --- Makefile.orig	2008-09-07 11:51:40.000000000 +0000
 +++ Makefile
@@ -8,8 +10,8 @@ $NetBSD: patch-aa,v 1.3 2010/11/28 10:47:40 shattered Exp $
  
 -	install -d $(DESTDIR)/share/man/man1/
 -	install -m 644 $(MAN) $(DESTDIR)/share/man/man1/
-+	install -d $(DESTDIR)/man/man1/
-+	install -m 644 $(MAN) $(DESTDIR)/man/man1/
++	install -d $(DESTDIR)/$(PKGMANDIR)/man1/
++	install -m 644 $(MAN) $(DESTDIR)/$(PKGMANDIR)/man1/
  
  clean:
  	rm -f pcsc_scan.o $(BIN) $(MAN)
-- 
cgit v1.2.3