Needs autopoint. Drop patches that are handled by openpam's b3.mk.

6 files changed, 3 insertions, 71 deletions

diff --git a/security/pam-p11/Makefile b/security/pam-p11/Makefile
index 78e1114a3cf..6021a24ade6 100644
--- a/security/pam-p11/Makefile
+++ b/security/pam-p11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/03/29 02:18:56 manu Exp $
+# $NetBSD: Makefile,v 1.15 2020/05/14 18:55:55 joerg Exp $
 #
 
 DISTNAME=	pam_p11-0.3.1
@@ -15,7 +15,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config autoconf automake
+USE_TOOLS+=		gmake pkg-config autoconf automake autopoint
 
 WRKSRC=	${WRKDIR}/${DISTNAME}
 pre-configure:
diff --git a/security/pam-p11/distinfo b/security/pam-p11/distinfo
index c58170029a5..29df219f597 100644
--- a/security/pam-p11/distinfo
+++ b/security/pam-p11/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.6 2020/03/29 02:18:56 manu Exp $
+$NetBSD: distinfo,v 1.7 2020/05/14 18:55:55 joerg Exp $
 
 SHA1 (pam_p11-0.3.1.tar.gz) = 540e7e0d342d9ef74aa9d0452a7b1f7f9864db0c
 RMD160 (pam_p11-0.3.1.tar.gz) = 1f3cc07a7da062f5b4df9681f807f3fc75a70cd5
 SHA512 (pam_p11-0.3.1.tar.gz) = caaa6882d4c007dfaba5974dc420bc45aa225f705679d170fdc9576aa49cbd24bba6985f14eb2bca97d4fe37aaf6088641add912dfbb93740b7d634f448addcf
 Size (pam_p11-0.3.1.tar.gz) = 422940 bytes
-SHA1 (patch-ab) = d953fe263b8cbd0b659d79b03f7f5ccc78404d5d
-SHA1 (patch-src_login.c) = 985a660cfbf76368f8d18527fef43180a81dc3be
-SHA1 (patch-src_passwd.c) = 88a5280eb0b00b3687c04559726dbabca345113c
-SHA1 (patch-src_test.c) = 81c44e7310086f8537dc65ecfcd41c71003edc29
diff --git a/security/pam-p11/patches/patch-ab b/security/pam-p11/patches/patch-ab
index 0a22b7f68e5..e69de29bb2d 100644
--- a/security/pam-p11/patches/patch-ab
+++ b/security/pam-p11/patches/patch-ab
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2020/03/29 02:18:56 manu Exp $
---- src/pam_p11.c.orig	2020-03-28 02:10:02.159482871 +0000
-+++ src/pam_p11.c	2020-03-28 02:12:32.285912554 +0000
-@@ -32,8 +32,12 @@
- #include <libp11.h>
- #include <regex.h>
- #include <stdlib.h>
- 
-+#ifdef __NetBSD__
-+#define NO_STATIC_MODULES
-+#endif
-+
- /* openssl deprecated API emulation */
- #ifndef HAVE_EVP_MD_CTX_NEW
- #define EVP_MD_CTX_new()	EVP_MD_CTX_create()
- #endif
diff --git a/security/pam-p11/patches/patch-src_login.c b/security/pam-p11/patches/patch-src_login.c
index 13861d5c258..e69de29bb2d 100644
--- a/security/pam-p11/patches/patch-src_login.c
+++ b/security/pam-p11/patches/patch-src_login.c
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_login.c,v 1.1 2020/03/29 02:18:56 manu Exp $
---- src/login.c.orig	2020-03-28 02:25:09.912642023 +0000
-+++ src/login.c	2020-03-28 02:25:31.170971060 +0000
-@@ -19,8 +19,12 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
- 
-+#ifdef __NetBSD__
-+#define NO_STATIC_MODULES
-+#endif
-+
- #include <security/pam_modules.h>
- 
- extern int pam_sm_test(pam_handle_t *pamh, int flags, int argc, const char **argv);
- 
diff --git a/security/pam-p11/patches/patch-src_passwd.c b/security/pam-p11/patches/patch-src_passwd.c
index 54091523d3f..e69de29bb2d 100644
--- a/security/pam-p11/patches/patch-src_passwd.c
+++ b/security/pam-p11/patches/patch-src_passwd.c
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_passwd.c,v 1.1 2020/03/29 02:18:56 manu Exp $
---- src/passwd.c.orig	2020-03-28 02:26:07.941903613 +0000
-+++ src/passwd.c	2020-03-28 02:26:17.315839015 +0000
-@@ -19,8 +19,12 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
- 
-+#ifdef __NetBSD__
-+#define NO_STATIC_MODULES
-+#endif
-+
- #include <security/pam_modules.h>
- 
- extern int pam_sm_test(pam_handle_t *pamh, int flags, int argc, const char **argv);
- 
diff --git a/security/pam-p11/patches/patch-src_test.c b/security/pam-p11/patches/patch-src_test.c
index 1d864f2ccf8..e69de29bb2d 100644
--- a/security/pam-p11/patches/patch-src_test.c
+++ b/security/pam-p11/patches/patch-src_test.c
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_test.c,v 1.1 2020/03/29 02:18:56 manu Exp $
---- src/test.c.orig	2020-03-28 02:23:37.173089076 +0000
-+++ src/test.c	2020-03-28 02:23:57.222211243 +0000
-@@ -19,8 +19,12 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
- 
-+#ifdef __NetBSD__
-+#define NO_STATIC_MODULES
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>