Update to 3.1.2. See http://netatalk.sourceforge.net/3.1/ReleaseNotes3.1.2.html

for the changes in this release.

4 files changed, 8 insertions, 32 deletions

diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 3413d07b4410..d7949fd8ece6 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netatalk
-PORTVERSION=	3.1.1
-PORTREVISION=	2
+PORTVERSION=	3.1.2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
@@ -18,10 +17,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
     		libevent-2.0.so:${PORTSDIR}/devel/libevent2
 
-USE_AUTOTOOLS=	libtool
 USE_BDB=	5+
-USE_BZIP2=	yes
-USES=		iconv gmake pkgconfig perl5
+USES=		iconv gmake pkgconfig perl5 libtool tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	netatalk
diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo
index 8fa0b68cd93d..f9e1104253ac 100644
--- a/net/netatalk3/distinfo
+++ b/net/netatalk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netatalk-3.1.1.tar.bz2) = 1b4e45871d9f17a9b72ddbc6e1978eebd3c729ba2eeffa4ec3b710e023c07727
-SIZE (netatalk-3.1.1.tar.bz2) = 1789482
+SHA256 (netatalk-3.1.2.tar.bz2) = 040b6e9add6ad9f2a0a9a58f5f1381ee5e6b9a60e7610f6722747c834f1de990
+SIZE (netatalk-3.1.2.tar.bz2) = 1785777
diff --git a/net/netatalk3/files/patch-libatalk_vfs_extattr.c b/net/netatalk3/files/patch-libatalk_vfs_extattr.c
index 70e25e64aa45..f804823dd74d 100644
--- a/net/netatalk3/files/patch-libatalk_vfs_extattr.c
+++ b/net/netatalk3/files/patch-libatalk_vfs_extattr.c
@@ -1,5 +1,5 @@
---- libatalk/vfs/extattr.c.orig	2013-10-18 07:57:33.000000000 -0400
-+++ libatalk/vfs/extattr.c	2014-05-27 12:31:57.000000000 -0400
+--- libatalk/vfs/extattr.c.orig	2014-06-03 01:40:44.000000000 -0400
++++ libatalk/vfs/extattr.c	2014-06-07 14:09:11.000000000 -0400
 @@ -193,6 +193,8 @@ ssize_t sys_fgetxattr (int filedes, cons
      const char *attrname = ((s=strchr(name, '.')) == NULL) ? name : s + 1;
  
@@ -9,14 +9,3 @@
          if(retval > size) {
              errno = ERANGE;
              return -1;
-@@ -241,6 +243,10 @@ ssize_t sys_lgetxattr (const char *path,
- #elif defined(HAVE_EXTATTR_GET_LINK)
- 	ssize_t retval;
- 	if((retval=extattr_get_link(path, EXTATTR_NAMESPACE_USER, uname, NULL, 0)) >= 0) {
-+		if (size == 0) {
-+			/* size == 0 means only return size */
-+			return retval;
-+		}
- 		if(retval > size) {
- 			errno = ERANGE;
- 			return -1;
diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist
index 47c958743985..0bb0dc43d5b6 100644
--- a/net/netatalk3/pkg-plist
+++ b/net/netatalk3/pkg-plist
@@ -8,7 +8,6 @@ bin/cnid2_create
 bin/dbd
 bin/macusers
 bin/netatalk-config
-bin/uniconv
 @unexec if cmp -s %D/etc/afp.conf %D/etc/afp.conf.dist; then rm -f %D/etc/afp.conf; fi
 etc/afp.conf.dist
 @exec [ -f %B/afp.conf ] || cp %B/%f %B/afp.conf
@@ -21,31 +20,22 @@ libexec/netatalk-uams/uams_clrtxt.so
 libexec/netatalk-uams/uams_dhx.so
 libexec/netatalk-uams/uams_dhx2.so
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx2_pam.a
-%%NETATALKPAM%%libexec/netatalk-uams/uams_dhx2_pam.la
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx2_pam.so
 libexec/netatalk-uams/uams_dhx2_passwd.a
-libexec/netatalk-uams/uams_dhx2_passwd.la
 libexec/netatalk-uams/uams_dhx2_passwd.so
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.a
-%%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.la
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.so
 libexec/netatalk-uams/uams_dhx_passwd.a
-libexec/netatalk-uams/uams_dhx_passwd.la
 libexec/netatalk-uams/uams_dhx_passwd.so
 %%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.a
-%%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.la
 %%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.so
 libexec/netatalk-uams/uams_guest.a
-libexec/netatalk-uams/uams_guest.la
 libexec/netatalk-uams/uams_guest.so
 %%NETATALKPAM%%libexec/netatalk-uams/uams_pam.a
-%%NETATALKPAM%%libexec/netatalk-uams/uams_pam.la
 %%NETATALKPAM%%libexec/netatalk-uams/uams_pam.so
 libexec/netatalk-uams/uams_passwd.a
-libexec/netatalk-uams/uams_passwd.la
 libexec/netatalk-uams/uams_passwd.so
 libexec/netatalk-uams/uams_randnum.a
-libexec/netatalk-uams/uams_randnum.la
 libexec/netatalk-uams/uams_randnum.so
 include/atalk/acl.h
 include/atalk/adouble.h
@@ -70,9 +60,9 @@ include/atalk/util.h
 include/atalk/vfs.h
 include/atalk/volume.h
 lib/libatalk.a
-lib/libatalk.la
 lib/libatalk.so
-lib/libatalk.so.13
+lib/libatalk.so.14
+lib/libatalk.so.14.0.0
 man/man1/ad.1.gz
 man/man1/afpldaptest.1.gz
 man/man1/afppasswd.1.gz