Index: head/lang/gnu-cobol/Makefile
===================================================================
--- head/lang/gnu-cobol/Makefile	(revision 457214)
+++ head/lang/gnu-cobol/Makefile	(revision 457215)
@@ -1,35 +1,40 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	gnu-cobol
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	2.2
 CATEGORIES=	lang
 MASTER_SITES=	GNU/gnucobol
+DISTNAME=	gnucobol-${PORTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Open-source COBOL compiler
 
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	multi
+
 LIB_DEPENDS=	libgmp.so:math/gmp
 
-USES=		bdb gmake libtool ncurses
+USES=		bdb gmake libtool ncurses tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-INFO=		gnu-cobol
+INFO=		gnucobol
+DATADIR=	${PREFIX}/share/gnucobol
 
+INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
 CONFIGURE_ENABLE=nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|__gmp_randinit|__gmpz_init|g ; \
 		 s|db-4.[0-9]|${BDB_LIB_NAME}|g ; \
 		 s|-lcurses|-lncurses|g ; \
 		 s|-R$$found_dir|-Wl,-rpath,$$found_dir|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/lang/gnu-cobol/distinfo
===================================================================
--- head/lang/gnu-cobol/distinfo	(revision 457214)
+++ head/lang/gnu-cobol/distinfo	(revision 457215)
@@ -1,2 +1,3 @@
-SHA256 (gnu-cobol-1.1.tar.gz) = bd319c0d001e85835c8501ad74c9de0052fe82b8a38b4530f41b49b2af028b9d
-SIZE (gnu-cobol-1.1.tar.gz) = 1093343
+TIMESTAMP = 1513844573
+SHA256 (gnucobol-2.2.tar.xz) = dc18fc45c269debfe86a4bbe20a7250983cba6238ea1917e135df5926cd024a0
+SIZE (gnucobol-2.2.tar.xz) = 1604648
Index: head/lang/gnu-cobol/pkg-plist
===================================================================
--- head/lang/gnu-cobol/pkg-plist	(revision 457214)
+++ head/lang/gnu-cobol/pkg-plist	(revision 457215)
@@ -1,24 +1,54 @@
 bin/cob-config
 bin/cobc
 bin/cobcrun
 include/libcob.h
-include/libcob/codegen.h
+include/libcob/cobgetopt.h
 include/libcob/common.h
 include/libcob/exception.def
-include/libcob/system.def
-lib/gnu-cobol/CBL_OC_DUMP.so
+lib/gnucobol/CBL_OC_DUMP.so
 lib/libcob.a
 lib/libcob.so
-lib/libcob.so.1
-lib/libcob.so.1.0.0
+lib/libcob.so.4
+lib/libcob.so.4.0.0
+man/man1/cobc.1.gz
+man/man1/cobcrun.1.gz
+%%DATADIR%%/config/acu-strict.conf
+%%DATADIR%%/config/acu.conf
+%%DATADIR%%/config/acu.words
+%%DATADIR%%/config/bs2000-strict.conf
 %%DATADIR%%/config/bs2000.conf
+%%DATADIR%%/config/bs2000.words
 %%DATADIR%%/config/cobol2002.conf
+%%DATADIR%%/config/cobol2002.words
+%%DATADIR%%/config/cobol2014.conf
+%%DATADIR%%/config/cobol2014.words
 %%DATADIR%%/config/cobol85.conf
+%%DATADIR%%/config/cobol85.words
 %%DATADIR%%/config/default.conf
+%%DATADIR%%/config/ibm-strict.conf
 %%DATADIR%%/config/ibm.conf
+%%DATADIR%%/config/ibm.words
+%%DATADIR%%/config/lax.conf-inc
+%%DATADIR%%/config/mf-strict.conf
 %%DATADIR%%/config/mf.conf
+%%DATADIR%%/config/mf.words
+%%DATADIR%%/config/mvs-strict.conf
 %%DATADIR%%/config/mvs.conf
+%%DATADIR%%/config/mvs.words
+%%DATADIR%%/config/rm-strict.conf
+%%DATADIR%%/config/rm.conf
+%%DATADIR%%/config/rm.words
+%%DATADIR%%/config/runtime.cfg
+%%DATADIR%%/config/runtime_empty.cfg
+%%DATADIR%%/config/xopen.conf
 %%DATADIR%%/copy/screenio.cpy
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnu-cobol.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/gnu-cobol.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/gnu-cobol.mo
+%%DATADIR%%/copy/sqlca.cpy
+%%DATADIR%%/copy/sqlda.cpy
+%%NLS%%share/locale/de/LC_MESSAGES/gnucobol.mo
+%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnucobol.mo
+%%NLS%%share/locale/en@quot/LC_MESSAGES/gnucobol.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gnucobol.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gnucobol.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gnucobol.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gnucobol.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/gnucobol.mo