Index: head/science/metaf2xml/Makefile
===================================================================
--- head/science/metaf2xml/Makefile	(revision 422647)
+++ head/science/metaf2xml/Makefile	(revision 422648)
@@ -1,40 +1,50 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	metaf2xml
-PORTVERSION=	1.58
+PORTVERSION=	2.0
 CATEGORIES=	science perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parse and Decode METAR, TAF, SYNOP, BUOY and AMDAR and Write as XML
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 OPTIONS_DEFINE=	APACHE DOCS
 OPTIONS_SUB=	yes
 APACHE_DESC=	Install Apache config file for metaf2xml (depends on Apache)
 
 MAKE_ARGS=	CGI_BIN_DIR=${WWWDIR}/cgi-bin \
+		CGI_DATA_DIR=/var/tmp \
+		CGI_LOG_DIR=/var/tmp \
 		HTDOCS_DIR=${WWWDIR}/htdocs \
 		METAF2XML=${PREFIX} \
 		METAF2XML_LIB=${PREFIX}/${SITE_PERL_REL} \
 		METAF2XML_DOC=${DOCSDIR} \
+		METAF2XML_MAN=${PREFIX}/man \
 		METAF2XML_XSL=${DATADIR} \
 		BUILD_ROOT=${STAGEDIR}
 NO_BUILD=	yes
+NO_ARCH=	yes
 USES=		perl5 shebangfix tar:tgz
 USE_PERL5=	install run
 SHEBANG_FILES=	metaf.pl metaf2xml.pl metafsrc2raw.pl
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_VER} >= 5.22
+RUN_DEPENDS+=	p5-CGI>0:www/p5-CGI
+.endif
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE_RUN=	22+
 MAKE_ARGS+=	CONF_DIR=${PREFIX}/${APACHEETCDIR}/Includes
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/science/metaf2xml/distinfo
===================================================================
--- head/science/metaf2xml/distinfo	(revision 422647)
+++ head/science/metaf2xml/distinfo	(revision 422648)
@@ -1,2 +1,3 @@
-SHA256 (metaf2xml-1.58.tgz) = 87a906e7f81a0eead7f85cb6674c498b3e8b7ea1133a2c07b952d1915db2a4df
-SIZE (metaf2xml-1.58.tgz) = 361267
+TIMESTAMP = 1474612314
+SHA256 (metaf2xml-2.0.tgz) = 9fbb25644f168327c91fb5a867f34926234b39144ab741311d66b804757157ce
+SIZE (metaf2xml-2.0.tgz) = 371661
Index: head/science/metaf2xml/pkg-descr
===================================================================
--- head/science/metaf2xml/pkg-descr	(revision 422647)
+++ head/science/metaf2xml/pkg-descr	(revision 422648)
@@ -1,13 +1,13 @@
-metaf2xml can download, parse and decode aviation routine weather
-reports (METAR, SPECI, SAO), aerodrome forecasts (TAF), synoptic
-observations (SYNOP), observations from buoys (BUOY) and
-meteorological reports from aircrafts (AMDAR). The extracted data can
-be written as XML or passed to a user-defined function (all done in
-Perl).
+metaf2xml can download, parse and decode aviation routine weather reports
+(METAR, SPECI, SAO), aerodrome forecasts (TAF), synoptic observations
+(SYNOP), observations from buoys (BUOY) and meteorological reports from
+aircrafts (AMDAR). Data can also be taken from decoded BUFR messages.
+The extracted data can be written as XML or passed to a user-defined
+function (all done in Perl).
 
-It also provides XSLT style sheets to convert the XML to plain
-language (text, HTML), or XML with different schemas. A web-based
-(CGI) user interface can be used to download and display up-to-date
-weather data from NOAA, Ogimet, and other sources.
+It also provides XSLT style sheets to convert the XML to plain language
+(text, HTML), or XML with different schemas. A web-based (CGI) user
+interface can be used to download and display up-to-date weather data from
+NOAA, Ogimet, and other sources.
 
 WWW: http://metaf2xml.sourceforge.net/
Index: head/science/metaf2xml/pkg-plist
===================================================================
--- head/science/metaf2xml/pkg-plist	(revision 422647)
+++ head/science/metaf2xml/pkg-plist	(revision 422648)
@@ -1,53 +1,48 @@
 bin/metaf.pl
 bin/metaf2xml.pl
 bin/metafsrc2raw.pl
 %%APACHE%%%%APACHEETCDIR%%/Includes/metaf2xml-%%VERSION%%-apache.conf
 %%NO_APACHE%%etc/metaf2xml-%%VERSION%%-apache.conf
 %%SITE_PERL%%/metaf2xml/bufr.pm
 %%SITE_PERL%%/metaf2xml/parser.pm
 %%SITE_PERL%%/metaf2xml/src2raw.pm
 man/man1/metaf.1.gz
 man/man1/metaf2xml.1.gz
 man/man1/metafsrc2raw.1.gz
 man/man3/metaf2xml::bufr.3pm.gz
 man/man3/metaf2xml::parser.3pm.gz
 man/man3/metaf2xml::src2raw.3pm.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%DATADIR%%/metaf-fullhtml.xsl
 %%DATADIR%%/metaf-html.xsl
 %%DATADIR%%/metaf-lang-de.xml
 %%DATADIR%%/metaf-lang-en.xml
 %%DATADIR%%/metaf-lang-es.xml
-%%DATADIR%%/metaf-lang-pl.xml
-%%DATADIR%%/metaf-lang-pt-br.xml
 %%DATADIR%%/metaf-lang-ru.xml
 %%DATADIR%%/metaf-lang.xml
 %%DATADIR%%/metaf-sum-html.xsl
 %%DATADIR%%/metaf-sum-text.xsl
 %%DATADIR%%/metaf-sum-ui.xsl
 %%DATADIR%%/metaf-sum.xsl
 %%DATADIR%%/metaf-text.xsl
 %%DATADIR%%/metaf-ui.xsl
 %%DATADIR%%/metaf.dtd
 %%DATADIR%%/metaf.xsl
 %%DATADIR%%/stations.xml
 %%WWWDIR%%/cgi-bin/metaf.pl
 %%WWWDIR%%/htdocs/metaf-fullhtml.xsl
 %%WWWDIR%%/htdocs/metaf-html.xsl
 %%WWWDIR%%/htdocs/metaf-lang-de.xml
 %%WWWDIR%%/htdocs/metaf-lang-en.xml
 %%WWWDIR%%/htdocs/metaf-lang-es.xml
-%%WWWDIR%%/htdocs/metaf-lang-pl.xml
-%%WWWDIR%%/htdocs/metaf-lang-pt-br.xml
 %%WWWDIR%%/htdocs/metaf-lang-ru.xml
 %%WWWDIR%%/htdocs/metaf-lang.xml
 %%WWWDIR%%/htdocs/metaf-sum-html.xsl
 %%WWWDIR%%/htdocs/metaf-sum-ui.xsl
 %%WWWDIR%%/htdocs/metaf-sum.xsl
 %%WWWDIR%%/htdocs/metaf-ui.xsl
 %%WWWDIR%%/htdocs/metaf.xsl
 %%WWWDIR%%/htdocs/metaf2xml.css
 %%WWWDIR%%/htdocs/stations.xml