Index: head/comms/splat/Makefile =================================================================== --- head/comms/splat/Makefile (revision 459369) +++ head/comms/splat/Makefile (revision 459370) @@ -1,121 +1,121 @@ # $FreeBSD$ PORTNAME= splat -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.2 CATEGORIES= comms hamradio -MASTER_SITES= SUNSITE/apps/ham - +MASTER_SITES= http://www.qsl.net/kd2bd/ +#http://www.qsl.net/kd2bd/splat-1.4.2.tar.bz2 MAINTAINER= hamradio@FreeBSD.org COMMENT= Used in calculating path losses, useful to ham radio and others LICENSE= GPLv2 USES= tar:bzip2 PORTDOCS= README README2 CHANGES OPTIONS_SINGLE= SRM OPTIONS_RADIO= HRM OPTIONS_SINGLE_SRM= SRM_2X2 SRM_3X3 SRM_4X4 SRM_5X5 SRM_6X6 SRM_7X7 SRM_8X8 OPTIONS_RADIO_HRM= HRM_1X1 HRM_2X2 HRM_3X3 HRM_4X4 HRM_5X5 HRM_6X6 OPTIONS_DEFAULT= SRM_4X4 SRM_2X2_DESC= 2 x 2 degrees SRM_3X3_DESC= 3 x 3 degrees SRM_4X4_DESC= 4 x 4 degrees SRM_5X5_DESC= 5 x 5 degrees SRM_6X6_DESC= 6 X 6 degrees SRM_7X7_DESC= 7 x 7 degrees SRM_8X8_DESC= 8 x 8 degrees HRM_DESC= Optionally build High Resolution splat-hd HRM_1X1_DESC= 1 x 1 degrees HRM_2X2_DESC= 2 x 2 degrees HRM_3X3_DESC= 3 x 3 degrees HRM_4X4_DESC= 4 x 4 degrees HRM_5X5_DESC= 5 x 5 degrees HRM_6X6_DESC= 6 X 6 degrees .include .if ${PORT_OPTIONS:MHRM} PLIST_FILES+= bin/splat-hd .endif do-build: @${ECHO_CMD} "#define HD_MODE 0" > ${WRKSRC}/splat.h .if ${PORT_OPTIONS:MSRM_2X2} @${ECHO_CMD} "#define MAXPAGES 4" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MSRM_3X3} @${ECHO_CMD} "#define MAXPAGES 9" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MSRM_4X4} @${ECHO_CMD} "#define MAXPAGES 16" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MSRM_5X5} @${ECHO_CMD} "#define MAXPAGES 25" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MSRM_6X6} @${ECHO_CMD} "#define MAXPAGES 36" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MSRM_7X7} @${ECHO_CMD} "#define MAXPAGES 49" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MSRM_8X8} @${ECHO_CMD} "#define MAXPAGES 64" >> ${WRKSRC}/splat.h .endif .if defined(PACKAGE_BUILDING) || defined(BATCH) @${ECHO_CMD} "#define HD_MODE 0" > ${WRKSRC}/splat.h @${ECHO_CMD} "#define MAXPAGES 16" >> ${WRKSRC}/splat.h .endif cd ${WRKSRC} && \ ${CXX} ${CXXFLAGS} -lm -lbz2 -o splat itwom3.0.cpp splat.cpp .if ${PORT_OPTIONS:MHRM} @${ECHO_CMD} "#define HD_MODE 1" > ${WRKSRC}/splat.h .if ${PORT_OPTIONS:MHRM_1X1} @${ECHO_CMD} "#define MAXPAGES 1" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MHRM_2X2} @${ECHO_CMD} "#define MAXPAGES 4" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MHRM_3X3} @${ECHO_CMD} "#define MAXPAGES 9" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MHRM_4X4} @${ECHO_CMD} "#define MAXPAGES 16" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MHRM_5X5} @${ECHO_CMD} "#define MAXPAGES 25" >> ${WRKSRC}/splat.h .endif .if ${PORT_OPTIONS:MHRM_6X6} @${ECHO_CMD} "#define MAXPAGES 36" >> ${WRKSRC}/splat.h .endif cd ${WRKSRC} && \ ${CXX} ${CXXFLAGS} -fPIC -lm -lbz2 -o splat-hd itwom3.0.cpp splat.cpp .endif cd ${WRKSRC}/utils && \ ${CC} ${CFLAGS} -o citydecoder citydecoder.c && \ ${CC} ${CFLAGS} -o usgs2sdf usgs2sdf.c && \ ${CC} ${CFLAGS} -lbz2 -o srtm2sdf srtm2sdf.c && \ ${CC} ${CFLAGS} -lz -o fontdata fontdata.c && \ ${CC} ${CFLAGS} -lz -lm -o bearing bearing.c do-install: .for f in splat utils/citydecoder utils/usgs2sdf utils/srtm2sdf \ utils/fontdata utils/bearing @${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor .if ${PORT_OPTIONS:MHRM} @${INSTALL_PROGRAM} ${WRKSRC}/splat-hd ${STAGEDIR}${PREFIX}/bin .endif @${INSTALL_SCRIPT} ${WRKSRC}/utils/postdownload ${STAGEDIR}${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/docs/english/man/splat.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} . for f in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} . endfor @${LN} -s srtm2sdf ${STAGEDIR}${PREFIX}/bin/srtm2sdf-hd .include Index: head/comms/splat/distinfo =================================================================== --- head/comms/splat/distinfo (revision 459369) +++ head/comms/splat/distinfo (revision 459370) @@ -1,2 +1,3 @@ -SHA256 (splat-1.4.0.tar.bz2) = f081951c68577234668ac2a1e6eff86e60e57e17c470d765900e9d1461058678 -SIZE (splat-1.4.0.tar.bz2) = 357433 +TIMESTAMP = 1516294940 +SHA256 (splat-1.4.2.tar.bz2) = 39b0b314e2e927bdf00d1eda4b9865efd128ba850305f987aec049c4fd58a29c +SIZE (splat-1.4.2.tar.bz2) = 356823 Property changes on: head/comms/splat/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property Index: head/comms/splat/files/patch-utils_fontdata.c =================================================================== --- head/comms/splat/files/patch-utils_fontdata.c (revision 459369) +++ head/comms/splat/files/patch-utils_fontdata.c (nonexistent) @@ -1,12 +0,0 @@ ---- utils/fontdata.c.orig 2012-11-05 15:44:52.000000000 -0500 -+++ utils/fontdata.c 2012-11-05 15:42:54.000000000 -0500 -@@ -39,7 +39,8 @@ - { - int x; - unsigned char line, input; -- FILE *infile, *outfile; -+ gzFile infile; -+ FILE *outfile; - - if (argc==2) - infile=gzopen(argv[1],"rb"); Property changes on: head/comms/splat/files/patch-utils_fontdata.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/splat/files/patch-splat.cpp =================================================================== --- head/comms/splat/files/patch-splat.cpp (nonexistent) +++ head/comms/splat/files/patch-splat.cpp (revision 459370) @@ -0,0 +1,20 @@ +--- splat.cpp.orig 2018-01-18 17:04:01 UTC ++++ splat.cpp +@@ -567,7 +567,7 @@ double ElevationAngle(struct site source, struct site + (downtilt), as referenced to a normal to the center of + the earth. */ + +- register double a, b, dx; ++ double a, b, dx; + + a=GetElevation(destination)+destination.alt+earthradius; + b=GetElevation(source)+source.alt+earthradius; +@@ -2727,7 +2727,7 @@ void PlotPath(struct site source, struct site destinat + + char block; + int x, y; +- register double cos_xmtr_angle, cos_test_angle, test_alt; ++ double cos_xmtr_angle, cos_test_angle, test_alt; + double distance, rx_alt, tx_alt; + + ReadPath(source,destination); Property changes on: head/comms/splat/files/patch-splat.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/splat/files/patch-utils_postdownload =================================================================== --- head/comms/splat/files/patch-utils_postdownload (revision 459369) +++ head/comms/splat/files/patch-utils_postdownload (revision 459370) @@ -1,8 +1,8 @@ ---- utils/postdownload.orig 2012-11-03 03:56:52.000000000 -0500 -+++ utils/postdownload 2012-11-03 03:57:09.000000000 -0500 +--- utils/postdownload.orig 2009-03-01 17:37:04 UTC ++++ utils/postdownload @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Simple script for processing of downloaded undelimited gzipped # USGS DEM files, and converting them to SPLAT Data Files. Property changes on: head/comms/splat/files/patch-utils_postdownload ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -yes \ No newline at end of property +1 \ No newline at end of property