Update to 2.2

* Change PKGNAME as a name of tarball

Changelog:
GnuCOBOL 2.2 released (20170906)

* Move to GPL/LGPL 3

* New GnuCOBOL features (too much to list)

** User Defined Functions, FUNCTION-ID.

** New intrinsic functions

  ABSOLUTE-VALUE                   alias for ABS
  CURRENCY-SYMBOL                  CURRENCY-SYMBOL of the current program
  FORMATTED-CURRENT-DATE           ISO 8601 datetime function
  FORMATTED-DATE                   ISO 8601 datetime function
  FORMATTED-DATETIME               ISO 8601 datetime function
  FORMATTED-TIME                   ISO 8601 datetime function
  TEST-FORMATTED-DATETIME          ISO 8601 datetime function
  INTEGER-OF-FORMATTED-DATE        date to integer
  HIGHEST-ALGEBRAIC                now implemented
  LOWEST-ALGEBRAIC                 now implemented
  LOCALE-COMPARE                   now implemented
  NUMVAL-F                         now implemented
  TEST-NUMVAL                      now implemented
  TEST-NUMVAL-C                    now implemented
  TEST-NUMVAL-F                    now implemented
  LENGTH-AN                        alias for BYTE-LENGTH
  MODULE-CALLER-ID                 return the name of the caller
  MODULE-DATE                      current module: compilation date
  MODULE-TIME                      current module: compilation time
  MODULE-FORMATTED-DATE            current module: formatted datetime
  MODULE-ID                        current module: PROGRAM-ID
  MODULE-PATH                      current module: path on compile time
  MODULE-SOURCE                    current module: name on compile time
  MONETARY-DECIMAL-POINT           LOCALE based fiscal decimal point
  MONETARY-THOUSANDS-SEPARATOR     LOCALE based fiscal visual grouping separator

  Note:
  The functions that are actually available as intrinsic functions depend
  on the -std used. Function names that aren't marked as intrinsic functions
  by the current -std can be used freely as user defined words or
  even as user defined functions.

** New system functions

  C$CALLEDBY                       return the name of the caller
  CBL_GC_FORK                      fork current process (not on Windows)
  CBL_GC_WAITPID                   wait for process to end
  CBL_GC_GETOPT  (CBL_OC_GETOPT)   comand lineoption parser for COBOL
  CBL_GC_PRINTABLE (C$PRINTABLE)   check if character is printable
  CBL_GC_HOSTED (CBL_OC_HOSTED)    provides access to C extern variables,
                                   like stdin, errno
  CBL_GC_NANOSLEEP                 CBL_OC_NANOSLEEP
  CBL_GET_SCR_SIZE                 get current terminal size - if any
  CBL_READ_KBD_CHAR                get character from terminal
  CBL_SET_CSR_POS                  set current position on terminal
  x'E4'                            clear terminal screen
  x'E5'                            ring the bell

** many new / extended COBOL statements from COBOL2002/2014 and extensions
   from different COBOL dialects

** more SWITCHes: from SWITCH-01 to SWITCH-36 and its variants from many
   COBOL dialects

** more IEEE numeric types added, FLOAT-DECIMAL-16, FLOAT-DECIMAL-34, etc

** more literal types added, numeric boolean etc.

** most of the COBOL 2014 spec Compiler Directive Facility is in

** optional: stricter syntax checks

** refactored and extended compiler and runtime messages with available
   translations (currently to Spanish, Portuguese and Dutch, partial to German)

** screen IO: many extended ACCEPT DISPLAY and SCREEN SECTION changes

** Direct call interface for C:
  CALL-CONVENTIONS for CALLs and PROCEDURE DIVISION
  SIZE of parameters specified for CALL ... BY VALUE
  RETURN NOTHING for calling void functions
  RETURN ADDRESS OF VAR for calling functions returning a pointer
  PROCEDURE DIVISION RETURNING OMITTED -> callable as void function

** Much, much more!


* New cobc options:

