Drop old patches that I don't understand.

There were two patches to cast __FUNCTION__ to const char *; this is
apparently to work around a warning.  gcc on NetBSD 6 and clang on osx
10.9 do not emit a warning with the unpatched code.  Upstream doesn't
understand the patch, and I don't etiher.  ok pettai@

Take maintainership.

3 files changed, 3 insertions, 91 deletions

diff --git a/security/ccid/Makefile b/security/ccid/Makefile
index cd5143cc82a..d1ac3d6aeec 100644
--- a/security/ccid/Makefile
+++ b/security/ccid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/02/25 17:16:35 gdt Exp $
+# $NetBSD: Makefile,v 1.15 2014/02/26 01:16:56 gdt Exp $
 #
 
 DISTNAME=	ccid-1.4.15
+PKGREVISION=	1
 CATEGORIES=	security
 # Note that the MASTER_SITES URL is not stable with version changes,
 # and one can end up with an old version if DISTNAME is changed but
@@ -9,7 +10,7 @@ CATEGORIES=	security
 MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/3989/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://pcsclite.alioth.debian.org/ccid.html
 COMMENT=	Middleware to access a smart card using SCard API (PC/SC)
 LICENSE=	gnu-lgpl-v2.1
diff --git a/security/ccid/patches/patch-ab b/security/ccid/patches/patch-ab
deleted file mode 100644
index 1a0928e2afb..00000000000
--- a/security/ccid/patches/patch-ab
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2012/12/15 00:29:31 pettai Exp $
-
---- src/commands.c.orig	2012-12-11 19:36:05.000000000 +0000
-+++ src/commands.c
-@@ -161,7 +161,7 @@ RESPONSECODE CmdPowerOn(unsigned int rea
- 
- 			/* Status Information? */
- 			if (0x40 == tmp[0])
--				ccid_error(tmp[2], __FILE__, __LINE__, __FUNCTION__);
-+				ccid_error(tmp[2], __FILE__, __LINE__, (const char *) __FUNCTION__);
- 			return IFD_COMMUNICATION_ERROR;
- 		}
- 
-@@ -230,7 +230,7 @@ again:
- 
- 	if (buffer[STATUS_OFFSET] & CCID_COMMAND_FAILED)
- 	{
--		ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__);    /* bError */
-+		ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__);    /* bError */
- 
- 		if (0xBB == buffer[ERROR_OFFSET] &&	/* Protocol error in EMV mode */
- 			((GEMPC433 == ccid_descriptor->readerID)
-@@ -823,7 +823,7 @@ again:
- 
- 	if (cmd_out[STATUS_OFFSET] & CCID_COMMAND_FAILED)
- 	{
--		ccid_error(cmd_out[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__);    /* bError */
-+		ccid_error(cmd_out[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__);    /* bError */
- 		return_value = IFD_COMMUNICATION_ERROR;
- 	}
- 
-@@ -925,7 +925,7 @@ RESPONSECODE CmdPowerOff(unsigned int re
- 
- 	if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
- 	{
--		ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__);    /* bError */
-+		ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__);    /* bError */
- 		return_value = IFD_COMMUNICATION_ERROR;
- 	}
- 
-@@ -1052,7 +1052,7 @@ again_status:
- 		&& (buffer[ERROR_OFFSET] != 0xFE))
- 	{
- 		return_value = IFD_COMMUNICATION_ERROR;
--		ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__);    /* bError */
-+		ccid_error(buffer[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__);    /* bError */
- 	}
- 
- 	return return_value;
-@@ -1278,7 +1278,7 @@ time_request_ICCD_B:
- 
- 			case 0x40:
- 				/* Status Information */
--				ccid_error(rx_buffer[2], __FILE__, __LINE__, __FUNCTION__);
-+				ccid_error(rx_buffer[2], __FILE__, __LINE__, (const char *) __FUNCTION__);
- 				return IFD_COMMUNICATION_ERROR;
- 
- 			case 0x80:
-@@ -1336,7 +1336,7 @@ time_request:
- 
- 	if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
- 	{
--		ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__);    /* bError */
-+		ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__);    /* bError */
- 		switch (cmd[ERROR_OFFSET])
- 		{
- 			case 0xEF:	/* cancel */
-@@ -2083,7 +2083,7 @@ RESPONSECODE SetParameters(unsigned int 
- 
- 	if (cmd[STATUS_OFFSET] & CCID_COMMAND_FAILED)
- 	{
--		ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, __FUNCTION__);    /* bError */
-+		ccid_error(cmd[ERROR_OFFSET], __FILE__, __LINE__, (const char *) __FUNCTION__);    /* bError */
- 		if (0x00 == cmd[ERROR_OFFSET])	/* command not supported */
- 			return IFD_NOT_SUPPORTED;
- 		else
diff --git a/security/ccid/patches/patch-ad b/security/ccid/patches/patch-ad
deleted file mode 100644
index 0e967ede7d4..00000000000
--- a/security/ccid/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2012/12/15 00:29:31 pettai Exp $
-
---- src/ccid_usb.c.orig	2012-12-11 19:45:39.000000000 +0000
-+++ src/ccid_usb.c
-@@ -1106,7 +1106,7 @@ int InterruptRead(int reader_index, int 
- 	switch (ret)
- 	{
- 		case LIBUSB_TRANSFER_COMPLETED:
--			DEBUG_XXD("NotifySlotChange: ", buffer, actual_length);
-+			DEBUG_XXD("NotifySlotChange: ", (const unsigned char *) buffer, actual_length);
- 			break;
- 
- 		case LIBUSB_TRANSFER_TIMED_OUT: