summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/samba32/Makefile4
-rw-r--r--net/samba32/distinfo6
2 files changed, 5 insertions, 5 deletions
diff --git a/net/samba32/Makefile b/net/samba32/Makefile
index dacc3fd5f3f0..37a4c42023ef 100644
--- a/net/samba32/Makefile
+++ b/net/samba32/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION?= 3.2.13
+PORTVERSION?= 3.2.14
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= . old-versions rc pre
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
MAINTAINER?= timur@FreeBSD.org
COMMENT?= A free SMB and CIFS client and server for UNIX
-CONFLICTS?= *samba-3.[03].* samba4* tdb-1.*
+CONFLICTS?= *samba-3.[03].* samba4* tdb-1.* talloc-1.*
USE_GMAKE= yes
USE_ICONV= yes
diff --git a/net/samba32/distinfo b/net/samba32/distinfo
index 054f1ad7fb02..6f2c185dbfd5 100644
--- a/net/samba32/distinfo
+++ b/net/samba32/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.2.13.tar.gz) = aed1c2df274f504d4e7d4883da4581f6
-SHA256 (samba-3.2.13.tar.gz) = 91223a742183675cb3bb9ba1cc379948e8666e69735f348ea7d3794ce3bc778d
-SIZE (samba-3.2.13.tar.gz) = 24436090
+MD5 (samba-3.2.14.tar.gz) = 6c744ab876f2199ebc432d41ecf0b743
+SHA256 (samba-3.2.14.tar.gz) = acf7ed40d6e115f31679bcf8d43fbbfa0950ef69ac27118d1d5404c79f8cbd40
+SIZE (samba-3.2.14.tar.gz) = 24436302