rewite

2 files changed, 15 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35ebe598c416..bb48c11e205b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,14 @@
 pkgbase = emacs-bookmarkplus
 	pkgdesc = Bookmark+ package, which enhances vanilla Emacs bookmarks in many ways
-	pkgver = 2018.09.21
-	pkgrel = 1
+	pkgver = 2018.10.17
+	pkgrel = 2
 	url = http://www.emacswiki.org/emacs/BookmarkPlus
 	arch = any
 	license = GPL3
-	makedepends = awk
+	makedepends = git
 	depends = emacs
-	provides = emacs-bookmarkplus-mode
-	conflicts = emacs-bookmarkplus-mode
-	source = http://www.emacswiki.org/emacs/download/bookmark+.el
-	source = http://www.emacswiki.org/emacs/download/bookmark+-mac.el
-	source = http://www.emacswiki.org/emacs/download/bookmark+-bmu.el
-	source = http://www.emacswiki.org/emacs/download/bookmark+-1.el
-	source = http://www.emacswiki.org/emacs/download/bookmark+-key.el
-	source = http://www.emacswiki.org/emacs/download/bookmark+-lit.el
-	source = http://www.emacswiki.org/emacs/download/bookmark+-doc.el
-	source = http://www.emacswiki.org/emacs/download/bookmark+-chg.el
-	md5sums = a489d11cc953fd1c5fbc142406129f47
-	md5sums = 3f5454fb622fa72d7ac966332cb455d3
-	md5sums = e8291fdeef6da229c31fa75f05377748
-	md5sums = d2e299a523fb0baacf9abcbb239d188f
-	md5sums = 87a7714bbfa2a8af221a47a403e14010
-	md5sums = 1ec51bb03315722d2fd6e039de8a6fbb
-	md5sums = 7a855f04203da76e4bb2547f1dc53044
-	md5sums = b940a68fd9619ddd270a99dded0ae4d1
+	source = emacs-bookmarkplus::git+https://github.com/emacsmirror/bookmark-plus.git#commit=971114b9a271847bcc495b2254f74e9039ca4be0
+	md5sums = SKIP
 
 pkgname = emacs-bookmarkplus
 
diff --git a/PKGBUILD b/PKGBUILD
index 9a67dd5b3415..534d7d65aafb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,29 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=emacs-bookmarkplus
-pkgver=2018.09.21
-pkgrel=1
+pkgver=2018.10.17
+pkgrel=2
 pkgdesc="Bookmark+ package, which enhances vanilla Emacs bookmarks in many ways"
 url="http://www.emacswiki.org/emacs/BookmarkPlus"
 license=('GPL3')
 arch=('any')
 depends=('emacs')
-conflicts=('emacs-bookmarkplus-mode')
-provides=('emacs-bookmarkplus-mode')
-makedepends=('awk')
-source=("http://www.emacswiki.org/emacs/download/bookmark+.el"
-        "http://www.emacswiki.org/emacs/download/bookmark+-mac.el"
-        "http://www.emacswiki.org/emacs/download/bookmark+-bmu.el"
-        "http://www.emacswiki.org/emacs/download/bookmark+-1.el"
-        "http://www.emacswiki.org/emacs/download/bookmark+-key.el"
-        "http://www.emacswiki.org/emacs/download/bookmark+-lit.el"
-        "http://www.emacswiki.org/emacs/download/bookmark+-doc.el"
-        "http://www.emacswiki.org/emacs/download/bookmark+-chg.el")
-md5sums=('a489d11cc953fd1c5fbc142406129f47'
-         '3f5454fb622fa72d7ac966332cb455d3'
-         'e8291fdeef6da229c31fa75f05377748'
-         'd2e299a523fb0baacf9abcbb239d188f'
-         '87a7714bbfa2a8af221a47a403e14010'
-         '1ec51bb03315722d2fd6e039de8a6fbb'
-         '7a855f04203da76e4bb2547f1dc53044'
-         'b940a68fd9619ddd270a99dded0ae4d1')
+makedepends=('git')
+source=($pkgname::git+https://github.com/emacsmirror/bookmark-plus.git#commit=971114b9a271847bcc495b2254f74e9039ca4be0)
+md5sums=('SKIP')
 
 pkgver() {
+  cd $pkgname
   awk '/Version/ {print $3}' bookmark+.el
 }
 
 build() {
+  cd $pkgname
   emacs -Q -batch -L . -f batch-byte-compile *.el || true
 }
 
 package() {
-  install -dm755 "${pkgdir}"/usr/share/emacs/site-lisp/
-  install -Dm644 *.el{,c} "${pkgdir}"/usr/share/emacs/site-lisp/
+  cd $pkgname
+  install -dm755 "$pkgdir"/usr/share/emacs/site-lisp/
+  install -Dm644 *.el{,c} "$pkgdir"/usr/share/emacs/site-lisp/
 }