summaryrefslogtreecommitdiffstats
path: root/main/talloc
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2011-02-04 21:28:58 +0200
committerTimo Teräs <timo.teras@iki.fi>2011-02-04 21:28:58 +0200
commit820ca1e1df361daf29fdc8fbfe2450961b83f9c5 (patch)
tree8bcea1c8b81aaf296f3841bbe32043783b6f22b2 /main/talloc
parent6d8e169e5a8dc6d7ca5857e8488255ab21b10a38 (diff)
downloadaports-820ca1e1df361daf29fdc8fbfe2450961b83f9c5.tar.bz2
aports-820ca1e1df361daf29fdc8fbfe2450961b83f9c5.tar.xz
main/talloc, samba: fix libtalloc conflict
* make samba use talloc provided libraries * allow talloc to overwrite libtalloc from samba-common
Diffstat (limited to 'main/talloc')
-rw-r--r--main/talloc/APKBUILD3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/talloc/APKBUILD b/main/talloc/APKBUILD
index ce86bb139..efc486367 100644
--- a/main/talloc/APKBUILD
+++ b/main/talloc/APKBUILD
@@ -2,13 +2,14 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=talloc
pkgver=2.0.5
-pkgrel=0
+pkgrel=1
pkgdesc="memory pool management library"
url="http://talloc.samba.org/"
arch="all"
license="LGPL"
depends=
depends_dev=
+replaces="samba-common"
makedepends="$depends_dev python"
install=""
subpackages="$pkgname-dev"