ncurses: use stable version and some cosmetic changes

2 files changed, 32 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a1482cb40e5..7fe9d5404230 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = mingw-w64-ncurses
 	pkgdesc = System V Release 4.0 curses emulation library (mingw-w64)
-	pkgver = 6.1.20180908
+	pkgver = 6.1
 	pkgrel = 1
+	epoch = 1
 	url = https://www.gnu.org/software/ncurses/
 	arch = any
 	license = MIT
@@ -13,10 +14,10 @@ pkgbase = mingw-w64-ncurses
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = ncurses-6.1.20180908.tar.gz::https://invisible-mirror.net/archives/ncurses/current/ncurses-6.1-20180908.tgz
+	source = ncurses-6.1.tar.gz::https://ftp.gnu.org/pub/gnu/ncurses/ncurses-6.1.tar.gz
 	source = 001-use-libsystre.patch
-	md5sums = 3b3bbfadd7ef719a0082788132cff8cb
-	md5sums = b669861903d0699b6535b7c6e028880d
+	sha256sums = aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17
+	sha256sums = eb28949297a4c1eda67da49cfbed1d60f181b83101a0b3715552a4564bd90ff3
 
 pkgname = mingw-w64-ncurses
 
diff --git a/PKGBUILD b/PKGBUILD
index a09501f604f4..6e7aab376e19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Andrew Sun <adsun701@gmail.com>
 
 pkgname=mingw-w64-ncurses
-_base_ver=6.1
-_date_rev=20180908
-pkgver=${_base_ver}.${_date_rev}
+pkgver=6.1
+epoch=1
 pkgrel=1
 pkgdesc="System V Release 4.0 curses emulation library (mingw-w64)"
 arch=('any')
@@ -12,41 +11,41 @@ license=('MIT')
 makedepends=('mingw-w64-configure' 'mingw-w64-gcc' 'mingw-w64-pkg-config')
 depends=('mingw-w64-crt' 'mingw-w64-libsystre')
 options=('!strip' '!buildflags' 'staticlibs')
-source=("ncurses-${pkgver}.tar.gz"::"https://invisible-mirror.net/archives/ncurses/current/ncurses-${_base_ver}-${_date_rev}.tgz"
-        001-use-libsystre.patch)
-md5sums=('3b3bbfadd7ef719a0082788132cff8cb'
-         'b669861903d0699b6535b7c6e028880d')
+source=("ncurses-${pkgver}.tar.gz"::"https://ftp.gnu.org/pub/gnu/ncurses/ncurses-${pkgver}.tar.gz"
+        "001-use-libsystre.patch")
+sha256sums=('aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17'
+            'eb28949297a4c1eda67da49cfbed1d60f181b83101a0b3715552a4564bd90ff3')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd "${srcdir}/ncurses-${_base_ver}-${_date_rev}"
+  cd "${srcdir}/ncurses-${pkgver}"
   patch -Np1 -i "${srcdir}/001-use-libsystre.patch"
 }
 
 build() {
-  cd "${srcdir}/ncurses-${_base_ver}-${_date_rev}"
+  cd "${srcdir}/ncurses-${pkgver}"
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-configure \
-    --without-ada \
-    --with-cxx \
-    --without-shared \
-    --without-pthread \
-    --enable-pc-files \
-    --disable-rpath \
-    --enable-colorfgbg \
-    --enable-ext-colors \
-    --enable-ext-mouse \
-    --disable-symlinks \
-    --enable-warnings \
-    --enable-assertions \
-    --disable-home-terminfo \
-    --enable-database \
-    --enable-sp-funcs \
-    --enable-term-driver \
-    --enable-interop \
-    --enable-widec
+      --without-ada \
+      --with-cxx \
+      --without-shared \
+      --without-pthread \
+      --enable-pc-files \
+      --disable-rpath \
+      --enable-colorfgbg \
+      --enable-ext-colors \
+      --enable-ext-mouse \
+      --disable-symlinks \
+      --enable-warnings \
+      --enable-assertions \
+      --disable-home-terminfo \
+      --enable-database \
+      --enable-sp-funcs \
+      --enable-term-driver \
+      --enable-interop \
+      --enable-widec
     make
     popd
   done
@@ -54,7 +53,7 @@ build() {
 
 package() {
   for _arch in ${_architectures}; do
-    cd "${srcdir}/ncurses-${_base_ver}-${_date_rev}/build-${_arch}"
+    cd "${srcdir}/ncurses-${pkgver}/build-${_arch}"
     make DESTDIR="${pkgdir}" install
     cp -R ${pkgdir}/usr/${_arch}/include/ncursesw ${pkgdir}/usr/${_arch}/include/ncurses
     cp ${pkgdir}/usr/${_arch}/lib/libncursesw.a ${pkgdir}/usr/${_arch}/lib/libncurses.a