new sources

2 files changed, 14 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5663f2b93a39..b4eedb2769cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = xephem
 	pkgdesc = The Serious Interactive Astronomical Software Ephemeris
 	pkgver = 4.0.0
-	pkgrel = 3
-	url = http://www.clearskyinstitute.com/xephem/xephem.html
+	pkgrel = 4
+	url = https://github.com/XEphem/XEphem
 	arch = i686
 	arch = x86_64
 	license = custom:MIT
@@ -10,11 +10,9 @@ pkgbase = xephem
 	depends = openmotif
 	depends = perl
 	depends = openssl
-	source = http://www.clearskyinstitute.com/xephem/xephem-4.0.0.tgz
-	source = http://www.clearskyinstitute.com/xephem/contrib/xephem-3.7.7_openssl.patch
+	source = xephem-4.0.0.tar.gz::https://github.com/XEphem/XEphem/archive/4.0.0.tar.gz
 	source = licenseinfo.patch
-	sha256sums = abc90e795b7076be3b5c2247162e1c853265b2d81c3399767ab569a5653f6301
-	sha256sums = 64365b25ac142ebcc9dc286a14f7b3c37aeb44ffcdc629d776b183099259b3f4
+	sha256sums = c60d0920d9264ca177ceb1c2cb16c1a0349c4aed0db676d5469e0f9db862df1e
 	sha256sums = bb7bd33bbe3b1c87dfcebb752c85daef2821340952f1bfab16d49f2e9f107730
 
 pkgname = xephem
diff --git a/PKGBUILD b/PKGBUILD
index 4a8316c1c287..c55d31ae9253 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,39 +4,33 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=xephem
+_pkgname=XEphem
 pkgver=4.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="The Serious Interactive Astronomical Software Ephemeris"
 arch=('i686' 'x86_64')
-url="http://www.clearskyinstitute.com/xephem/xephem.html"
+url="https://github.com/XEphem/XEphem"
 license=('custom:MIT')
 depends=('libxmu' 'openmotif' 'perl' 'openssl')
-source=("http://www.clearskyinstitute.com/xephem/$pkgname-$pkgver.tgz"
-	"http://www.clearskyinstitute.com/xephem/contrib/xephem-3.7.7_openssl.patch"
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
        licenseinfo.patch)
-sha256sums=('abc90e795b7076be3b5c2247162e1c853265b2d81c3399767ab569a5653f6301'
-            '64365b25ac142ebcc9dc286a14f7b3c37aeb44ffcdc629d776b183099259b3f4'
+sha256sums=('c60d0920d9264ca177ceb1c2cb16c1a0349c4aed0db676d5469e0f9db862df1e'
             'bb7bd33bbe3b1c87dfcebb752c85daef2821340952f1bfab16d49f2e9f107730')
 
 prepare() {
-  cd ${pkgname}-${pkgver}/GUI/$pkgname
-  chmod u+w Makefile net.h netmenu.c sunmenu.c ucac.c usno.c xephem.h \
-	auxil/mpcorb2edb.pl fallbacks.c webdbmenu.c 
-  patch -p5 -i ../../../xephem-3.7.7_openssl.patch
-  cd ../..
+  cd ${_pkgname}-${pkgver}
   patch -Np1 < "$srcdir"/licenseinfo.patch
 }
 
 build() {
-  cd ${pkgname}-${pkgver}/GUI/$pkgname
+  cd ${_pkgname}-${pkgver}/GUI/$pkgname
   export MAKEFLAGS+="-j1"
   make MOTIF=/usr/lib/ 
 }
 
 package() {
-  cd ${pkgname}-${pkgver}/GUI/$pkgname
-  install -Dm755  "$srcdir"/${pkgname}-${pkgver}/GUI/$pkgname/xephem "$pkgdir"/usr/bin/$pkgname
-  
+  cd ${_pkgname}-${pkgver}/GUI/$pkgname
+  install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
   install -d "$pkgdir"/usr/share/$pkgname
 
   cp -R auxil    "$pkgdir"/usr/share/$pkgname/
@@ -52,6 +46,6 @@ package() {
   install -d "$pkgdir"/usr/share/X11/app-defaults
   echo "XEphem.ShareDir: /usr/share/xephem" > "$pkgdir"/usr/share/X11/app-defaults/XEphem
   
-  install -Dm644 "$srcdir"/${pkgname}-${pkgver}/Copyright \
+  install -Dm644 "$srcdir"/${_pkgname}-${pkgver}/LICENSE \
 	  "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }