[lilac] updated to 5.6.18-3

3 files changed, 36 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c45972062ae7..cddec92edf87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,17 @@
 pkgbase = r-lpsolve
 	pkgdesc = Interface to 'Lp_solve' v. 5.5 to Solve Linear/Integer Programs
 	pkgver = 5.6.18
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=lpSolve
-	arch = i686
 	arch = x86_64
 	license = LGPL2.1
 	depends = lpsolve
 	depends = r
 	source = https://cran.r-project.org/src/contrib/lpSolve_5.6.18.tar.gz
+	source = system-lpsolve.patch
+	md5sums = ad4e2a89dc675be45e2ed24f9a00d831
+	md5sums = cd8dd2b63a8ba9697c3c4a5569c7c9c5
 	sha256sums = 751e1926fcd81b852b6c0d5ea7ecd9311ef6fbdbce9143b7872fea79590de712
+	sha256sums = 3e13cab8c42951ed332c1bcbcb20f9c0dd964e54007cd001051fbbc7828f0653
 
 pkgname = r-lpsolve
diff --git a/PKGBUILD b/PKGBUILD
index e85d11b05b50..6998b3bfc375 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,37 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=lpSolve
-_cranver=5.6.18
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=lpSolve
+_pkgver=5.6.18
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="Interface to 'Lp_solve' v. 5.5 to Solve Linear/Integer Programs"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(LGPL2.1)
-depends=(lpsolve r)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha256sums=('751e1926fcd81b852b6c0d5ea7ecd9311ef6fbdbce9143b7872fea79590de712')
+depends=(
+  lpsolve
+  r
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
+        "system-lpsolve.patch")
+md5sums=('ad4e2a89dc675be45e2ed24f9a00d831'
+         'cd8dd2b63a8ba9697c3c4a5569c7c9c5')
+sha256sums=('751e1926fcd81b852b6c0d5ea7ecd9311ef6fbdbce9143b7872fea79590de712'
+            '3e13cab8c42951ed332c1bcbcb20f9c0dd964e54007cd001051fbbc7828f0653')
 
 prepare() {
-  cd "${_cranname}/src"
-  # devendor lpsolve
-
-  # remove all source and header files except init.c and lpslink56.c
-  # as everything else is provided by lpsolve library
-  mv init.c init.c.keep
-  mv lpslink56.c lpslink56.c.keep
-  rm *.c *.h
-  mv init.c.keep init.c
-  mv lpslink56.c.keep lpslink56.c
-
   # build against system lpsolve
-  sed -i -e 's|-I .|-I/usr/include/lpsolve|' \
-      -e '1i PKG_LIBS=-llpsolve55' \
-      Makevars
+  patch -Np1 -i system-lpsolve.patch
 }
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 }
diff --git a/system-lpsolve.patch b/system-lpsolve.patch
new file mode 100644
index 000000000000..e50824c6d6fb
--- /dev/null
+++ b/system-lpsolve.patch
@@ -0,0 +1,9 @@
+diff --git a/lpSolve/src/Makevars b/lpSolve/src/Makevars
+index e0c65cc..0370c40 100644
+--- a/lpSolve/src/Makevars
++++ b/lpSolve/src/Makevars
+@@ -1 +1,3 @@
+-PKG_CPPFLAGS=-I . -DINTEGERTIME -DPARSER_LP -DBUILDING_FOR_R -DYY_NEVER_INTERACTIVE -DUSRDLL -DCLOCKTIME -DRoleIsExternalInvEngine -DINVERSE_ACTIVE=INVERSE_LUSOL -DINLINE=static -DParanoia
++PKG_CPPFLAGS = -I/usr/include/lpsolve -DINTEGERTIME -DPARSER_LP -DBUILDING_FOR_R -DYY_NEVER_INTERACTIVE -DUSRDLL -DCLOCKTIME -DRoleIsExternalInvEngine -DINVERSE_ACTIVE=INVERSE_LUSOL -DINLINE=static -DParanoia
++PKG_LIBS = -llpsolve55
++OBJECTS = init.o lpslink56.o