Tue Jul 3 00:01:39 UTC 2012

10 files changed, 222 insertions, 17 deletions

diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index 27f36a9ec..23602edf5 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=john
 pkgver=1.7.9
-pkgrel=4
+pkgrel=5
 _jumbover=6
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
 arch=('i686' 'x86_64')
@@ -57,6 +57,7 @@ build() {
 
 package() {
 	# config file
+	sed -i 's|$JOHN/john.local.conf|/etc/john.local.conf|g' ${srcdir}/john-$pkgver/run/john.conf
 	sed -i 's|$JOHN|/usr/share/john|g' ${srcdir}/john-$pkgver/run/john.conf
 	install -Dm644 ${srcdir}/john-$pkgver/run/john.conf ${pkgdir}/etc/john/john.conf
 
diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD
index 150ad5868..851e6333c 100755
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71531 2012-05-28 12:15:53Z ttopper $
+# $Id: PKGBUILD 73102 2012-07-01 10:04:33Z ttopper $
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Maintainer:  Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=mathomatic
-pkgver=15.8.5
+pkgver=16.0.0
 pkgrel=1
 pkgdesc="General purpose Computer Algebra System written in C"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial'
             'm4: for complex operations using the matho script' 
             'gnuplot: for plotting')
 source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2)
-md5sums=('cb2abc1a35142158f8ec99d7e8368e11')
+md5sums=('a349471e997afcfa222964692780b567')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 5b1a5f675..81674fff0 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69444 2012-04-16 11:14:20Z spupykin $
+# $Id: PKGBUILD 73107 2012-07-01 18:54:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=recoll
-pkgver=1.17.1
+pkgver=1.17.3
 pkgrel=1
 pkgdesc="Full text search tool based on Xapian backend"
 arch=('i686' 'x86_64')
@@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)'
 	    'aspell-en: English stemming support')
 install=recoll.install
 source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('10726fdb6c35898f6349d475fc4097c8')
