summaryrefslogtreecommitdiff
path: root/extra/libmcs
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-04-17 15:59:35 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-04-17 15:59:35 -0300
commit6fed2edc6f9533e7894bbbacdbd1dbbb50076b01 (patch)
treefae0fe13e944d0265e921e57e355718c3ccd3f10 /extra/libmcs
parent048b7287473507b76146e58378f4bfcfacf1060b (diff)
parent84837d89991e1e82e5aef8e297541c572ebf2efa (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: extra/libmcs/PKGBUILD extra/libmowgli/PKGBUILD kde-unstable/kdepim/PKGBUILD
Diffstat (limited to 'extra/libmcs')
-rw-r--r--extra/libmcs/PKGBUILD28
-rw-r--r--extra/libmcs/PKGBUILD.orig34
2 files changed, 48 insertions, 14 deletions
diff --git a/extra/libmcs/PKGBUILD b/extra/libmcs/PKGBUILD
index e0c7ef750..51c2b7fd3 100644
--- a/extra/libmcs/PKGBUILD
+++ b/extra/libmcs/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 85570 2010-07-15 22:07:43Z eric $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 119903 2011-04-16 22:57:07Z bisson $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Brad Gordon <brad@rpgcyco.net>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=libmcs
pkgver=0.7.2
-pkgrel=1
-pkgdesc="Library which abstracts the storage of configuration settings"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.atheme.org/project/mcs"
+pkgrel=2
+pkgdesc='Library which abstracts the storage of configuration settings'
+arch=('i686' 'x86_64')
+url='http://www.atheme.org/project/mcs'
license=('BSD')
depends=('libmowgli')
-source=(http://distfiles.atheme.org/libmcs-${pkgver}.tbz2)
-md5sums=('9fc91a8e860a0ab99316824aebb1d40a')
+source=("http://distfiles.atheme.org/libmcs-${pkgver}.tbz2")
sha1sums=('20c30bf7d4b3043848b5180de4c2cb61f7e0154c')
build() {
- cd "${srcdir}/libmcs-${pkgver}"
- ./configure --prefix=/usr --disable-gconf --disable-kconfig
- make
+ cd "${srcdir}/libmcs-${pkgver}"
+ ./configure --prefix=/usr --disable-gconf --disable-kconfig
+ make
}
package() {
- cd "${srcdir}/libmcs-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmcs/COPYING"
+ cd "${srcdir}/libmcs-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmcs/COPYING"
}
diff --git a/extra/libmcs/PKGBUILD.orig b/extra/libmcs/PKGBUILD.orig
new file mode 100644
index 000000000..a00c9c10e
--- /dev/null
+++ b/extra/libmcs/PKGBUILD.orig
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 119903 2011-04-16 22:57:07Z bisson $
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Brad Gordon <brad@rpgcyco.net>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=libmcs
+pkgver=0.7.2
+<<<<<<< HEAD
+pkgrel=1
+pkgdesc="Library which abstracts the storage of configuration settings"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.atheme.org/project/mcs"
+=======
+pkgrel=2
+pkgdesc='Library which abstracts the storage of configuration settings'
+arch=('i686' 'x86_64')
+url='http://www.atheme.org/project/mcs'
+>>>>>>> 84837d89991e1e82e5aef8e297541c572ebf2efa
+license=('BSD')
+depends=('libmowgli')
+source=("http://distfiles.atheme.org/libmcs-${pkgver}.tbz2")
+sha1sums=('20c30bf7d4b3043848b5180de4c2cb61f7e0154c')
+
+build() {
+ cd "${srcdir}/libmcs-${pkgver}"
+ ./configure --prefix=/usr --disable-gconf --disable-kconfig
+ make
+}
+
+package() {
+ cd "${srcdir}/libmcs-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmcs/COPYING"
+}