Rename files so that we pick up the correct header file.

Add the map file for the BSD Makefile's symbol exports.

4 files changed, 21 insertions, 4 deletions

diff --git a/security/netpgpverify/files/bzlib_private.h b/security/netpgpverify/files/bzlib_private.h
index 52908d4b7dc..097d4d58ba6 100644
--- a/security/netpgpverify/files/bzlib_private.h
+++ b/security/netpgpverify/files/bzlib_private.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzlib_private.h,v 1.4 2020/05/03 23:49:04 agc Exp $	*/
+/*	$NetBSD: bzlib_private.h,v 1.5 2020/05/04 19:13:13 agc Exp $	*/
 
 
 /*-------------------------------------------------------------*/
@@ -32,7 +32,7 @@
 #include <string.h>
 #endif
 
-#include "bzlib.h"
+#include "netpgpv-bzlib.h"
 
 
 
diff --git a/security/netpgpverify/files/libverify.c b/security/netpgpverify/files/libverify.c
index 9b5f6cfd9e4..36328ebab8a 100644
--- a/security/netpgpverify/files/libverify.c
+++ b/security/netpgpverify/files/libverify.c
@@ -40,7 +40,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "bzlib.h"
+#include "netpgpv-bzlib.h"
 #include "zlib.h"
 
 #include "array.h"
diff --git a/security/netpgpverify/files/bzlib.h b/security/netpgpverify/files/netpgpv-bzlib.h
index d176425e17a..446fbef7408 100644
--- a/security/netpgpverify/files/bzlib.h
+++ b/security/netpgpverify/files/netpgpv-bzlib.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bzlib.h,v 1.2 2020/05/03 23:49:04 agc Exp $	*/
+/*	$NetBSD: netpgpv-bzlib.h,v 1.1 2020/05/04 19:13:13 agc Exp $	*/
 
 
 /*-------------------------------------------------------------*/
diff --git a/security/netpgpverify/files/verify.map b/security/netpgpverify/files/verify.map
new file mode 100644
index 00000000000..8da95be0a01
--- /dev/null
+++ b/security/netpgpverify/files/verify.map
@@ -0,0 +1,17 @@
+NETPGPVERIFY_5_0 {
+    global:
+	pgpv_new;
+	pgpv_new_cursor;
+	pgpv_read_pubring;
+	pgpv_read_ssh_pubkeys;
+	pgpv_verify;
+	pgpv_get_verified;
+	pgpv_dump;
+	pgpv_get_entry;
+	pgpv_get_cursor_num;
+	pgpv_get_cursor_str;
+	pgpv_get_cursor_element;
+	pgpv_close;
+	pgpv_cursor_close;
+    local: *;
+};