svn commit: r378490 - head/science/metaf2xml

[Pawel Pekala]

Author: pawel
Date: Thu Feb  5 20:24:22 2015
New Revision: 378490
URL: https://svnweb.freebsd.org/changeset/ports/378490
QAT: https://qat.redports.org/buildarchive/r378490/

Log:
  - Update to version 1.56
  - Use PLIST_SUB for version substitution
  - Fix plist when APACHE=on
  
  PR:		196731
  Submitted by:	metaf2xml at users.sourceforge.net

Modified:
  head/science/metaf2xml/Makefile
  head/science/metaf2xml/distinfo
  head/science/metaf2xml/pkg-plist

Modified: head/science/metaf2xml/Makefile
==============================================================================
--- head/science/metaf2xml/Makefile	Thu Feb  5 20:13:39 2015	(r378489)
+++ head/science/metaf2xml/Makefile	Thu Feb  5 20:24:22 2015	(r378490)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	metaf2xml
-PORTVERSION=	1.55
-PORTREVISION=	2
+PORTVERSION=	1.56
 CATEGORIES=	science perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
@@ -14,17 +13,20 @@ OPTIONS_DEFINE=	APACHE DOCS
 OPTIONS_SUB=	yes
 APACHE_DESC=	Install Apache config file for metaf2xml (depends on Apache)
 
-MAKE_ARGS=	CGI_BIN_DIR=${PREFIX}/www/metaf2xml/cgi-bin \
-		HTDOCS_DIR=${PREFIX}/www/metaf2xml/htdocs \
+MAKE_ARGS=	CGI_BIN_DIR=${WWWDIR}/cgi-bin \
+		HTDOCS_DIR=${WWWDIR}/htdocs \
 		METAF2XML=${PREFIX} \
 		METAF2XML_LIB=${PREFIX}/${SITE_PERL_REL} \
 		METAF2XML_DOC=${DOCSDIR} \
-		METAF2XML_XSL=${DATADIR}
+		METAF2XML_XSL=${DATADIR} \
+		BUILD_ROOT=${STAGEDIR}
 NO_BUILD=	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.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
@@ -32,11 +34,4 @@ USE_APACHE_RUN=	22+
 MAKE_ARGS+=	CONF_DIR=${PREFIX}/${APACHEETCDIR}/Includes
 .endif
 
-pre-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/www/metaf2xml/cgi-bin \
-		${STAGEDIR}${PREFIX}/www/metaf2xml/htdocs
-
-do-install:
-	cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} install-all
-
 .include <bsd.port.mk>

Modified: head/science/metaf2xml/distinfo
==============================================================================
--- head/science/metaf2xml/distinfo	Thu Feb  5 20:13:39 2015	(r378489)
+++ head/science/metaf2xml/distinfo	Thu Feb  5 20:24:22 2015	(r378490)
@@ -1,2 +1,2 @@
-SHA256 (metaf2xml-1.55.tgz) = 2b89a7c1a61694e81681228263596b1ca0d27c7fdce5077be0553b9524bfc683
-SIZE (metaf2xml-1.55.tgz) = 338340
+SHA256 (metaf2xml-1.56.tgz) = 27726f402c15eb24b61226716d27816f8d10a66a3348d54e936c82858a138c9e
+SIZE (metaf2xml-1.56.tgz) = 346253

Modified: head/science/metaf2xml/pkg-plist
==============================================================================
--- head/science/metaf2xml/pkg-plist	Thu Feb  5 20:13:39 2015	(r378489)
+++ head/science/metaf2xml/pkg-plist	Thu Feb  5 20:24:22 2015	(r378490)
@@ -1,13 +1,15 @@
 bin/metaf.pl
 bin/metaf2xml.pl
 bin/metafsrc2raw.pl
-%%APACHE%%%%APACHEETCDIR%%/Includes/metaf2xml-1.55-apache.conf
-etc/metaf2xml-1.55-apache.conf
+%%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