From ef15a7c752cdb6f1088d75a765db9bc16312fe81 Mon Sep 17 00:00:00 2001
From: Justin Gassner <justin.gassner@web.de>
Date: Sat, 11 Aug 2018 09:35:23 +0200
Subject: m[pop,smtp]: follow upstream

---
 mpop/PKGBUILD                                  | 27 ++++++++++++--------------
 mpop/change-configuration-file-location.patch  | 25 ------------------------
 msmtp/PKGBUILD                                 | 25 +++++++++++-------------
 msmtp/change-configuration-file-location.patch | 25 ------------------------
 4 files changed, 23 insertions(+), 79 deletions(-)
 delete mode 100644 mpop/change-configuration-file-location.patch
 delete mode 100644 msmtp/change-configuration-file-location.patch

diff --git a/mpop/PKGBUILD b/mpop/PKGBUILD
index de42abe..fcb49d5 100644
--- a/mpop/PKGBUILD
+++ b/mpop/PKGBUILD
@@ -2,30 +2,27 @@
 
 _pkgname=mpop
 pkgname=$_pkgname-jxir
-pkgver=1.2.6
+pkgver=1.2.8.5.g29131be
 pkgrel=1
 pkgdesc='A small, fast POP3 client'
 arch=('x86_64')
-url="http://$_pkgname.sourceforge.net"
+url="https://marlam.de/$_pkgname/"
 license=('GPL3')
 depends=('gsasl')
 makedepends=('texlive-plainextra')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.xz"{,.sig}
-        'change-configuration-file-location.patch')
-sha256sums=('9fec7a9dd08fc0f04bf6178bc651b036d1fe0e46903146f38a8d182887e9315c'
-            'SKIP'
-            'ca36ec82129c14a1f69d51beb89fcd2a6a79ec4d2eac7f4248207c9aaf2229a4')
-validpgpkeys=('2F788CDEF4181652720EF132F4926138953E5294') # Martin Lambers
+source=("git+https://gitlab.marlam.de/marlam/$_pkgname.git")
+sha256sums=('SKIP')
 
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -p1 -i "$srcdir/change-configuration-file-location.patch"
+pkgver() {
+  cd "$srcdir/$_pkgname"
+  git describe --long | sed "s/$_pkgname-//;s/-/./g"
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname"
+  autoreconf -i
   ./configure \
     --prefix=/usr \
     --disable-nls \
@@ -36,9 +33,9 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname"
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C doc install-pdf
-  install -D -m644 doc/*.example "$pkgdir/usr/share/doc/$_pkgname/"
-  install -D -m644 "scripts/vim/$_pkgname.vim" "$pkgdir/usr/share/nvim/runtime/syntax/$_pkgname.vim"
+  install -Dm644 doc/*.example "$pkgdir/usr/share/doc/$_pkgname/"
+  install -Dm644 "scripts/vim/$_pkgname.vim" "$pkgdir/usr/share/nvim/runtime/syntax/$_pkgname.vim"
 }
diff --git a/mpop/change-configuration-file-location.patch b/mpop/change-configuration-file-location.patch
deleted file mode 100644
index 4deffb5..0000000
--- a/mpop/change-configuration-file-location.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d1127c5cef14cb25fcae305071d83d5f89f810d8 Mon Sep 17 00:00:00 2001
-From: Justin Gassner <justin.gassner@web.de>
-Date: Wed, 18 May 2016 22:46:31 +0200
-Subject: [PATCH] Change configuration file location
-
----
- src/mpop.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mpop.c b/src/mpop.c
-index 2770cf9..60b155f 100644
---- a/src/mpop.c
-+++ b/src/mpop.c
-@@ -97,7 +97,7 @@ extern int optind;
- #define USERNETRCFILE   "_netrc"
- #define SYSNETRCFILE    "netrc"
- #else /* UNIX */
--#define CONFFILE        ".mpoprc"
-+#define CONFFILE        ".config/mpop"
- #define UIDLSFILE       ".mpop_uidls/%U_at_%H"
- #define USERNETRCFILE   ".netrc"
- #define SYSNETRCFILE    "netrc"
--- 
-2.8.2
-
diff --git a/msmtp/PKGBUILD b/msmtp/PKGBUILD
index 9c7cdcb..a666cf6 100644
--- a/msmtp/PKGBUILD
+++ b/msmtp/PKGBUILD
@@ -2,30 +2,27 @@
 
 _pkgname=msmtp
 pkgname=$_pkgname-jxir
-pkgver=1.6.6
+pkgver=1.6.8.5.g09a1cb4
 pkgrel=1
-pkgdesc='A small, fast SMTP client'
+pkgdesc='A small, fast POP3 client'
 arch=('x86_64')
-url="http://$_pkgname.sourceforge.net"
+url="https://marlam.de/$_pkgname/"
 license=('GPL3')
 depends=('gsasl')
 makedepends=('texlive-plainextra')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.xz"{,.sig}
-        'change-configuration-file-location.patch')
-sha256sums=('da15db1f62bd0201fce5310adb89c86188be91cd745b7cb3b62b81a501e7fb5e'
-            'SKIP'
-            '46bb7505e7a2298846cb03ba4cacc4b1cabd09bb425715a02d2c3ec1a7780ad4')
-validpgpkeys=('2F788CDEF4181652720EF132F4926138953E5294') # Martin Lambers
+source=("git+https://gitlab.marlam.de/marlam/$_pkgname.git")
+sha256sums=('SKIP')
 
-prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  patch -p1 -i "$srcdir/change-configuration-file-location.patch"
+pkgver() {
+  cd "$srcdir/$_pkgname"
+  git describe --long | sed "s/$_pkgname-//;s/-/./g"
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname"
+  autoreconf -i
   ./configure \
     --prefix=/usr \
     --disable-nls \
@@ -36,7 +33,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname"
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C doc install-pdf
   install -Dm644 doc/*.example "$pkgdir/usr/share/doc/$_pkgname/"
diff --git a/msmtp/change-configuration-file-location.patch b/msmtp/change-configuration-file-location.patch
deleted file mode 100644
index 4284470..0000000
--- a/msmtp/change-configuration-file-location.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9ac163f8fe8d7fceb215b3a39db51f2610856cc5 Mon Sep 17 00:00:00 2001
-From: Justin Gassner <justin.gassner@web.de>
-Date: Wed, 18 May 2016 23:05:49 +0200
-Subject: [PATCH] Change configuration file location
-
----
- src/msmtp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/msmtp.c b/src/msmtp.c
-index 3e549ae..9e3b7f5 100644
---- a/src/msmtp.c
-+++ b/src/msmtp.c
-@@ -89,7 +89,7 @@ extern int optind;
- #define USERNETRCFILE   "_netrc"
- #else /* UNIX */
- #define SYSCONFFILE     "msmtprc"
--#define USERCONFFILE    ".msmtprc"
-+#define USERCONFFILE    ".config/msmtp"
- #define SYSNETRCFILE    "netrc"
- #define USERNETRCFILE   ".netrc"
- #endif
--- 
-2.8.2
-
-- 
cgit v1.2.3-54-g00ecf