** New -std options:

  cobol2014       COBOL 2014 Standard
  xopen           X/Open COBOL Standard
  mf-strict       Micro Focus COBOL compatibility   - strict
  ibm-strict      IBM COBOL compatibility           - strict
  ibm-strict      MVS/VM COBOL compatibility        - strict
  acu             ACUCOBOL-GT compatibility
  acu-strict      ACUCOBOL-GT compatibility         - strict
  bs2000          BS2000 COBOL compatibility (back again)
  bs2000-strict   BS2000 COBOL compatibility        - strict
  rm              RM-COBOL compatibility
  rm-strict       RM-COBOL compatibility            - strict

  Note:
  The GnuCOBOL compiler tries to limit both the feature-set and reserved words
  to the specified compiler when the "strict" dialects are used.
  COBOL sources compiled with these dialects are therefore likely to compile
  with the specified compiler and vice versa: sources that were compiled on
  the specified compiler should compile without any issues with GnuCOBOL.

  With the "non-strict" dialects GnuCOBOL will activate the complete
  feature-set where it doesn't directly conflict with the specified dialect,
  including reserved words and GnuCOBOL specific extensions.
  COBOL sources compiled with these dialects therefore may work only
  with GnuCOBOL. COBOL sources may need a change because of rich feature-set
  and reserved words in GnuCOBOL, otherwise offending words may be removed
  by `-fno-reserved=word`.
  COBOL-85, X/Open COBOL, COBOL 2002 and COBOL 2014 are always "strict".

** New listing options:

  -t listing, -T wide listing, --tlines=lines, lines per page of listing
  -Xref

  Note: -P, generate preprocessor listing, is still available (and improved)

** All compiler configuration flags may be set on command line
   to override a specific setting of the current -std, see cobc --help

** All Warnings can be explicit enabled/disabled or even marked as error,
   see cobc --help
  -Wunreachable report on possible unreachable statements

** Options for the C compiler/linker:
  -K <entry>, compile entry point as static (resolve at link time)
  -A, add options to C compile phase
  -Q, add options to C link phase

** Miscellaneous
  -i -info, display build/environment
  -D define symbol for Compiler Directive Facility
  -j -job=args, run job after compile
  input filename of '-' reads source from standard in
  For more: see cobc --help


* New cobcrun options:

  -i -info, display build/environment
  -r -runtime-env, display runtime configuration
  -c -config, set runtime config from file
  -M -module, set path/module name when looking for entry


* New build features

  make test      downloads NIST testsuite if necessary
                 now usable with parallel builds (make -j4 test)
  make checkall  runs both the internal an NIST testsuite

** testsuite defaults to coloured output

** Windows(tm) Visual Studio build support files added,
   options to validate the software generated with VS against both test suites

** removed maintainer mode - if files need a rebuild because of a change
   they are always rebuild

** help2man, bison and flex are checked during configure,
   if they need to be invoked and are missing a useful error message is given

** All files created by GnuCOBOL runtime use the same file permission settings
   now: COB_FILE_MODE which was changed to 0666

** changed unix package name from "gnu-cobol" to "gnucobol"

4 files changed, 58 insertions, 69 deletions

diff --git a/lang/gnucobol/Makefile b/lang/gnucobol/Makefile
index 5cd5ae79566..efdade30411 100644
--- a/lang/gnucobol/Makefile
+++ b/lang/gnucobol/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2017/01/05 15:36:24 roy Exp $
+# $NetBSD: Makefile,v 1.6 2017/12/17 04:54:15 ryoon Exp $
 #
 
-DISTNAME=	gnu-cobol-2.0_rc-1
-PKGNAME=	opencobol-2.0rc1
+DISTNAME=	gnucobol-2.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=open-cobol/}
 
 MAINTAINER=	rodo@bloerp.de
-HOMEPAGE=	https://sourceforge.net/projects/open-cobol/
+HOMEPAGE=	https://open-cobol.sourceforge.io/
 COMMENT=	Open-source COBOL compiler
-LICENSE=	gnu-gpl-v3
+LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
 CONFLICTS=		opensource-cobol-[0-9]* open-cobol-ce-[0-9]*
+CONFLICTS+=		opencobol-[0-9]*
 
-WRKSRC=		${WRKDIR}/gnu-cobol-2.0
+CHECK_PORTABILITY_SKIP=	tests/testsuite
 
 BDB_ACCEPTED=		db4 db5
 USE_LIBTOOL=		yes
@@ -25,7 +25,11 @@ CONFIGURE_ARGS+=	--with-lfs
 CONFIGURE_ARGS+=	--without-readline
 INFO_FILES=		yes
 
