diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index d143597311b..3340834fdf9 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba version=3.6.25 -revision=7 +revision=8 build_pie=yes build_wrksrc=source3 build_style=gnu-configure @@ -22,7 +22,7 @@ distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz" checksum=8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 lib32disabled=yes -conf_files="/etc/pam.d/samba" +conf_files="/etc/pam.d/samba /etc/samba/smb.conf" make_dirs="/etc/samba/private 0750 root root" hostmakedepends="pkg-config perl python-devel" makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel mit-krb5-devel @@ -88,11 +88,18 @@ post_install() { smbclient_package() { short_desc="Command-line SMB/CIFS clients for Unix" - conf_files="/etc/samba/smb.conf" pkg_install() { - vmove etc/samba/smb.conf - vmove usr/bin vmove usr/share/man/man1 + + # Determine which binaries are client and which are server + # by looking at manpage suffix, and vmove the client + # binaries. Ugly. + for f in "$PKGDESTDIR"/usr/share/man/man1/*.1; do + g=$(basename "${f}" .1) + if [ -e "${DESTDIR}/usr/bin/${g}" ]; then + vmove usr/bin/${g} + fi + done } } libsmbclient_package() {