diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | PKGBUILD | 24 | ||||
| -rw-r--r-- | xtide-2.14-aur.patch | 103 | ||||
| -rw-r--r-- | xtide.conf | 2 |
4 files changed, 17 insertions, 127 deletions
@@ -1,6 +1,6 @@ pkgbase = xtide pkgdesc = Harmonic tide clock and tide predictor - pkgver = 2.14 + pkgver = 2.15.5 pkgrel = 1 url = http://www.flaterco.com/xtide/xtide.html arch = i686 @@ -12,16 +12,13 @@ pkgbase = xtide optdepends = gpsd: for automatic location finding optdepends = xtide-wvs: for hi-res vector coastlines backup = etc/xtide/xtide.conf - source = ftp://ftp.flaterco.com/xtide/harmonics-dwf-20141224-free.tar.bz2 - source = ftp://ftp.flaterco.com/xtide/xtide-2.14.tar.bz2 - source = xtide-2.14-aur.patch + source = https://flaterco.com/files/xtide/harmonics-dwf-20220109-free.tar.xz + source = https://flaterco.com/files/xtide/xtide-2.15.5.tar.xz source = xtide.conf source = xtide.desktop - md5sums = 27adcccb2824ac45b072636b1ee1cdd5 - md5sums = 0f50833e6f686eca16dcb33c1719cf6c - md5sums = 6b95a3602898b45bb0079740e4859660 - md5sums = 24c362cc119e413408318bd1eea04846 + md5sums = 095eaf7f8a62fba55b91455182974154 + md5sums = 48b6993d4a04a15d2d7be355b6e0e739 + md5sums = 4de09c336aa0e41980c1925d06201e5c md5sums = eb5ebe8432103880ff3331f3236b3e74 pkgname = xtide - @@ -1,6 +1,7 @@ -# Maintainer: Beej Jorgensen <beej@beej.us> +# Maintainer: dodoradio <dodoradio@outlook.com> +# Contributor: Beej Jorgensen <beej@beej.us> pkgname=xtide -pkgver=2.14 +pkgver=2.15.5 pkgrel=1 pkgdesc="Harmonic tide clock and tide predictor" arch=('i686' 'x86_64') @@ -12,24 +13,19 @@ optdepends=( 'xtide-wvs: for hi-res vector coastlines' ) backup=("etc/$pkgname/$pkgname.conf") -source=('ftp://ftp.flaterco.com/xtide/harmonics-dwf-20141224-free.tar.bz2' - "ftp://ftp.flaterco.com/xtide/$pkgname-$pkgver.tar.bz2" - "${pkgname}-$pkgver-aur.patch" +source=("https://flaterco.com/files/xtide/harmonics-dwf-20220109-free.tar.xz" + "https://flaterco.com/files/xtide/$pkgname-$pkgver.tar.xz" "${pkgname}.conf" "${pkgname}.desktop" ) -md5sums=('27adcccb2824ac45b072636b1ee1cdd5' - '0f50833e6f686eca16dcb33c1719cf6c' - '6b95a3602898b45bb0079740e4859660' - '24c362cc119e413408318bd1eea04846' +md5sums=('095eaf7f8a62fba55b91455182974154' + '48b6993d4a04a15d2d7be355b6e0e739' + '4de09c336aa0e41980c1925d06201e5c' 'eb5ebe8432103880ff3331f3236b3e74') prepare() { cd "$srcdir/$pkgname-$pkgver" - # patch to look for conf in /etc/xtide - patch -Np1 < ../$pkgname-$pkgver-aur.patch - ./configure --prefix=/usr --sbindir=/usr/bin } @@ -39,7 +35,7 @@ build() { } package() { - local hver=20141224 + local hver=20220109 local hdir=harmonics-dwf-${hver} local hfile=${hdir}-free.tcd @@ -47,7 +43,7 @@ package() { install -D -m0644 $srcdir/$hdir/$hfile "$pkgdir/usr/share/$pkgname/$hfile" # config file - install -D -m0644 $srcdir/${pkgname}.conf $pkgdir/etc/$pkgname/${pkgname}.conf + install -D -m0644 $srcdir/${pkgname}.conf $pkgdir/etc/${pkgname}.conf # desktop file install -D -m0644 $srcdir/${pkgname}.desktop $pkgdir/usr/share/applications/${pkgname}.desktop diff --git a/xtide-2.14-aur.patch b/xtide-2.14-aur.patch deleted file mode 100644 index 93e89868d776..000000000000 --- a/xtide-2.14-aur.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -Naur xtide-2.14/INSTALL xtide-2.14-aur/INSTALL ---- xtide-2.14/INSTALL 2014-11-02 16:35:56.000000000 -0800 -+++ xtide-2.14-aur/INSTALL 2015-07-28 21:40:03.615566071 -0700 -@@ -151,7 +151,7 @@ - If you are installing as root, then it is recommended that you add - this definition to a system-wide script such as /etc/profile if you - have one. -- 2. The other way is by creating the file /etc/xtide.conf. The -+ 2. The other way is by creating the file /etc/xtide/xtide.conf. The - environment variable, if set, takes precedence over the config - file. - If a configuration file is used, the first line should consist of -@@ -163,7 +163,7 @@ - - Either set the environment variable WVS_DIR to the name of that - directory or supply the directory name as the second line of the -- configuration file /etc/xtide.conf. -+ configuration file /etc/xtide/xtide.conf. - - III. Run the configure script - -diff -Naur xtide-2.14/libxtide/Global.cc xtide-2.14-aur/libxtide/Global.cc ---- xtide-2.14/libxtide/Global.cc 2014-10-11 12:38:53.000000000 -0700 -+++ xtide-2.14-aur/libxtide/Global.cc 2015-07-28 21:38:05.266652364 -0700 -@@ -221,7 +221,7 @@ - #ifdef UseLocalFiles - static const char confFile[] = "xtide.conf"; - #else -- static const char confFile[] = "/etc/xtide.conf"; -+ static const char confFile[] = "/etc/xtide/xtide.conf"; - #endif - static bool firstCall (true); - static SafeVector<Dstr> xtideConfLines (2U); -@@ -408,10 +408,10 @@ - break; - case Error::NO_HFILE_PATH: - text_out += "NO_HFILE_PATH\n\ --If /etc/xtide.conf is not provided, you must set the environment variable\n\ -+If /etc/xtide/xtide.conf is not provided, you must set the environment variable\n\ - HFILE_PATH to point to your harmonics files. Example:\n\ - export HFILE_PATH=/usr/local/share/xtide/harmonics.tcd\n\ --Please refer to the documentation for usage of /etc/xtide.conf."; -+Please refer to the documentation for usage of /etc/xtide/xtide.conf."; - break; - case Error::NO_HFILE_IN_PATH: - text_out += "NO_HFILE_IN_PATH\n\ -diff -Naur xtide-2.14/README xtide-2.14-aur/README ---- xtide-2.14/README 2014-11-02 16:35:56.000000000 -0800 -+++ xtide-2.14-aur/README 2015-07-28 21:40:33.693595803 -0700 -@@ -1112,7 +1112,7 @@ - If you are installing as root, then it is recommended that you add - this definition to a system-wide script such as /etc/profile if you - have one. -- 2. The other way is by creating the file /etc/xtide.conf. The -+ 2. The other way is by creating the file /etc/xtide/xtide.conf. The - environment variable, if set, takes precedence over the config - file. - If a configuration file is used, the first line should consist of -@@ -1124,7 +1124,7 @@ - - Either set the environment variable WVS_DIR to the name of that - directory or supply the directory name as the second line of the -- configuration file /etc/xtide.conf. -+ configuration file /etc/xtide/xtide.conf. - - III. Run the configure script - -diff -Naur xtide-2.14/tide.1 xtide-2.14-aur/tide.1 ---- xtide-2.14/tide.1 2014-06-20 18:45:48.000000000 -0700 -+++ xtide-2.14-aur/tide.1 2015-07-28 21:38:49.523753018 -0700 -@@ -65,7 +65,7 @@ - .BR http://www.flaterco.com/xtide/ . - .SH CONFIGURATION - Unless a configuration file --.B /etc/xtide.conf -+.B /etc/xtide/xtide.conf - is supplied, you must set the environment variable - .B HFILE_PATH - to point to the harmonics -diff -Naur xtide-2.14/xtide.1 xtide-2.14-aur/xtide.1 ---- xtide-2.14/xtide.1 2014-05-04 12:49:53.000000000 -0700 -+++ xtide-2.14-aur/xtide.1 2015-07-28 21:39:03.302850354 -0700 -@@ -71,7 +71,7 @@ - .BR http://www.flaterco.com/xtide/ . - .SH CONFIGURATION - Unless a configuration file --.B /etc/xtide.conf -+.B /etc/xtide/xtide.conf - is supplied, you must set the environment variable - .B HFILE_PATH - to point to the harmonics -diff -Naur xtide-2.14/xttpd.8 xtide-2.14-aur/xttpd.8 ---- xtide-2.14/xttpd.8 2014-06-20 18:45:48.000000000 -0700 -+++ xtide-2.14-aur/xttpd.8 2015-07-28 21:39:17.161942458 -0700 -@@ -92,7 +92,7 @@ - .BR http://www.flaterco.com/xtide/ . - .SH CONFIGURATION - Unless a configuration file --.B /etc/xtide.conf -+.B /etc/xtide/xtide.conf - is supplied, you must set the environment variable - .B HFILE_PATH - to point to the harmonics diff --git a/xtide.conf b/xtide.conf index 509c305f8c9b..ae6ee4e78824 100644 --- a/xtide.conf +++ b/xtide.conf @@ -1,2 +1,2 @@ -/usr/share/xtide/harmonics-dwf-20141224-free.tcd +/usr/share/xtide/harmonics-dwf-20220109-free.tcd /usr/share/xtide |