[lilac] updated to 1.9.0-4

3 files changed, 37 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4454677679e5..398536ef9740 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = r-commonmark
 	pkgdesc = High Performance CommonMark and Github Markdown Rendering in R
 	pkgver = 1.9.0
-	pkgrel = 2
+	pkgrel = 4
 	url = https://cran.r-project.org/package=commonmark
-	arch = i686
 	arch = x86_64
 	license = BSD
 	checkdepends = r-testthat
@@ -14,10 +13,7 @@ pkgbase = r-commonmark
 	optdepends = r-testthat
 	optdepends = r-xml2
 	source = https://cran.r-project.org/src/contrib/commonmark_1.9.0.tar.gz
-	source = system-cmark-gfm.patch
-	source = CRAN-BSD_2_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_2_clause
+	md5sums = a6c6a1c1bf0ee0cc0cde65ce2d577cfc
 	sha256sums = 6dd01a5a26c8d436486abf69c2f6ad0f8dd1c811f575c31983aeb4dbd376548f
-	sha256sums = 1a9ca36bb1823edcd887e7dcc160bb939e05afea201d833f8cfb8cbf64ad54cb
-	sha256sums = 19a23bcfa6515217ca3bd3b99c27fe425f41817a034e3279b570a60fed27c499
 
 pkgname = r-commonmark
diff --git a/PKGBUILD b/PKGBUILD
index 575a4be30d50..e41c2df599d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,57 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Kibouo <csonka.mihaly@hotmail.com>
 # Contributor: Alex Branham <alex.branham@gmail.com>
 
-_cranname=commonmark
-_cranver=1.9.0
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=2
+_pkgname=commonmark
+_pkgver=1.9.0
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=4
 pkgdesc="High Performance CommonMark and Github Markdown Rendering in R"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(BSD)
-depends=(cmark-gfm r)
-checkdepends=(r-testthat r-xml2)
-optdepends=(r-curl r-testthat r-xml2)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "system-cmark-gfm.patch"
-        "CRAN-BSD_2_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_2_clause")
-sha256sums=('6dd01a5a26c8d436486abf69c2f6ad0f8dd1c811f575c31983aeb4dbd376548f'
-            '1a9ca36bb1823edcd887e7dcc160bb939e05afea201d833f8cfb8cbf64ad54cb'
-            '19a23bcfa6515217ca3bd3b99c27fe425f41817a034e3279b570a60fed27c499')
+depends=(
+  cmark-gfm
+  r
+)
+checkdepends=(
+  r-testthat
+  r-xml2
+)
+optdepends=(
+  r-curl
+  r-testthat
+  r-xml2
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('a6c6a1c1bf0ee0cc0cde65ce2d577cfc')
+sha256sums=('6dd01a5a26c8d436486abf69c2f6ad0f8dd1c811f575c31983aeb4dbd376548f')
 
 prepare() {
   # build against system cmark-gfm
-  cd "${_cranname}"
-  patch -Np1 -i "${srcdir}/system-cmark-gfm.patch"
+  sed -e 's/-Lcmark -lstatcmark/-lcmark-gfm -lcmark-gfm-extensions/' \
+      -e 's/$(SHLIB): $(STATLIB)/$(SHLIB):/' \
+      -e '/all: clean/d' \
+      -i "$_pkgname/src/Makevars"
 }
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
-
-  install -Dm644 CRAN-BSD_2_clause-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/BSD_2_clause"
-  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/system-cmark-gfm.patch b/system-cmark-gfm.patch
deleted file mode 100644
index 56c44cdd0365..000000000000
--- a/system-cmark-gfm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/Makevars b/src/Makevars
-index cad9d54..e07d4ab 100644
---- a/src/Makevars
-+++ b/src/Makevars
-@@ -12,16 +12,10 @@ LIBCMARK = cmark/cmark.o cmark/node.o cmark/iterator.o cmark/blocks.o cmark/inli
- 	extensions/autolink.o extensions/core-extensions.o extensions/ext_scanners.o \
- 	extensions/strikethrough.o extensions/table.o extensions/tagfilter.o
- 
--PKG_LIBS = -Lcmark -lstatcmark
-+PKG_LIBS = -lcmark-gfm -lcmark-gfm-extensions
- STATLIB = cmark/libstatcmark.a
- 
--# For development only
--all: clean
--
--$(SHLIB): $(STATLIB)
--
--$(STATLIB): $(LIBCMARK)
--	$(AR) rcs $(STATLIB) $(LIBCMARK)
-+$(SHLIB):
- 
- clean:
- 	rm -f $(LIBCMARK) $(OBJECTS) $(SHLIB) $(STATLIB)