Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

4 files changed, 21 insertions, 15 deletions

diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 3bd67cbf0..ff0ed781c 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161854 2012-06-15 16:53:25Z andyrtr $
+# $Id: PKGBUILD 173707 2012-12-21 16:29:38Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
-pkgver=2.4.10
-pkgrel=1
+pkgver=2.4.11
+pkgrel=2
 pkgdesc="TrueType font rendering library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -13,7 +13,7 @@ options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
         freetype-2.3.0-enable-spr.patch
         freetype-2.2.1-enable-valid.patch)
-md5sums=('13286702e9390a91661f980608adaff1'
+md5sums=('b93435488942486c8d0ca22e8f768034'
          '816dc8619a6904a7385769433c0a8653'
          '214119610444c9b02766ccee5e220680')
 
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index a7148b661..bed55a5fb 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 167246 2012-09-29 09:32:53Z andrea $
+# $Id: PKGBUILD 173697 2012-12-21 09:03:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.28
+pkgver=5.5.29
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -13,9 +13,9 @@ makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
-md5sums=('da8ddb3d00e6e159153d2444360f52a8'
+md5sums=('e6b9f9cb82e990bd8f0474df7462904e'
          'e7eb2faeab755cbb2fe03542bf328da9'
-         '1c949c0dbea5206af0db14942d9927b6'
+         '1351485633baf9894cfdf7c5bbffd7b5'
          '6ea6ceb360d09a774e87335ee098ddd5'
          '2fa6e456964d4ff5e6d4f9ff0126aed6'
          'a0e1460c276a50a9666c331de83271f2')
diff --git a/extra/mysql/my.cnf b/extra/mysql/my.cnf
index 9a41b4fc3..387020858 100644
--- a/extra/mysql/my.cnf
+++ b/extra/mysql/my.cnf
@@ -18,14 +18,14 @@
 [client]
 #password	= your_password
 port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
+socket		= /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
+socket		= /run/mysqld/mysqld.sock
 datadir		= /var/lib/mysql
 skip-external-locking
 key_buffer_size = 16M
diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD
index bdb78754e..a3b760125 100644
--- a/extra/nawk/PKGBUILD
+++ b/extra/nawk/PKGBUILD
@@ -1,24 +1,30 @@
-# $Id: PKGBUILD 142711 2011-11-13 14:58:31Z dreisner $
+# $Id: PKGBUILD 173726 2012-12-22 02:28:46Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=nawk
-pkgver=20110810
-pkgrel=3
+pkgver=20121220
+pkgrel=1
 pkgdesc="The one, true implementation of AWK"
 url="http://cm.bell-labs.com/who/bwk/"
 license=('MIT')
 arch=('i686' 'x86_64' 'mips64el')
 options=('!makeflags')
 depends=('glibc')
-source=("http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"
+source=("$pkgname-$pkgver.tar.gz::http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"
         'manpage-naming.patch')
-md5sums=('a7062ecade93dc4cb39190e48db9a51d'
+md5sums=('b74ca7f8f4284fc82ccee6b4e34531d8'
          '8486d387a51fe3b3c9875c4151ad92b4')
 
 build() {
+  # awk -> nawk
   patch -Np1 < manpage-naming.patch
+
+  # create license
   sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE
 
+  # fix build
+  sed -i '/YACC = yacc -d -S/ s|^|#|' makefile
+
   make "CPPFLAGS=-DHAS_ISBLANK" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS"
 }