-CONFIGURE_ENV+=		cobdb=${BDB_TYPE}
+SUBST_CLASSES+=		bdb
+SUBST_MESSAGE.bdb=	Detect pkgsrc Berkeley DB library
+SUBST_STAGE.bdb=	pre-configure
+SUBST_FILES.bdb=	configure
+SUBST_SED.bdb=		-e 's,db-$$COB_BDB_HEADER,${BDB_TYPE},g'
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
diff --git a/lang/gnucobol/PLIST b/lang/gnucobol/PLIST
index 3c4aeccc7c7..7d4dcb37ce0 100644
--- a/lang/gnucobol/PLIST
+++ b/lang/gnucobol/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/10/15 13:40:40 wen Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/12/17 04:54:15 ryoon Exp $
 bin/cob-config
 bin/cobc
 bin/cobcrun
@@ -7,26 +7,47 @@ include/libcob/cobgetopt.h
 include/libcob/common.h
 include/libcob/exception.def
 info/gnucobol.info
-lib/gnu-cobol/CBL_OC_DUMP.so
+lib/gnucobol/CBL_OC_DUMP.so
 lib/libcob.la
 man/man1/cobc.1
 man/man1/cobcrun.1
-share/gnu-cobol/config/acu.conf
-share/gnu-cobol/config/bs2000.conf
-share/gnu-cobol/config/cobol2002.conf
-share/gnu-cobol/config/cobol2014.conf
-share/gnu-cobol/config/cobol85.conf
-share/gnu-cobol/config/default.conf
-share/gnu-cobol/config/ibm.conf
-share/gnu-cobol/config/mf.conf
-share/gnu-cobol/config/mvs.conf
-share/gnu-cobol/config/runtime.cfg
-share/gnu-cobol/config/runtime_empty.cfg
-share/gnu-cobol/copy/screenio.cpy
-share/gnu-cobol/copy/sqlca.cpy
-share/gnu-cobol/copy/sqlda.cpy
-share/locale/en@boldquot/LC_MESSAGES/gnu-cobol.mo
-share/locale/en@quot/LC_MESSAGES/gnu-cobol.mo
-share/locale/es/LC_MESSAGES/gnu-cobol.mo
-share/locale/ja/LC_MESSAGES/gnu-cobol.mo
-share/locale/nl/LC_MESSAGES/gnu-cobol.mo
+share/gnucobol/config/acu-strict.conf
+share/gnucobol/config/acu.conf
+share/gnucobol/config/acu.words
+share/gnucobol/config/bs2000-strict.conf
+share/gnucobol/config/bs2000.conf
+share/gnucobol/config/bs2000.words
+share/gnucobol/config/cobol2002.conf
+share/gnucobol/config/cobol2002.words
+share/gnucobol/config/cobol2014.conf
+share/gnucobol/config/cobol2014.words
+share/gnucobol/config/cobol85.conf
+share/gnucobol/config/cobol85.words
+share/gnucobol/config/default.conf
+share/gnucobol/config/ibm-strict.conf
+share/gnucobol/config/ibm.conf
+share/gnucobol/config/ibm.words
+share/gnucobol/config/lax.conf-inc
+share/gnucobol/config/mf-strict.conf
+share/gnucobol/config/mf.conf
+share/gnucobol/config/mf.words
+share/gnucobol/config/mvs-strict.conf
+share/gnucobol/config/mvs.conf
+share/gnucobol/config/mvs.words
+share/gnucobol/config/rm-strict.conf
+share/gnucobol/config/rm.conf
+share/gnucobol/config/rm.words
+share/gnucobol/config/runtime.cfg
+share/gnucobol/config/runtime_empty.cfg
+share/gnucobol/config/xopen.conf
+share/gnucobol/copy/screenio.cpy
+share/gnucobol/copy/sqlca.cpy
+share/gnucobol/copy/sqlda.cpy
+share/locale/de/LC_MESSAGES/gnucobol.mo
+share/locale/en@boldquot/LC_MESSAGES/gnucobol.mo
+share/locale/en@quot/LC_MESSAGES/gnucobol.mo
+share/locale/es/LC_MESSAGES/gnucobol.mo
+share/locale/it/LC_MESSAGES/gnucobol.mo
+share/locale/ja/LC_MESSAGES/gnucobol.mo
+share/locale/nl/LC_MESSAGES/gnucobol.mo
+share/locale/pt/LC_MESSAGES/gnucobol.mo
diff --git a/lang/gnucobol/distinfo b/lang/gnucobol/distinfo
index ecbfbec4315..e07925daba1 100644
--- a/lang/gnucobol/distinfo
+++ b/lang/gnucobol/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2016/10/15 13:40:40 wen Exp $
+$NetBSD: distinfo,v 1.5 2017/12/17 04:54:15 ryoon Exp $
 
