From c0a4c7bb6eeac9eda3c7d2733c710f4997bfb6f5 Mon Sep 17 00:00:00 2001
From: gabor <gabor@FreeBSD.org>
Date: Tue, 24 Feb 2015 15:48:26 +0000
Subject: - Minor fixes from Apple [1] - Add LICENSE [1] - Pet portlint(1)

PR:		193963 [1]
Submitted by:	pfg [1]
---
 math/gnubc/Makefile               |  6 ++++--
 math/gnubc/files/patch-bc__bc.y   | 10 ++++++++++
 math/gnubc/files/patch-bc__load.c | 11 +++++++++++
 math/gnubc/files/patch-bc__main.c | 12 ++++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 math/gnubc/files/patch-bc__bc.y
 create mode 100644 math/gnubc/files/patch-bc__load.c
 create mode 100644 math/gnubc/files/patch-bc__main.c

diff --git a/math/gnubc/Makefile b/math/gnubc/Makefile
index c4a647f146de..afaf593b8f1c 100644
--- a/math/gnubc/Makefile
+++ b/math/gnubc/Makefile
@@ -3,14 +3,16 @@
 
 PORTNAME=	bc
 PORTVERSION=	1.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	gnu
 
 MAINTAINER=	gabor@FreeBSD.org
-COMMENT=	The GNU bc/dc calculator
+COMMENT=	GNU bc/dc calculator
+
+LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libedit
diff --git a/math/gnubc/files/patch-bc__bc.y b/math/gnubc/files/patch-bc__bc.y
new file mode 100644
index 000000000000..e7c0efdd8901
--- /dev/null
+++ b/math/gnubc/files/patch-bc__bc.y
@@ -0,0 +1,10 @@
+--- bc/bc.y.orig	Sun Oct 24 10:07:01 2004
++++ bc/bc.y	Sun Oct 24 10:07:20 2004
+@@ -424,7 +424,6 @@
+ 			      generate (genstr);
+ 			      $$ = 0;
+ 			    }
+-			;
+ 			| expression AND 
+ 			    {
+ 			      warn("&& operator");
diff --git a/math/gnubc/files/patch-bc__load.c b/math/gnubc/files/patch-bc__load.c
new file mode 100644
index 000000000000..8cafa3d5cc99
--- /dev/null
+++ b/math/gnubc/files/patch-bc__load.c
@@ -0,0 +1,11 @@
+--- bc/load.c~	2000-09-13 11:22:38.000000000 -0700
++++ bc/load.c	2005-08-02 11:06:00.000000000 -0700
+@@ -156,7 +156,7 @@ load_code (code)
+   long  label_no;
+   long  vaf_name;	/* variable, array or function number. */
+   long  func;
+-  program_counter save_adr;
++  static program_counter save_adr; /* saved across calls to load_code */
+ 
+   /* Initialize. */
+   str = code;
diff --git a/math/gnubc/files/patch-bc__main.c b/math/gnubc/files/patch-bc__main.c
new file mode 100644
index 000000000000..3936f89d59df
--- /dev/null
+++ b/math/gnubc/files/patch-bc__main.c
@@ -0,0 +1,12 @@
+--- bc/main.c.orig	2006-12-01 14:30:52.000000000 -0800
++++ bc/main.c	2006-12-01 14:31:13.000000000 -0800
+@@ -127,6 +127,9 @@
+ 	  warn_not_std = TRUE;
+ 	  break;
+ 
++	case 0:
++	  break;
++
+ 	default:
+ 	  usage(argv[0]);
+ 	  exit (1);
-- 
cgit