Update to 3.1.1. See http://netatalk.sourceforge.net/3.1/ReleaseNotes3.1.1.html

for the list of changes in this release.

Additionally, fix some new LIB_DEPENDS usage, and adjust the pkg-descr to
match reality [1].

PR:		187658 [1]

7 files changed, 30 insertions, 56 deletions

diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 5779798d4f50..f6d0610ed4c2 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	netatalk
-PORTVERSION=	3.1.0
-PORTREVISION=	4
+PORTVERSION=	3.1.1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/3.1
+#MASTER_SITE_SUBDIR=${PORTNAME}/${PORTNAME}/3.1
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	marcus@FreeBSD.org
@@ -19,7 +18,7 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
     		libevent-2.0.so:${PORTSDIR}/devel/libevent2
 
 USE_AUTOTOOLS=	libtool
-USE_BDB=	46+
+USE_BDB=	5+
 USE_BZIP2=	yes
 USES=		iconv gmake pkgconfig perl5
 GNU_CONFIGURE=	yes
@@ -46,8 +45,8 @@ OPTIONS_DEFAULT+=AVAHI
 NOZEROCONF_DESC=Disable Zeroconf(Bonjour) support
 KRB5_DESC=	Enable Kerberos V UAM
 DTRACE_DESC=	Enable DTrace support
-SENDFILE_DESC=	Enable Sendfile support
 MYSQL_DESC=	Enable MySQL CNID backend support
+SENDFILE_DESC=	Enable Sendfile support
 ACL_DESC=	Enable ACL support
 
 .include <bsd.port.options.mk>
@@ -89,14 +88,14 @@ SUB_LIST+=		ZEROCONF=""
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi-app
+LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
 SUB_LIST+=		ZEROCONF="avahi_daemon"
 .endif
 
 .if ${PORT_OPTIONS:MMDNSRESPONDER}
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-LIB_DEPENDS+=		dns_sd:${PORTSDIR}/net/mDNSResponder
+LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 SUB_LIST+=		ZEROCONF="mdnsd"
 .endif
 
