summaryrefslogtreecommitdiff
path: root/extra/bitlbee
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-11-09 20:51:43 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-11-09 20:51:43 +0100
commit7b801d14eb78615912e7456a4654c2488bdee4d5 (patch)
tree070ebb46ae5f3eda613c61c00455800ec93267cd /extra/bitlbee
parent6437e5e532491d7221030a7647fde7a69d1a1099 (diff)
parentc865fc041a0945e396f139a86315f6a25b1d4dec (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/erlang/PKGBUILD community/mcabber/PKGBUILD community/smem/PKGBUILD community/uqm/PKGBUILD extra/bitlbee/PKGBUILD extra/gvfs/PKGBUILD extra/gweled/PKGBUILD extra/libmikmod/PKGBUILD extra/sdl_sound/PKGBUILD extra/xmms/PKGBUILD libre/gnu-ghostscript/PKGBUILD libre/libretools/PKGBUILD
Diffstat (limited to 'extra/bitlbee')
-rw-r--r--extra/bitlbee/PKGBUILD47
1 files changed, 25 insertions, 22 deletions
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD
index d0f3a6348..42b60ffaf 100644
--- a/extra/bitlbee/PKGBUILD
+++ b/extra/bitlbee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169422 2012-10-20 20:58:46Z dreisner $
+# $Id: PKGBUILD 170572 2012-11-09 00:21:44Z eric $
# Contributor: FUBAR <mrfubar@gmail.com>
# Contributor: simo <simo@archlinux.org>
@@ -9,15 +9,14 @@
pkgname=bitlbee
pkgver=3.0.6
-pkgrel=1
+pkgrel=2
pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
url='http://www.bitlbee.org/'
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('openssl' 'glib2')
-makedepends=('asciidoc' 'libotr')
-optdepends=('skype4py: to use skyped'
- 'libotr: for OTR encryption support'
+makedepends=('asciidoc' 'libotr3')
+optdepends=('libotr3: for OTR encryption support'
'xinetd: to run bitlbee through xinetd')
source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
'xinetd'
@@ -32,27 +31,31 @@ backup=('etc/bitlbee/bitlbee.conf'
'etc/xinetd.d/bitlbee')
install=bitlbee.install
-build() {
- cd "$pkgname-$pkgver"
+build() {
+ cd "$pkgname-$pkgver"
- ./configure \
- --prefix=/usr \
- --etcdir=/etc/bitlbee \
- --pidfile=/run/bitlbee/bitlbee.pid \
- --ipcsocket=/run/bitlbee/bitlbee.sock \
- --systemdsystemunitdir=/usr/lib/systemd/system \
- --ssl=openssl \
- --strip=0 \
- --otr=plugin
+ ./configure \
+ --prefix=/usr \
+ --etcdir=/etc/bitlbee \
+ --pidfile=/run/bitlbee/bitlbee.pid \
+ --ipcsocket=/run/bitlbee/bitlbee.sock \
+ --systemdsystemunitdir=/usr/lib/systemd/system \
+ --ssl=openssl \
+ --strip=0 \
+ --otr=plugin
- make
+ # hacky: build against libotr3
+ sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
+ sed -i 's,#include.*libotr,&3,' otr.h
+
+ make
}
package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
- install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
- install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
- install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
- install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
+ install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
+ install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
+ install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
+ install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
}