reduce-svn 20160508.3660-1

3 files changed, 16 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1f60f6687985..dd52f5fbbb1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Thu Apr 28 09:04:20 UTC 2016
+# Sun May  8 03:31:14 UTC 2016
 pkgbase = reduce-svn
-	pkgver = 20160427.3635
+	pkgver = 20160508.3660
 	pkgrel = 1
 	url = http://reduce-algebra.sourceforge.net/
 	arch = i686
@@ -19,6 +19,7 @@ pkgbase = reduce-svn
 	depends = expat
 	depends = libx11
 	depends = libxcursor
+	options = !ccache
 	source = reduce::svn+http://svn.code.sf.net/p/reduce-algebra/code/trunk
 	source = csl
 	source = redcsl
@@ -32,7 +33,7 @@ pkgbase = reduce-svn
 	sha256sums = 3d383ac93cb831a5a142395e76a9c275dc7e49dc150763610869e56e5a795e65
 	sha256sums = 22c7c510fba9ec2bcb8f476af0c96055a915a31f34c01ece43ff21d0dfa9dd0d
 	sha256sums = 9dce4d401c759c933ebc3ffbe0eff86150f04829ca10a9fd6f6faba4498f47ad
-	sha256sums = e387eada63c3e15cb75f5f5a5060491831f607d93c7f97b30262fc30cf1ebea3
+	sha256sums = 5896e2252dd87b764143dbf8d9889e289811a3020dd019386debee5bb02a142d
 
 pkgname = reduce-csl-svn
 	pkgdesc = REDUCE Computer Algebra System -- CSL version
diff --git a/PKGBUILD b/PKGBUILD
index 07f00723c3fb..ccb22b185fe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=reduce-svn
 _pkgbase=reduce
 pkgname=(reduce-csl-svn reduce-psl-svn reduce-common-svn reduce-addons-svn)
-pkgver=20160427.3635
+pkgver=20160508.3660
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://reduce-algebra.sourceforge.net/"
@@ -13,6 +13,7 @@ license=('BSD')
 groups=('science')
 makedepends=('subversion' 'texlive-htmlxml' 'imagemagick') # for documentation
 depends=('ncurses' 'libxext' 'libxrandr' 'libxft' 'freetype2' 'expat' 'libx11' 'libxcursor')
+options=('!ccache')
 source=("${_pkgbase}::svn+http://svn.code.sf.net/p/reduce-algebra/code/trunk"
         'csl' 'redcsl' 'redpsl'
         'redcsl.desktop' 'qreduce.desktop'
@@ -23,7 +24,7 @@ sha256sums=('SKIP'
             '3d383ac93cb831a5a142395e76a9c275dc7e49dc150763610869e56e5a795e65'
             '22c7c510fba9ec2bcb8f476af0c96055a915a31f34c01ece43ff21d0dfa9dd0d'
             '9dce4d401c759c933ebc3ffbe0eff86150f04829ca10a9fd6f6faba4498f47ad'
-            'e387eada63c3e15cb75f5f5a5060491831f607d93c7f97b30262fc30cf1ebea3')
+            '5896e2252dd87b764143dbf8d9889e289811a3020dd019386debee5bb02a142d')
 
 pkgver() {
   cd ${srcdir}/${_pkgbase}
@@ -44,7 +45,7 @@ build() {
   ./configure --with-csl
   ./configure --with-psl
   make -j1
-  (cd generic/redfront && make -j1)
+  # (cd generic/redfront && make -j1)
   (cd generic/casefold && cc casefold.c -o casefold)
   (cd generic/libreduce && make PYTHON=/usr/bin/python2 -j1)
   (cd generic/emacs && makeinfo reduce-ide.texinfo)
@@ -140,8 +141,8 @@ package_reduce-addons-svn() {
   install -d ${pkgdir}/usr/share/doc/reduce-addons
   install -d ${pkgdir}/usr/share/emacs/site-lisp/reduce
 
-  install -D generic/redfront/${CARCH}-unknown-linux-gnu/redfront/redfront ${pkgdir}/usr/bin/redfront
-  install -Dm644 generic/redfront/src/redfront.1 ${pkgdir}/usr/share/man/man1/redfront.1
+  # install -D generic/redfront/${CARCH}-unknown-linux-gnu/redfront/redfront ${pkgdir}/usr/bin/redfront
+  # install -Dm644 generic/redfront/src/redfront.1 ${pkgdir}/usr/share/man/man1/redfront.1
 
   install -D generic/breduce/breduce ${pkgdir}/usr/bin/breduce
   install -Dm644 generic/breduce/breduce.1 ${pkgdir}/usr/share/man/man1/breduce.1
@@ -160,13 +161,13 @@ package_reduce-addons-svn() {
   install -Dm644 generic/emacs/reduce-ide.info ${pkgdir}/usr/share/info/reduce-ide.info
 
   cd "${pkgdir}/usr/bin"
-  ln -s redfront rfcsl
-  ln -s redfront rfpsl
+  # ln -s redfront rfcsl
+  # ln -s redfront rfpsl
   ln -s ../share/qreduce/qreduce.py qreduce
 
-  cd "${pkgdir}/usr/share/man/man1"
-  ln -s redfront.1 rfcsl.1
-  ln -s redfront.1 rfpsl.1
+  # cd "${pkgdir}/usr/share/man/man1"
+  # ln -s redfront.1 rfcsl.1
+  # ln -s redfront.1 rfpsl.1
 
   cd "${pkgdir}/usr/share/qreduce"
   ln -s ../../lib/reduce/RedPy.so
diff --git a/qreduce-file-location.patch b/qreduce-file-location.patch
index 9bd84b1c209e..0ab354bda1de 100644
--- a/qreduce-file-location.patch
+++ b/qreduce-file-location.patch
@@ -7,7 +7,7 @@ diff -ur generic.orig/libreduce/Makefile generic/libreduce/Makefile
  	cd $(BUILD); \
 -	../src/configure --disable-universal; \
 +	../src/configure --disable-universal --disable-logfile; \
- 	make
+ 	$(MAKE)
  
  clean:
 diff -ur generic.orig/qreduce/qreduce.py generic/qreduce/qreduce.py