summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-12-16 11:57:04 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-12-16 11:57:04 +0100
commit0e419b3bf8abe456c265cc1cd395129f50dde6f9 (patch)
tree900321543d00bff1def8e0d2075fa072857d8cdb
parent363603de616fec82753ad92178001af029755e3b (diff)
parentd1335cc6b44826a3ae6934a40bd618bfddcd2e6e (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/mosh/PKGBUILD
-rw-r--r--community/luasec/PKGBUILD22
-rw-r--r--community/luasocket/PKGBUILD44
-rw-r--r--community/mosh/PKGBUILD7
-rw-r--r--community/nodejs/PKGBUILD6
-rw-r--r--community/sage-mathematics/PKGBUILD14
-rw-r--r--community/sage-mathematics/SAGE-notebook.desktop2
-rw-r--r--community/supertuxkart/PKGBUILD10
-rw-r--r--libre/linux-libre-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD4
9 files changed, 53 insertions, 60 deletions
diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD
index 7352a6e0b..15fa05671 100644
--- a/community/luasec/PKGBUILD
+++ b/community/luasec/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 81215 2012-12-13 11:26:01Z spupykin $
+# $Id: PKGBUILD 81272 2012-12-15 14:51:01Z seblu $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Dwayne Bent <dbb.1@liqd.org>
# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
pkgbase=luasec
-pkgname=(lua-sec lua51-sec)
+pkgname=(lua51-sec)
pkgver=0.4.1
-pkgrel=3
+pkgrel=4
pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.'
arch=('i686' 'x86_64' 'mips64el')
url='http://luasec.luaforge.net/'
@@ -27,14 +27,14 @@ build() {
make INCDIR=-I/usr/include/lua5.1 linux
}
-package_lua-sec() {
- depends=('openssl' 'lua' 'lua-socket')
-
- install -dm755 "$pkgdir/usr/lib/lua/5.2"
- cd luasec-$pkgver
- make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install
- install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
+#package_lua-sec() {
+# depends=('openssl' 'lua' 'lua-socket')
+#
+# install -dm755 "$pkgdir/usr/lib/lua/5.2"
+# cd luasec-$pkgver
+# make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install
+# install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#}
package_lua51-sec() {
depends=('openssl' 'lua51' 'lua51-socket')
diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD
index a639a469b..ddb1b58d8 100644
--- a/community/luasocket/PKGBUILD
+++ b/community/luasocket/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81244 2012-12-14 12:38:59Z seblu $
+# $Id: PKGBUILD 81274 2012-12-15 15:00:36Z seblu $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Anders Bergh <anders1@gmail.com>
pkgbase=luasocket
-pkgname=(lua-socket lua51-socket)
+pkgname=(lua51-socket)
pkgver=2.0.2
-pkgrel=4
+pkgrel=5
pkgdesc='Networking support library for the Lua language'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.cs.princeton.edu/~diego/professional/luasocket/'
@@ -13,34 +13,32 @@ license=('MIT')
replaces=('luasocket')
conflicts=('luasocket')
makedepends=('lua' 'lua51')
-source=(http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz
- luasocket-unixsocket.patch
- lua52.patch)
+source=("http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz"
+ 'luasocket-unixsocket.patch')
md5sums=('41445b138deb7bcfe97bff957503da8e'
- '8d116bb70bd7a2fa15cbe949d4cfc35e'
- '6f9c6416dd70a7bc1a867003f08c2752')
+ '8d116bb70bd7a2fa15cbe949d4cfc35e')
build() {
- msg2 'Building with lua 5.2'
- cp -a luasocket-$pkgver luasocket-$pkgver-52
- cd luasocket-$pkgver-52
- patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
- patch -Np1 -i "$srcdir/lua52.patch"
- make
+# cp -a luasocket-$pkgver luasocket-$pkgver-52
+# msg2 'Building with lua 5.2'
+# pushd luasocket-$pkgver-52
+# patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
+# make
+# popd
msg2 'Building with lua 5.1'
- cd ../luasocket-$pkgver
+ cd luasocket-$pkgver
patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
make LUAINC=-I/usr/include/lua5.1
}
-package_lua-socket() {
- depends=('lua')
- cd luasocket-$pkgver-52
- make DESTDIR="$pkgdir/" \
- INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.2' \
- INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.2' install
- install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
+#package_lua-socket() {
+# depends=('lua')
+# cd luasocket-$pkgver-52
+# make DESTDIR="$pkgdir/" \
+# INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.2' \
+# INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.2' install
+# install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#}
package_lua51-socket() {
depends=('lua51')
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
index 58f42ea53..6fa1b9558 100644
--- a/community/mosh/PKGBUILD
+++ b/community/mosh/PKGBUILD
@@ -5,13 +5,12 @@
pkgname=mosh
pkgver=1.2.3
-pkgrel=1
+pkgrel=2
pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
arch=('x86_64' 'i686' 'mips64el')
-url="http://mosh.mit.edu/"
+url='http://mosh.mit.edu/'
license=('GPL3')
-depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty')
-#optdepends=('libutempter: record of session in {u,t}wmp (recompile mosh afterwards)')
+depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty' 'libutempter')
source=("https://github.com/downloads/keithw/mosh/$pkgname-$pkgver.tar.gz")
sha256sums=('93f09fda77e57f05485a61f3ac679bf9f3f359a9b0b93c216ddd53cd124a768f')
options=('!emptydirs')
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 782423088..40ab6e4e6 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80635 2012-11-27 18:58:23Z bpiotrowski $
+# $Id: PKGBUILD 81270 2012-12-15 14:07:11Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
# Contributor: TIanyi Cui <tianyicui@gmail.com>
pkgname=nodejs
-pkgver=0.8.15
+pkgver=0.8.16
pkgrel=1
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ depends=('openssl' 'python2' 'v8')
checkdepends=('curl') # curl used for check()
options=('!emptydirs')
source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-md5sums=('6cb31180b07475db103e694f65e8bb9b')
+md5sums=('62ff446972ab02980465f60f9920705d')
build() {
cd node-v${pkgver}
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index a591ea4c0..a0f739560 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80799 2012-12-03 23:13:56Z dwallace $
+# $Id: PKGBUILD 81283 2012-12-16 01:26:32Z dwallace $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
# Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
pkgname=sage-mathematics
-pkgver=5.4
+pkgver=5.4.1
pkgrel=1
pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
url='http://www.sagemath.org'
@@ -18,8 +18,7 @@ makedepends=('gcc-fortran' 'desktop-file-utils')
optdepends=('imagemagick: some plotting functionality benefits from it'
'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
'openssh: to use the notebook in secure mode'
- 'ffmpeg: to show animations'
- 'jsmath-fonts: native TeX fonts for the notebook')
+ 'ffmpeg: to show animations')
options=('!makeflags')
install="${pkgname}.install"
source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
@@ -55,6 +54,7 @@ build() {
# only build sage, no documents
#make build
make
+ ./sage --bdist "$pkgver"
}
<< COMMENT
@@ -71,7 +71,7 @@ package() {
# cp because make install is experimental and will corrupt the install
install -d ${pkgdir}/opt/sage
- cp -dpr --no-preserve=ownership * ${pkgdir}/opt/sage
+ cp -dpr --no-preserve=ownership dist/sage-"$pkgver-$CARCH-Linux/"* ${pkgdir}/opt/sage/
# move SageTeX files to more appropriate directory
install -d ${pkgdir}/usr/share
@@ -95,5 +95,5 @@ package() {
}
# vim :set ts=2 sw=2 et:
-md5sums=('2dea4a2ceea6d500f50260d2d6911bee'
- 'dc391f12b7d17dd37326343ec0e99bbd')
+md5sums=('069fa0c705a253710a66f76ee9d6168e'
+ 'b82f94383829eee26648feb977e2d89b')
diff --git a/community/sage-mathematics/SAGE-notebook.desktop b/community/sage-mathematics/SAGE-notebook.desktop
index 26a35d3ac..e3c1d4d7f 100644
--- a/community/sage-mathematics/SAGE-notebook.desktop
+++ b/community/sage-mathematics/SAGE-notebook.desktop
@@ -6,7 +6,7 @@ Comment[en_US]=SAGE NOTEBOOK
Exec=/opt/sage/sage -notebook
GenericName=
GenericName[de]=
-Icon=/opt/sage/data/extcode/notebook/images/sageicon.png
+Icon=/opt/sage/devel/ext-main/notebook/images/sageicon.png
MimeType=
Name[de]=SAGE
StartupNotify=true
diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD
index d4e6c65cc..9e6d613f0 100644
--- a/community/supertuxkart/PKGBUILD
+++ b/community/supertuxkart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81143 2012-12-12 06:53:44Z svenstaro $
+# $Id: PKGBUILD 81266 2012-12-15 06:19:59Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=supertuxkart
pkgver=0.8
-pkgrel=1
+pkgrel=2
pkgdesc="A kart racing game featuring Tux and his friends"
arch=('i686' 'x86_64' 'mips64el')
url="http://supertuxkart.sourceforge.net/"
@@ -43,11 +43,7 @@ package() {
cd build
make DESTDIR=${pkgdir} install
- # fix executable location...
- #install -Dm755 ${pkgdir}/usr/games/supertuxkart ${pkgdir}/usr/bin/supertuxkart
- #rm -r ${pkgdir}/usr/games
-
- #sed -i "s#usr/games/supertuxkart#usr/bin/supertuxkart#" ${pkgdir}/usr/share/applications/supertuxkart.desktop
+ sed -i "s#usr/games/supertuxkart#usr/bin/supertuxkart#" ${pkgdir}/usr/share/applications/supertuxkart.desktop
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index f7bf76187..81c5088e3 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.6.7
+_kernver=3.6.10
_kernrel=1
pkgname=('linux-libre-kmod-alx')
_pkgver=2012-10-03
pkgver=20121003
-pkgrel=6
+pkgrel=7
pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
arch=('i686' 'x86_64')
url='http://linuxwireless.org/'
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 5892fa794..02e85467c 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.0.52
+_kernver=3.0.56
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_pkgver=2012-10-03
pkgver=20121003
-pkgrel=7
+pkgrel=8
pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://linuxwireless.org/'