Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

5 files changed, 90 insertions, 45 deletions

diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 9228e28a5..1c9d0251c 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,15 +9,15 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130930
-_libretools_commit=1e16e59a861c8359dffe0af5b8dd4d2922f4018e
+pkgver=20131007
+_libretools_commit=75bef554ce82c3c086cc04a4c12ccd2e9644290f
 _devtools_commit=f566ebf8345cf39f1d50eaa6a679b3ca7088f4eb
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
 	$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
 
-pkgrel=2
+pkgrel=1
 arch=('any')
 makedepends=(emacs ronn) # emacs --batch is used during the build to process text
 checkdepends=(sh-roundup)
@@ -83,5 +83,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('134ad4f9d4d8bad135e28c62b9856cda'
+md5sums=('938d9909ed3ed3af9f31f82bbc54e788'
          'a3cc8d8fc2daa370799249a4ea5caafc')
diff --git a/pcr/libubox/PKGBUILD b/pcr/libubox/PKGBUILD
new file mode 100644
index 000000000..577eecd24
--- /dev/null
+++ b/pcr/libubox/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+pkgname=libubox
+pkgver=0.8.0
+pkgrel=2
+pkgdesc="OpenWRT's Basic Utility Library"
+arch=('i686' 'mips64el')
+url="https://openwrt.org"
+license=('BSD')
+depends=('json-c')
+makedepends=('git' 'cmake' 'lua51')
+source=(git://nbd.name/luci2/libubox.git)
+md5sums=(SKIP)
+
+pkgver() {
+  cd ${srcdir}/${pkgname}
+  local ver="$(git describe --long --tags)"
+  printf "%s" "${ver//-/.}"
+}
+
+build() {
+  cd ${srcdir}/${pkgname}
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}
+  make DESTDIR=${pkgdir}/ install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ubus/PKGBUILD b/pcr/ubus/PKGBUILD
new file mode 100644
index 000000000..80e14eaf0
--- /dev/null
+++ b/pcr/ubus/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+pkgname=ubus
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="OpenWRT's RPC client utility"
+arch=('i686' 'mips64el')
+url="https://openwrt.org"
+license=('LGPL2.1')
+depends=('libubox' 'json-c')
+makedepends=('git' 'cmake' 'lua51')
+source=(git://nbd.name/luci2/ubus.git)
+md5sums=(SKIP)
+
+pkgver() {
+  cd ${srcdir}/${pkgname}
+  local ver="$(git describe --long --tags)"
+  printf "%s" "${ver//-/.}"
+}
+
+build() {
+  cd ${srcdir}/${pkgname}
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}
+  make DESTDIR=${pkgdir}/ install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/uci/PKGBUILD b/pcr/uci/PKGBUILD
index 41541fa07..80194f162 100644
--- a/pcr/uci/PKGBUILD
+++ b/pcr/uci/PKGBUILD
@@ -1,41 +1,31 @@
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 pkgname=uci
-pkgver=0.8.0
+pkgver=v0.8.0.43.g2fcc6d7
 pkgrel=2
 pkgdesc="OpenWRT's Unified Configuration Interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://openwrt.org"
 license=('GPL2')
+depends=('libubox')
 makedepends=('git' 'cmake' 'lua51')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz
-	uci-0.8.0-lua5.1.patch)
-md5sums=('135bf6c4188b72c7fd7954f592b1e4e4'
-	 '2c8f4d59b2b7adb990dcaa07e0ed484c')
+source=(git://nbd.name/uci.git)
+md5sums=(SKIP)
 
-# source PKGBUILD; mksource
-mksource() {
-
-  if [ -d uci/.git ]; then
-    pushd uci;  git pull; popd
-  else
-     git clone git://nbd.name/uci.git
-  fi
-
-  cd uci/
-  git archive --prefix=${pkgname}-${pkgver}/ v${pkgver} | \
-    gzip -9 > ../${pkgname}-${pkgver}.tar.gz
-  cd ..
+pkgver() {
+  cd ${srcdir}/${pkgname}
+  local ver="$(git describe --long --tags)"
+  printf "%s" "${ver//-/.}"
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/uci-0.8.0-lua5.1.patch
-  cmake .
+  cd ${srcdir}/${pkgname}
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}
   make DESTDIR=${pkgdir}/ install
 }
 
diff --git a/social/uci/PKGBUILD b/social/uci/PKGBUILD
index d306b77bd..5a14ac2c0 100644
--- a/social/uci/PKGBUILD
+++ b/social/uci/PKGBUILD
@@ -6,34 +6,25 @@ pkgdesc="OpenWRT's Unified Configuration Interface"
 arch=('i686' 'mips64el')
 url="https://openwrt.org"
 license=('GPL2')
-makedepends=('git' 'cmake' 'lua')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz)
-md5sums=('135bf6c4188b72c7fd7954f592b1e4e4')
+makedepends=('git' 'cmake' 'lua51')
+source=(git://nbd.name/uci.git)
+md5sums=(SKIP)
 
-# source PKGBUILD; mksource
-mksource() {
-
-  if [ -d uci/.git ]; then
-    pushd uci;  git pull; popd
-  else
-     git clone git://nbd.name/uci.git
-  fi
-
-  cd uci/
-  git archive --prefix=${pkgname}-${pkgver}/ v${pkgver} | \
-    gzip -9 > ../${pkgname}-${pkgver}.tar.gz
-  cd ..
+pkgver() {
+  cd ${srcdir}/${pkgname}
+  local ver="$(git describe --long --tags)"
+  printf "%s" "${ver//-/.}"
 }
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}
 
-  cmake .
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}
   make DESTDIR=${pkgdir}/ install
 }