Update pbc from version 0.5.10 to 0.5.14

	Changes between PBC version 0.5.14 and 0.5.13

	* Eta pairing (type I), by Homer Hsing

	Changes between PBC version 0.5.13 and 0.5.12

	* Many thanks to Homer Hsing for volunteering to maintain this library.
	* Flattened nested functions.
	* Bugfix for test script.

	Changes between PBC version 0.5.12 and 0.5.11

	* Fixed a parsing bug reported by Michael Adjedj.

	Changes between PBC version 0.5.11 and 0.5.10

	* Support native win32 compilation via autotools. Thanks to Michael Rushanan.

Some changes from joerg, others from myself.

5 files changed, 72 insertions, 7 deletions

diff --git a/security/libpbc/Makefile b/security/libpbc/Makefile
index 5b0ee89bee5..cb3fa26dbf6 100644
--- a/security/libpbc/Makefile
+++ b/security/libpbc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/10/23 18:16:33 asau Exp $
+# $NetBSD: Makefile,v 1.3 2014/02/26 04:00:57 agc Exp $
 
-DISTNAME=		pbc-0.5.10
+DISTNAME=		pbc-0.5.14
 CATEGORIES=		security
 MASTER_SITES=		http://crypto.stanford.edu/pbc/files/
 
@@ -13,6 +13,7 @@ AUTO_MKDIRS=		yes
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
+USE_TOOLS+=		bison
 
 .include "../../devel/gmp/buildlink3.mk"
 
diff --git a/security/libpbc/PLIST b/security/libpbc/PLIST
index a53277098fa..98012239687 100644
--- a/security/libpbc/PLIST
+++ b/security/libpbc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/09 03:33:28 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/02/26 04:00:57 agc Exp $
 include/pbc/pbc.h
 include/pbc/pbc_a1_param.h
 include/pbc/pbc_a_param.h
@@ -11,6 +11,7 @@ include/pbc/pbc_fieldquadratic.h
 include/pbc/pbc_fp.h
 include/pbc/pbc_g_param.h
 include/pbc/pbc_hilbert.h
+include/pbc/pbc_i_param.h
 include/pbc/pbc_memory.h
 include/pbc/pbc_mnt.h
 include/pbc/pbc_multiz.h
@@ -19,6 +20,7 @@ include/pbc/pbc_param.h
 include/pbc/pbc_poly.h
 include/pbc/pbc_random.h
 include/pbc/pbc_singular.h
+include/pbc/pbc_ternary_extension_field.h
 include/pbc/pbc_test.h
 include/pbc/pbc_utils.h
 include/pbc/pbc_z.h
diff --git a/security/libpbc/distinfo b/security/libpbc/distinfo
index 67f1ca4103f..adf4619f7c1 100644
--- a/security/libpbc/distinfo
+++ b/security/libpbc/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/11/09 03:33:28 agc Exp $
+$NetBSD: distinfo,v 1.2 2014/02/26 04:00:57 agc Exp $
 
-SHA1 (pbc-0.5.10.tar.gz) = 79bed6f6ed76236ae60fd8d5afab2e4c36201a63
-RMD160 (pbc-0.5.10.tar.gz) = ca64d7dacb07d37d7cbfa45c4f1391fc83d975c4
-Size (pbc-0.5.10.tar.gz) = 523395 bytes
+SHA1 (pbc-0.5.14.tar.gz) = 8947f1a5a32d5c2d1f5113ccbb1e0d25ca5ce1c9
+RMD160 (pbc-0.5.14.tar.gz) = 7cf2fb398960d34d7207798296ceb8324af34a17
+Size (pbc-0.5.14.tar.gz) = 654515 bytes
+SHA1 (patch-configure) = 002434b4553fb85e8b9077c5fc9d4ccff7a8d1b7
+SHA1 (patch-configure.ac) = a87bcbcb292df27729697fdab3b0fd2215e087a4
diff --git a/security/libpbc/patches/patch-configure b/security/libpbc/patches/patch-configure
new file mode 100644
index 00000000000..a51f6e5c609
--- /dev/null
+++ b/security/libpbc/patches/patch-configure
@@ -0,0 +1,30 @@
+$NetBSD: patch-configure,v 1.1 2014/02/26 04:00:57 agc Exp $
+
+The test for string equality in test(1) is "="
+
+--- configure.orig	2013-06-14 20:43:05.000000000 -0700
++++ configure	2014-02-25 10:54:12.000000000 -0800
+@@ -12888,12 +12888,14 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++if false; then
+ if test "x$YACC" != "xbison -y"; then
+   echo "************************"
+   echo "bison not found"
+   echo "************************"
+   exit -1
+ fi
++fi
+ 
+ # Checks for libraries.
+ lib_err_msg="add its path to LDFLAGS\nsee ./configure --help"
+@@ -13532,7 +13534,7 @@
+ 
+ CFLAGS="$CFLAGS -Wall -W -Wfloat-equal -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wredundant-decls \
+ -Wendif-labels -Wshadow -pipe -ffast-math -U__STRICT_ANSI__ -std=gnu99"
+-if test "$with_debug" == "y"; then
++if test "$with_debug" = "y"; then
+     CFLAGS="$CFLAGS -g3 -O0"
+ elif test "$with_enable_optimized" != "no"; then
+    	CFLAGS="$CFLAGS -g -O2"
diff --git a/security/libpbc/patches/patch-configure.ac b/security/libpbc/patches/patch-configure.ac
new file mode 100644
index 00000000000..b5c4cbe6de1
--- /dev/null
+++ b/security/libpbc/patches/patch-configure.ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-configure.ac,v 1.1 2014/02/26 04:00:57 agc Exp $
+
+The test for string equality in test(1) is "="
+
+--- configure.ac.orig	2013-06-14 20:43:00.000000000 -0700
++++ configure.ac	2014-02-25 10:52:06.000000000 -0800
+@@ -86,12 +86,14 @@
+ fi
+ 
+ AC_PROG_YACC
++if false; then
+ if test "x$YACC" != "xbison -y"; then
+   echo "************************"
+   echo "bison not found"
+   echo "************************"
+   exit -1
+ fi
++fi
+ 
+ # Checks for libraries.
+ lib_err_msg="add its path to LDFLAGS\nsee ./configure --help"
+@@ -148,7 +150,7 @@
+ 
+ CFLAGS="$CFLAGS -Wall -W -Wfloat-equal -Wpointer-arith -Wcast-align -Wstrict-prototypes -Wredundant-decls \
+ -Wendif-labels -Wshadow -pipe -ffast-math -U__STRICT_ANSI__ -std=gnu99"
+-if test "$with_debug" == "y"; then
++if test "$with_debug" = "y"; then
+     CFLAGS="$CFLAGS -g3 -O0"
+ elif test "$with_enable_optimized" != "no"; then
+    	CFLAGS="$CFLAGS -g -O2"