Page MenuHomeFreeBSD
Files F151197030

D11313.id30059.diff
No OneTemporary
Actions

D11313.id30059.diff
View Options

Index: head/science/metaf2xml/Makefile
===================================================================
--- head/science/metaf2xml/Makefile
+++ head/science/metaf2xml/Makefile
@@ -2,15 +2,14 @@
# $FreeBSD$
PORTNAME= metaf2xml
-PORTVERSION= 2.0
+PORTVERSION= 2.2
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
+LICENSE= GPLv2+
RUN_DEPENDS= p5-CGI>0:www/p5-CGI
@@ -27,7 +26,8 @@
METAF2XML_DOC=${DOCSDIR} \
METAF2XML_MAN=${PREFIX}/man \
METAF2XML_XSL=${DATADIR} \
- BUILD_ROOT=${STAGEDIR}
+ BUILD_ROOT=${STAGEDIR} \
+ PERL=${LOCALBASE}/bin/perl
NO_BUILD= yes
NO_ARCH= yes
USES= perl5 shebangfix tar:tgz
@@ -38,5 +38,10 @@
APACHE_MAKE_ARGS= CONF_DIR=${PREFIX}/${APACHEETCDIR}/Includes
APACHE_USE= APACHE_RUN=22+
+
+post-patch:
+ ${REINPLACE_CMD} 's|%%METAF2XML_XSL%%|../../${DATADIR_REL}| ; \
+ s|%%METAF2XML_BIN%%|../${WWWDIR_REL}/cgi-bin|' \
+ ${WRKSRC}/install.pl
.include <bsd.port.mk>
Index: head/science/metaf2xml/distinfo
===================================================================
--- head/science/metaf2xml/distinfo
+++ head/science/metaf2xml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474612314
-SHA256 (metaf2xml-2.0.tgz) = 9fbb25644f168327c91fb5a867f34926234b39144ab741311d66b804757157ce
-SIZE (metaf2xml-2.0.tgz) = 371661
+TIMESTAMP = 1497707637
+SHA256 (metaf2xml-2.2.tgz) = 52a48ff8bbc80cdd62c9b169d555a0af4510048310f9ca30499a261ead17f30e
+SIZE (metaf2xml-2.2.tgz) = 375726
Index: head/science/metaf2xml/files/patch-install.pl
===================================================================
--- head/science/metaf2xml/files/patch-install.pl
+++ head/science/metaf2xml/files/patch-install.pl
@@ -0,0 +1,20 @@
+--- install.pl.orig 2017-06-23 13:29:20 UTC
++++ install.pl
+@@ -658,7 +658,7 @@ if ($cmd eq 'all' || $cmd eq 'cgi') {
+ if ($USE_CP) {
+ do_copy "$BUILD_ROOT$METAF2XML_XSL/$_", "$BUILD_ROOT$HTDOCS_DIR/";
+ } else {
+- $symlink->("$METAF2XML_XSL/$_", "$BUILD_ROOT$HTDOCS_DIR/$_")
++ $symlink->("%%METAF2XML_XSL%%/$_", "$BUILD_ROOT$HTDOCS_DIR/$_")
+ or usage "ERROR: symlink '$BUILD_ROOT$HTDOCS_DIR/$_': $!\n";
+ }
+ }
+@@ -667,7 +667,7 @@ if ($cmd eq 'all' || $cmd eq 'cgi') {
+ if ($USE_CP) {
+ do_copy "$BUILD_ROOT$METAF2XML_BIN/metaf.pl","$BUILD_ROOT$CGI_BIN_DIR/";
+ } else {
+- $symlink->("$METAF2XML_BIN/metaf.pl","$BUILD_ROOT$CGI_BIN_DIR/metaf.pl")
++ $symlink->("%%METAF2XML_BIN%%/metaf.pl","$BUILD_ROOT$CGI_BIN_DIR/metaf.pl")
+ or usage "ERROR: symlink '$BUILD_ROOT$CGI_BIN_DIR/metaf.pl': $!\n";
+ }
+

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 6:36 PM (6 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31045630
Default Alt Text
D11313.id30059.diff (2 KB)

Event Timeline