-SHA1 (gnu-cobol-2.0_rc-1.tar.gz) = 8694b66218a6c02b9cba44094d5d736d8a1b6ded
-RMD160 (gnu-cobol-2.0_rc-1.tar.gz) = bcdf2bc096f4fe26cbcc8e2bb33cf5736417018b
-SHA512 (gnu-cobol-2.0_rc-1.tar.gz) = b6bab2cda3bbf15cb3e063b644f8387176c7c2a30f60611480e2ec7de150d2c43a73a6198c24974c416d1732c71d7b518af7ecd4db7fd0f784278340a95185f7
-Size (gnu-cobol-2.0_rc-1.tar.gz) = 2206047 bytes
-SHA1 (patch-configure) = e225df80bb48110d8156429b925dbed3d9f57cc2
+SHA1 (gnucobol-2.2.tar.gz) = 23a45625d23700593b5eea09f8f52dd628b9bcf5
+RMD160 (gnucobol-2.2.tar.gz) = ec17eca4de2e2b9b129b38f5ed260fcf27f4a71a
+SHA512 (gnucobol-2.2.tar.gz) = 2ac209af6c7251b3fc5a7b8a2cfe490bfea16640dbf4d56d79708d688d99c4bfd577ff3f9523962392e81ebe0efea6985b964449c44a4cfa6af5119d1c1bab56
+Size (gnucobol-2.2.tar.gz) = 2660284 bytes
diff --git a/lang/gnucobol/patches/patch-configure b/lang/gnucobol/patches/patch-configure
deleted file mode 100644
index be9f264f382..00000000000
--- a/lang/gnucobol/patches/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2016/10/15 13:40:40 wen Exp $
-
-* Improve POSIX shell compatibility.
-* Detect pkgsrc berkeley db library.
-* Don't remove -g.
-
---- configure.orig	2016-08-14 12:21:45.000000000 +0000
-+++ configure
-@@ -14128,7 +14128,7 @@ $as_echo_n "checking matching GMP versio
- COB_GMP_LIB_MAJOR=$(echo "$COB_GMP_LIB" | cut -d. -f1)
- COB_GMP_LIB_MINOR=$(echo "$COB_GMP_LIB" | cut -d. -f2)
- 
--if test "$COB_GMP_HEADER" == "$COB_GMP_LIB_MAJOR.$COB_GMP_LIB_MINOR"; then
-+if test "$COB_GMP_HEADER" = "$COB_GMP_LIB_MAJOR.$COB_GMP_LIB_MINOR"; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($COB_GMP_HEADER)" >&5
- $as_echo "yes ($COB_GMP_HEADER)" >&6; }
- else
-@@ -16933,7 +16933,7 @@ $as_echo "no ($COB_BDB_HEADER)" >&6; }
- 	cob_got_db=no
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Berkeley DB library with version $COB_BDB_HEADER" >&5
- $as_echo_n "checking for Berkeley DB library with version $COB_BDB_HEADER... " >&6; }
--	for cobdb in db db-$COB_BDB_HEADER
-+	for cobdb in db db$COB_BDB_HEADER_MAJOR-$COB_BDB_HEADER
- 	do
- 		LIBS="$MYOLDLIBS -l$cobdb"
- 		if test "$cross_compiling" = yes; then :
-@@ -17658,7 +17658,7 @@ fi
- unset enable_cflags_setting
- 
- if test "$enable_debug" != "yes" -a "x$CFLAGS" != "x"; then
--	CFLAGS=`echo "$CFLAGS" | sed -e 's/-g//' -e 's/-g3//' -e 's/^ //' -e 's/ $//'`
-+	: CFLAGS=`echo "$CFLAGS" | sed -e 's/-g//' -e 's/-g3//' -e 's/^ //' -e 's/ $//'`
- fi
- 
- # Include CFLAGS in COB_CFLAGS without optimization/debug options