@@ -115,7 +114,7 @@ CONFIGURE_ARGS+=	--disable-sendfile
 .endif
 
 .if ${PORT_OPTIONS:MDBUS} || exists(${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc)
-LIB_DEPENDS+=		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
 PLIST_SUB+=		DBUS=""
 .else
@@ -129,7 +128,7 @@ CONFIGURE_ARGS+=--with-mysql-config=/nonexistent
 .endif
 
 .if ${PORT_OPTIONS:MACL}
-LIB_DEPENDS+=	sunacl:${PORTSDIR}/sysutils/libsunacl
+LIB_DEPENDS+=	libsunacl.so:${PORTSDIR}/sysutils/libsunacl
 CONFIGURE_ARGS+=--with-acls
 .else
 CONFIGURE_ARGS+=--without-acls
diff --git a/net/netatalk3/distinfo b/net/netatalk3/distinfo
index 4efea98e6f2c..8fa0b68cd93d 100644
--- a/net/netatalk3/distinfo
+++ b/net/netatalk3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netatalk-3.1.0.tar.bz2) = 18626e1674e4eace896ece44f06650e75f70130f4bf5403dd17152ad3d620db5
-SIZE (netatalk-3.1.0.tar.bz2) = 1802913
+SHA256 (netatalk-3.1.1.tar.bz2) = 1b4e45871d9f17a9b72ddbc6e1978eebd3c729ba2eeffa4ec3b710e023c07727
+SIZE (netatalk-3.1.1.tar.bz2) = 1789482
diff --git a/net/netatalk3/files/patch-etc-cnid_bdb_cmd_dbd_scanvol.c b/net/netatalk3/files/patch-etc-cnid_bdb_cmd_dbd_scanvol.c
new file mode 100644
index 000000000000..5ad7f057b957
--- /dev/null
+++ b/net/netatalk3/files/patch-etc-cnid_bdb_cmd_dbd_scanvol.c
@@ -0,0 +1,11 @@
+--- etc/cnid_bdb/cmd_dbd_scanvol.c.orig	2014-03-18 17:42:49.000000000 -0400
++++ etc/cnid_bdb/cmd_dbd_scanvol.c	2014-03-18 17:43:31.000000000 -0400
+@@ -616,7 +616,7 @@ static int check_orphaned(const char *na
+     struct stat sb;
+ 
+     if (strlen(name) < 3)
+-        return;
++        return 0;
+ 
+     rc = lstat(&name[2], &sb);
+ 
diff --git a/net/netatalk3/files/patch-etc_afpd_afp_mdns.c b/net/netatalk3/files/patch-etc_afpd_afp_mdns.c
deleted file mode 100644
index 7e6ba634e982..000000000000
--- a/net/netatalk3/files/patch-etc_afpd_afp_mdns.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- etc/afpd/afp_mdns.c.orig	2014-01-21 15:12:49.465373000 +0000
-+++ etc/afpd/afp_mdns.c	2014-01-21 15:15:03.618213000 +0000
-@@ -36,18 +36,16 @@ static pthread_t       poller;
- /*
-  * Its easier to use asprintf to set the TXT record values
-  */
--#define TXTRecordPrintf(rec, key, args, ...) {           \
--        char *str;                                      \
--        asprintf(&str, args);                           \
-+#define TXTRecordPrintf(rec, key, args...) {           \
-+        char str[1024];                                      \
-+        sprintf(str, args);                           \
-         TXTRecordSetValue(rec, key, strlen(str), str);  \
--        free(str);                                      \
-     }
--#define TXTRecordKeyPrintf(rec, k, var, args, ...) {     \
--        char *key, *str;                                \
--        asprintf(&key, k, var);                         \
--        asprintf(&str, args);                           \
-+#define TXTRecordKeyPrintf(rec, k, var, args...) {     \
-+        char key[1024], str[1024];                                \
-+        sprintf(key, k, var);                         \
-+        sprintf(str, args);                           \
-         TXTRecordSetValue(rec, key, strlen(str), str);  \
--        free(str); free(key);                           \
-     }
- 
- static struct pollfd *fds;
diff --git a/net/netatalk3/files/patch-etc_apfd_Makefile.in b/net/netatalk3/files/patch-etc_apfd_Makefile.in
index 3e1c5693d6a6..aae2407073ba 100644
--- a/net/netatalk3/files/patch-etc_apfd_Makefile.in
+++ b/net/netatalk3/files/patch-etc_apfd_Makefile.in
@@ -1,15 +1,15 @@
---- etc/afpd/Makefile.in.orig	2013-10-28 11:49:56.000000000 -0400
-+++ etc/afpd/Makefile.in	2013-11-11 10:38:34.000000000 -0500
-@@ -170,7 +170,7 @@ AM_V_at = $(am__v_at_@AM_V@)
- am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
- am__v_at_0 = @
- am__v_at_1 = 
+--- etc/afpd/Makefile.in.orig	2014-03-13 07:33:40.000000000 -0400
++++ etc/afpd/Makefile.in	2014-03-17 15:02:55.000000000 -0400
+@@ -141,7 +141,7 @@ spot_DEPENDENCIES = $(top_builddir)/liba
+ spot_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(spot_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
  am__mv = mv -f
-@@ -433,7 +433,7 @@ afpd_SOURCES = afp_avahi.c afp_config.c 
+@@ -404,7 +404,7 @@ afpd_SOURCES = afp_avahi.c afp_config.c 
  afpd_LDADD = $(top_builddir)/libatalk/libatalk.la @LIBGCRYPT_LIBS@ \
  	@QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ \
  	@ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@ \
diff --git a/net/netatalk3/pkg-descr b/net/netatalk3/pkg-descr
index ad933ec4bcd4..a08a98cd62cb 100644
--- a/net/netatalk3/pkg-descr
+++ b/net/netatalk3/pkg-descr
@@ -2,18 +2,10 @@ Netatalk is an OpenSource software package, that can be used to turn an
 inexpensive *NIX machine into an extremely high-performance and reliable
 file server for Macintosh computers.
 
-Using Netatalk's AFP 3.2 compliant file-server leads to significantly higher
+Using Netatalk's AFP 3.4 compliant file-server leads to significantly higher
 transmission speeds compared with Macs accessing a server via SaMBa/NFS
 while providing clients with the best possible user experience (full support
 for Macintosh metadata, flawlessly supporting mixed environments of classic
 MacOS and MacOS X clients)
 
-Due to Netatalk speaking AppleTalk, the print-server task can provide
-printing clients with full AppleTalk support as well as the server itself
-with printing capabilities for AppleTalk-only printers.  Starting with
-version 2.0, Netatalk seamlessly interacts with CUPS on the server.
-
-After all, Netatalk can be used to act as an AppleTalk router, providing
-both segmentation and zone names in Macintosh networks.
-
 WWW: http://netatalk.sourceforge.net/
diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist
index c1e1713d09fd..47c958743985 100644
--- a/net/netatalk3/pkg-plist
+++ b/net/netatalk3/pkg-plist
@@ -72,7 +72,7 @@ include/atalk/volume.h
 lib/libatalk.a
 lib/libatalk.la
 lib/libatalk.so
-lib/libatalk.so.12
+lib/libatalk.so.13
 man/man1/ad.1.gz
 man/man1/afpldaptest.1.gz
 man/man1/afppasswd.1.gz