+md5sums=('3e917193afbedc97e687d91963e079b7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
new file mode 100644
index 000000000..04529d1c4
--- /dev/null
+++ b/community/sage-mathematics/PKGBUILD
@@ -0,0 +1,108 @@
+# $Id: PKGBUILD 73103 2012-07-01 13:56:11Z dwallace $
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: Osman Ugus <ugus11@yahoo.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
+
+pkgname=sage-mathematics
+pkgver=5.0.1
+pkgrel=2
+pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
+url='http://www.sagemath.org'
+arch=('i686' 'x86_64')
+license=('GPL')
+#depends=('readline')
+depends=('ppl')
+makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core')
+optdepends=('imagemagick: some plotting functionality benefits from it'
+            'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
+            'sage-mathematics-spkgs: original packages used to build additional packages')
+options=('!makeflags')
+install="${pkgname}.install"
+source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
+        'SAGE-notebook.desktop')
+md5sums=('1538dbcfac04482b3837ba06bb75f073'
+         'dc391f12b7d17dd37326343ec0e99bbd')
+
+build() {
+  cd sage-${pkgver}
+
+  # modularization of sage, sort of :)
+  # fixes the following error:
+  # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook
+  # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash
+  # this is for people who have custom kernels (sage works this around by checking uname -r)
+  #mkdir -p spkg/installed
+  #touch spkg/installed/readline-6.1
+  mkdir -p spkg/installed
+  touch spkg/installed/ppl-0.11.2
+
+  # fix "missing sage.all error" during build
+  unset CFLAGS
+  unset CXXFLAGS
+
+  # fix build errors
+  unset LDFLAGS
+
+  # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
+  export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }')
+  export MAKE="make -j${SAGE_BUILD_THREADS}"
+
+  # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
+  export SAGE_FORTRAN='/usr/bin/gfortran'
+  export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so'
+
+  # disable building with debugging support
+  export SAGE_DEBUG='no'
+
+  # enable fat binaries (disables processor specific optimizations)
+  # comment out if you're only building it for yourself
+  export SAGE_FAT_BINARY='yes'
+
+  # can't write to root in a clean chroot
+  export DOT_SAGE='/build/src/'
+
+  # only build sage, no documents
+  #make build
+  make
+}
+
+<< COMMENT
+check() {
+  cd sage-${pkgver}
+
+  # uncomment if we want to run all the tests (warning: very long)
+  #make ptestlong
+}
+COMMENT
+
+package() {
+  cd sage-${pkgver}
+
+  # cp because make install is experimental and will corrupt the install
+  install -d ${pkgdir}/opt/sage
+  cp -dpr --no-preserve=ownership * ${pkgdir}/opt/sage
+
+  # move SageTeX files to more appropriate directory
+  install -d ${pkgdir}/usr/share
+  mv ${pkgdir}/opt/sage/local/share/texmf \
+    ${pkgdir}/usr/share
+
+  desktop-file-install ${srcdir}/SAGE-notebook.desktop \
+    --dir ${pkgdir}/usr/share/applications 
+
+  # create link to main binary
+  install -d ${pkgdir}/usr/bin
+  ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
+
+  # remove build logs
+  rm -f ${pkgdir}/opt/sage/install.log
+  rm -rf ${pkgdir}/opt/sage/spkg/logs
+
+  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
+  # no need to package them together, put into sage-mathematics-spkgs
+  rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
+  rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
+}
diff --git a/community/sage-mathematics/SAGE-notebook.desktop b/community/sage-mathematics/SAGE-notebook.desktop
new file mode 100644
index 000000000..26a35d3ac
--- /dev/null
+++ b/community/sage-mathematics/SAGE-notebook.desktop
@@ -0,0 +1,19 @@
+[Desktop Entry]
+Version=1.0
+Name=SAGE
+Comment=SAGE NOTEBOOK
+Comment[en_US]=SAGE NOTEBOOK
+Exec=/opt/sage/sage -notebook
+GenericName=
+GenericName[de]=
+Icon=/opt/sage/data/extcode/notebook/images/sageicon.png
+MimeType=
+Name[de]=SAGE
+StartupNotify=true
+Terminal=true
+Type=Application
+Categories=Science;Math;
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+GenericName[en_US]=
diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install
new file mode 100644
index 000000000..6caa5299e
--- /dev/null
+++ b/community/sage-mathematics/sage-mathematics.install
@@ -0,0 +1,56 @@
+post_install() {
+  cd /opt/sage
+
+  # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership
+  # the files it writes to ~/.sage can be safely ignored
+  HOME=/tmp ./sage -c
+
+  # add sagemath user for the daemon
+  useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath
+
+  # Update LaTeX db to point to SageTeX
+  if [ -f /usr/bin/texhash ]; then
+    /usr/bin/texhash /usr/share/texmf
+  else
+    echo 'Warning: could not find /usr/bin/texhash'
+    echo 'SageTeX has been installed but you need to run:'
+    echo '# texhash /usr/share/texmf'
+    echo 'So that LaTeX will be able to find it.'
+  fi
+
+echo '
+ ___                       
+/ (_)        o            |
+\__   _  _      __        |
+/    / |/ |  | /  \_|   | |
+\___/  |  |_/|/\__/  \_/|/o
+            /|         /|  
+            \|         \|  
+ ________________________________ 
+< sage-mathematics, I mean, MOO! >
+ -------------------------------- 
+        \   ^__^
+         \  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
+'
+
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  # Update LaTeX db to remove SageTeX entries
+  if [ -f /usr/bin/texhash ]; then
+    /usr/bin/texhash /usr/share/texmf
+  fi
+
+  # remove the sagemath daemon user
+  userdel sagemath
+
+  # clean up left overs
+  rm -rf /opt/sage
+}
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 3ece04c8a..aa075e2e7 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72938 2012-06-25 10:44:11Z spupykin $
+# $Id: PKGBUILD 73109 2012-07-01 18:54:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=ulogd
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/ulogd/index.html'
@@ -29,7 +29,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
 	'logrotate')
 md5sums=('211e68781e3860959606fc94b97cf22e'
          'c42230c1cabf5dd9b80bf9a0fd87ca7e'
-         'fe40b3073b7474a77e0b8b0bfd19ab63')
+         'dd32eeee0949adff4188544419acd17e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/ulogd/logrotate b/community/ulogd/logrotate
index c104ad511..312c71acb 100644
--- a/community/ulogd/logrotate
+++ b/community/ulogd/logrotate
@@ -1,4 +1,4 @@
-/var/log/ulogd.* {
+/var/log/ulogd.log /var/log/ulogd.syslogemu {
   missingok
   notifempty
   sharedscripts
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index 400bfd524..f14114da1 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65347 2012-02-21 02:15:35Z spupykin $
+# $Id: PKGBUILD 73111 2012-07-01 18:55:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Steve Sansom <snsansom@gmail.com>
 
 pkgname=units
-pkgver=1.88
-pkgrel=4
+pkgver=2.00
+pkgrel=1
 pkgdesc="converts between different units"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/units/units.html"
@@ -13,12 +13,15 @@ depends=('readline')
 license=("GPL")
 options=('!makeflags')
 install=units.install
-source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz)
-md5sums=('9b2ee6e7e0e9c62741944cf33fc8a656')
+source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('6d0518d493f9bab5aa318a3c7d0801b2'
+         'bf891464e398b0ddadac97dd7ce948c4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --datadir=/usr/share/units
+  patch -p1 <$srcdir/build-fix.patch
+  ./configure --prefix=/usr --datadir=/usr/share
   make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch
new file mode 100644
index 000000000..219c16b85
--- /dev/null
+++ b/community/units/build-fix.patch
@@ -0,0 +1,18 @@
+diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
+--- units-2.00.org/Makefile.in	2012-05-03 00:37:55.000000000 +0400
++++ units-2.00/Makefile.in	2012-07-01 22:44:37.000000000 +0400
+@@ -84,10 +84,10 @@
+ 	sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
+ 
+ install-support: definitions.units currency.units units_cur_inst
+-	$(srcdir)/mkinstalldirs @UDAT@  $(DESTDIR)$(bindir) 
+-	$(INSTALL_DATA) $(srcdir)/definitions.units @UDAT@definitions.units
+-	$(INSTALL_DATA) $(srcdir)/currency.units @UDAT@currency.units
+-	$(INSTALL_DATA) $(srcdir)/locale.map @UDAT@locale.map
++	$(srcdir)/mkinstalldirs $(DESTDIR)/@UDAT@  $(DESTDIR)$(bindir) 
++	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)/@UDAT@definitions.units
++	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)/@UDAT@currency.units
++	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)/@UDAT@locale.map
+ 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
+ 
+ install: units@EXEEXT@ install-doc install-support