From owner-svn-ports-all@freebsd.org Mon Dec 21 20:27:12 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 41A1D4C39FC; Mon, 21 Dec 2020 20:27:12 +0000 (UTC) (envelope-from xride@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D09xX1KKJz4WBs; Mon, 21 Dec 2020 20:27:12 +0000 (UTC) (envelope-from xride@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1BB3D27375; Mon, 21 Dec 2020 20:27:12 +0000 (UTC) (envelope-from xride@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BLKRBiu017177; Mon, 21 Dec 2020 20:27:11 GMT (envelope-from xride@FreeBSD.org) Received: (from xride@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BLKRBPX017169; Mon, 21 Dec 2020 20:27:11 GMT (envelope-from xride@FreeBSD.org) Message-Id: <202012212027.0BLKRBPX017169@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: xride set sender to xride@FreeBSD.org using -f From: Soeren Straarup Date: Mon, 21 Dec 2020 20:27:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558858 - in head/astro/wmspaceweather: . files X-SVN-Group: ports-head X-SVN-Commit-Author: xride X-SVN-Commit-Paths: in head/astro/wmspaceweather: . files X-SVN-Commit-Revision: 558858 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2020 20:27:12 -0000 Author: xride Date: Mon Dec 21 20:27:10 2020 New Revision: 558858 URL: https://svnweb.freebsd.org/changeset/ports/558858 Log: Fix build error. Update URL's used to fetch runtime data from. Reported by: pkg-fallout@FreeBSD.ORG Added: head/astro/wmspaceweather/files/patch-wmgeneral.c (contents, props changed) head/astro/wmspaceweather/files/patch-wmgeneral.h (contents, props changed) Modified: head/astro/wmspaceweather/Makefile head/astro/wmspaceweather/files/patch-GetKp head/astro/wmspaceweather/files/patch-wmSpaceWeather.c Modified: head/astro/wmspaceweather/Makefile ============================================================================== --- head/astro/wmspaceweather/Makefile Mon Dec 21 20:11:54 2020 (r558857) +++ head/astro/wmspaceweather/Makefile Mon Dec 21 20:27:10 2020 (r558858) @@ -16,9 +16,10 @@ LICENSE= GPLv2 RUN_DEPENDS= p5-Time-modules>=0:devel/p5-Time-modules +USES= shebangfix xorg + WRKSRC= ${WRKDIR}/${DISTNAME}/wmSpaceWeather -USES= shebangfix xorg SHEBANG_FILES= GetKp USE_XORG= x11 xext xpm ALL_TARGET= clean all Modified: head/astro/wmspaceweather/files/patch-GetKp ============================================================================== --- head/astro/wmspaceweather/files/patch-GetKp Mon Dec 21 20:11:54 2020 (r558857) +++ head/astro/wmspaceweather/files/patch-GetKp Mon Dec 21 20:27:10 2020 (r558858) @@ -1,6 +1,6 @@ ---- GetKp.orig 1999-02-12 05:42:01 UTC +--- GetKp.orig 2020-12-21 20:19:53 UTC +++ GetKp -@@ -5,7 +5,7 @@ +@@ -5,21 +5,21 @@ # @@ -9,21 +9,46 @@ ($Year, $Month, $Day) = &year_month_day(); -@@ -19,7 +19,7 @@ + +- if (-e "/tmp/DGD.txt"){ +- unlink("/tmp/DGD.txt"); ++ if (-e "/tmp/daily-geomagnetic-indices.txt"){ ++ unlink("/tmp/daily-geomagnetic-indices.txt"); } +- if (-e "/tmp/curind.txt"){ +- unlink("/tmp/curind.txt"); ++ if (-e "/tmp/current-space-weather-indices.txt"){ ++ unlink("/tmp/current-space-weather-indices.txt"); + } + - $grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/indices/DGD.txt"; -+ $grabcmd = "cd /tmp; fetch -q ftp://ftp.sec.noaa.gov/pub/indices/DGD.txt"; ++ $grabcmd = "cd /tmp; fetch -q https://services.swpc.noaa.gov/text/daily-geomagnetic-indices.txt"; system "$grabcmd"; -@@ -68,7 +68,7 @@ +@@ -37,7 +37,7 @@ + $Kp{190001018} = 999; + + +- open(TmpFile, "/tmp/DGD.txt"); ++ open(TmpFile, "/tmp/daily-geomagnetic-indices.txt"); + while (){ + chop; + if ($_ =~ /^\d{4} \d{2} \d{2}\s*\d*/ ){ +@@ -68,12 +68,12 @@ # # Add in very latest stuff # - $grabcmd = "cd /tmp; wget --passive-ftp --tries 2 -q ftp://www.sec.noaa.gov/pub/latest/curind.txt"; -+ $grabcmd = "cd /tmp; fetch -q ftp://ftp.sec.noaa.gov/pub/latest/curind.txt"; ++ $grabcmd = "cd /tmp; fetch -q https://services.swpc.noaa.gov/text/current-space-weather-indices.txt"; system "$grabcmd"; %lmonstr = ( "Jan", 1, "Feb", 2, "Mar", 3, "Apr", 4, "May", 5, "Jun", 6, "Jul", 7, "Aug", 8, "Sep", 9, "Oct", 10, "Nov", 11, "Dec", 12); + @lval = ($lyear, $lmonstr{$lmon}, $ldom); +- open(TmpFile, "/tmp/curind.txt"); ++ open(TmpFile, "/tmp/current-space-weather-indices.txt"); + while (){ + chop; + if ($_ =~ /^:Geomagnetic_Values: (\d{4}) (.*) (\d{1,2})/){ Modified: head/astro/wmspaceweather/files/patch-wmSpaceWeather.c ============================================================================== --- head/astro/wmspaceweather/files/patch-wmSpaceWeather.c Mon Dec 21 20:11:54 2020 (r558857) +++ head/astro/wmspaceweather/files/patch-wmSpaceWeather.c Mon Dec 21 20:27:10 2020 (r558858) @@ -9,7 +9,7 @@ int height, UpToDate, LEDOn; double UT, TU, TU2, TU3, T0, gmst, hour24(); -@@ -126,6 +126,7 @@ int Kp[8] = { -1, -1, -1, -1, -1, -1, +@@ -126,6 +126,7 @@ int Kp[8] = { -1, -1, -1, -1, -1, -1, -1, -1 }; double E1, E2, P1, P2, P3; char Xray[10], digit[2]; FILE *fp; @@ -67,7 +67,7 @@ if (!UpToDate){ -@@ -560,7 +561,7 @@ void ParseCMDLine(int argc, char *argv[] +@@ -560,7 +561,7 @@ void ParseCMDLine(int argc, char *argv[]) { } else if ((!strcmp(argv[i], "-url"))||(!strcmp(argv[i], "-u"))){ Added: head/astro/wmspaceweather/files/patch-wmgeneral.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/wmspaceweather/files/patch-wmgeneral.c Mon Dec 21 20:27:10 2020 (r558858) @@ -0,0 +1,10 @@ +--- ../wmgeneral/wmgeneral.c.orig 2020-12-21 11:20:47.205960000 -0600 ++++ ../wmgeneral/wmgeneral.c 2020-12-21 11:21:15.735441000 -0600 +@@ -51,6 +51,7 @@ + XpmIcon wmgen; + Pixmap pixmask; + ++Display *display; + /*****************/ + /* Mouse Regions */ + /*****************/ Added: head/astro/wmspaceweather/files/patch-wmgeneral.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/astro/wmspaceweather/files/patch-wmgeneral.h Mon Dec 21 20:27:10 2020 (r558858) @@ -0,0 +1,11 @@ +--- ../wmgeneral/wmgeneral.h.orig 2020-12-21 11:21:23.324171000 -0600 ++++ ../wmgeneral/wmgeneral.h 2020-12-21 11:21:41.194688000 -0600 +@@ -28,7 +28,7 @@ + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */