Index: head/net/netatalk3/Makefile
===================================================================
--- head/net/netatalk3/Makefile	(revision 404953)
+++ head/net/netatalk3/Makefile	(revision 404954)
@@ -1,160 +1,159 @@
 # Created by: stb
 # $FreeBSD$
 
 PORTNAME=	netatalk
-PORTVERSION=	3.1.7
-PORTREVISION=	3
+PORTVERSION=	3.1.8
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	3
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	File server for Mac OS X
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
     		libevent.so:${PORTSDIR}/devel/libevent2
 
 USE_BDB=	5+
 USES=		iconv gmake pkgconfig perl5 libtool tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	netatalk
 
 CONFIGURE_ARGS+=	--with-pkgconfdir=${PREFIX}/etc \
 			--with-libgcrypt-dir=${LOCALBASE} \
 			--with-uams-path=${PREFIX}/libexec/netatalk-uams \
 			--with-bdb=${LOCALBASE} \
 			${ICONV_CONFIGURE_BASE} \
 			--localstatedir=/var \
 			--disable-bundled-libevent \
 			--with-libevent-header=${LOCALBASE}/include \
 			--with-libevent-lib=${LOCALBASE}/lib
 
 OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL TCPWRAP
 OPTIONS_DEFAULT=KERBEROS DBUS TCPWRAP
 OPTIONS_RADIO=ZEROCONF
 OPTIONS_RADIO_ZEROCONF=AVAHI MDNSRESPONDER
 OPTIONS_DEFAULT+=AVAHI
 
 NOZEROCONF_DESC=Disable Zeroconf(Bonjour) support
 KRB5_DESC=	Enable Kerberos V UAM
 #DTRACE_DESC=	Enable DTrace support
 MYSQL_DESC=	Enable MySQL CNID backend support
 SENDFILE_DESC=	Enable Sendfile support
 ACL_DESC=	Enable ACL support
 TCPWRAP_DESC=	Enable TCP Wrappers support
 
 .include <bsd.port.options.mk>
 
 CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]*
 
 .if ${PORT_OPTIONS:MKRB5}
 CONFIGURE_ARGS+=	--enable-krbV-uam
 PLIST_SUB+=		NETATALKKRB5=""
 .else
 PLIST_SUB+=		NETATALKKRB5="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 CONFIGURE_ARGS+=	--with-dtrace
 .else
 CONFIGURE_ARGS+=	--without-dtrace
 .endif
 
 .if ${PORT_OPTIONS:MKERBEROS}
 CONFIGURE_ARGS+=	--with-kerberos
 .else
 CONFIGURE_ARGS+=	--without-kerberos
 .endif
 
 .if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--with-pam
 PLIST_SUB+=		NETATALKPAM=""
 .else
 CONFIGURE_ARGS+=	--without-pam
 PLIST_SUB+=		NETATALKPAM="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNOZEROCONF}
 CONFIGURE_ARGS+=	--disable-zeroconf
 SUB_LIST+=		ZEROCONF=""
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
 CONFIGURE_ARGS+=	--enable-zeroconf=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 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+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 SUB_LIST+=		ZEROCONF="mdnsd"
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
 CFLAGS+=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 USE_OPENLDAP=		yes
 .else
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if ${PORT_OPTIONS:MSENDFILE}
 CONFIGURE_ARGS+=	--enable-sendfile
 .else
 CONFIGURE_ARGS+=	--disable-sendfile
 .endif
 
 .if ${PORT_OPTIONS:MDBUS} || exists(${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc)
 USES+=			python:2
 LIB_DEPENDS+=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/_dbus.py:${PORTSDIR}/devel/py-dbus
 PLIST_SUB+=		DBUS=""
 .else
 PLIST_SUB+=		DBUS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 .else
 CONFIGURE_ARGS+=--with-mysql-config=/nonexistent
 .endif
 
 .if ${PORT_OPTIONS:MACL}
 LIB_DEPENDS+=	libsunacl.so:${PORTSDIR}/sysutils/libsunacl
 CONFIGURE_ARGS+=--with-acls
 .else
 CONFIGURE_ARGS+=--without-acls
 .endif
 
 .if ${PORT_OPTIONS:MTCPWRAP}
 CONFIGURE_ARGS+=--enable-tcp-wrappers
 .else
 CONFIGURE_ARGS+=--disable-tcp-wrappers
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
 	    	s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/configure
 
 post-stage:
 	@${RM} -f ${STAGEDIR}${PREFIX}/etc/afp.conf \
 		${STAGEDIR}${PREFIX}/etc/extmap.conf
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
 		${STAGEDIR}${PREFIX}/bin/macusers
 	[ -f ${STAGEDIR}${PREFIX}/etc/afp.conf ] || \
 		${INSTALL_DATA} -c ${STAGEDIR}${PREFIX}/etc/afp.conf.dist ${STAGEDIR}${PREFIX}/etc/afp.conf
 	[ -f ${STAGEDIR}${PREFIX}/etc/extmap.conf ] || \
 		${INSTALL_DATA} -c ${STAGEDIR}${PREFIX}/etc/extmap.conf.dist ${STAGEDIR}${PREFIX}/etc/extmap.conf
 
 .include <bsd.port.mk>
Index: head/net/netatalk3/distinfo
===================================================================
--- head/net/netatalk3/distinfo	(revision 404953)
+++ head/net/netatalk3/distinfo	(revision 404954)
@@ -1,2 +1,2 @@
-SHA256 (netatalk-3.1.7.tar.bz2) = e4049399e4e7d477f843a9ec4bd64f70eb7c7af946e890311140fd8fbd4bc071
-SIZE (netatalk-3.1.7.tar.bz2) = 1780078
+SHA256 (netatalk-3.1.8.tar.bz2) = 34668d5f53b780e9f143c2d7ee06ebc1c2bd7758c60ca483c8b08da27dcc4d4c
+SIZE (netatalk-3.1.8.tar.bz2) = 1802404
Index: head/net/netatalk3/files/patch-configure
===================================================================
--- head/net/netatalk3/files/patch-configure	(revision 404953)
+++ head/net/netatalk3/files/patch-configure	(revision 404954)
@@ -1,11 +1,11 @@
---- configure.orig	2012-04-26 10:27:12.000000000 -0400
-+++ configure	2012-07-08 21:21:38.000000000 -0400
-@@ -18150,7 +18150,7 @@ if test "x$bdb_required" = "xyes"; then
+--- configure.orig	2015-12-28 21:02:04.000000000 -0500
++++ configure	2015-12-31 12:34:21.340885027 -0500
+@@ -17342,7 +17342,7 @@ if test "x$bdb_required" = "xyes"; then
      trybdbdir=""
      dobdbsearch=yes
      bdb_search_dirs="/usr/local /usr"
--    search_subdirs="/ /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
-+    search_subdirs="/%%DB_NAME%% / /db5 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
+-    search_subdirs="/ /db6.1 /db6 /db5 /db5.3 /db5.2 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
++    search_subdirs="/%%DB_NAME%% / /db6.1 /db6 /db5 /db5.3 /db5.2 /db5.1 /db51 /db5.0 /db50 /db4.8 /db48 /db4.7 /db47 /db4.6 /db46 /db4"
  
      bdbfound=no
      savedcflags="$CFLAGS"
Index: head/net/netatalk3/pkg-plist
===================================================================
--- head/net/netatalk3/pkg-plist	(revision 404953)
+++ head/net/netatalk3/pkg-plist	(revision 404954)
@@ -1,92 +1,92 @@
 bin/ad
 bin/afpldaptest
 bin/afppasswd
 %%DBUS%%bin/afpstats
 bin/apple_dump
 bin/asip-status.pl
 bin/cnid2_create
 bin/dbd
 bin/macusers
 bin/netatalk-config
 @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
 %%DBUS%%etc/dbus-1/system.d/netatalk-dbus.conf
 %%DBUS%%etc/dbus-session.conf.netatalk
 @unexec if cmp -s %D/etc/extmap.conf %D/etc/extmap.conf.dist; then rm -f %D/etc/extmap.conf; fi
 etc/extmap.conf.dist
 @exec [ -f %B/extmap.conf ] || cp %B/%f %B/extmap.conf
 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.so
 libexec/netatalk-uams/uams_dhx2_passwd.a
 libexec/netatalk-uams/uams_dhx2_passwd.so
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.a
 %%NETATALKPAM%%libexec/netatalk-uams/uams_dhx_pam.so
 libexec/netatalk-uams/uams_dhx_passwd.a
 libexec/netatalk-uams/uams_dhx_passwd.so
 %%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.a
 %%NETATALKKRB5%%libexec/netatalk-uams/uams_gss.so
 libexec/netatalk-uams/uams_guest.a
 libexec/netatalk-uams/uams_guest.so
 %%NETATALKPAM%%libexec/netatalk-uams/uams_pam.a
 %%NETATALKPAM%%libexec/netatalk-uams/uams_pam.so
 libexec/netatalk-uams/uams_passwd.a
 libexec/netatalk-uams/uams_passwd.so
 libexec/netatalk-uams/uams_randnum.a
 libexec/netatalk-uams/uams_randnum.so
 include/atalk/acl.h
 include/atalk/adouble.h
 include/atalk/afp.h
 include/atalk/bstrlib.h
 include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/dictionary.h
 include/atalk/ea.h
 include/atalk/globals.h
 include/atalk/hash.h
 include/atalk/iniparser.h
 include/atalk/list.h
 include/atalk/logger.h
 include/atalk/netatalk_conf.h
 include/atalk/paths.h
 include/atalk/standards.h
 include/atalk/uam.h
 include/atalk/unicode.h
 include/atalk/unix.h
 include/atalk/util.h
 include/atalk/vfs.h
 include/atalk/volume.h
 lib/libatalk.a
 lib/libatalk.so
-lib/libatalk.so.16
-lib/libatalk.so.16.0.0
+lib/libatalk.so.17
+lib/libatalk.so.17.0.0
 man/man1/ad.1.gz
 man/man1/afpldaptest.1.gz
 man/man1/afppasswd.1.gz
 %%DBUS%%man/man1/afpstats.1.gz
 man/man1/apple_dump.1.gz
 man/man1/asip-status.pl.1.gz
 man/man1/dbd.1.gz
 man/man1/macusers.1.gz
 man/man1/netatalk-config.1.gz
 man/man1/uniconv.1.gz
 man/man5/afp.conf.5.gz
 man/man5/afp_signature.conf.5.gz
 man/man5/afp_voluuid.conf.5.gz
 man/man5/extmap.conf.5.gz
 man/man8/afpd.8.gz
 man/man8/cnid_dbd.8.gz
 man/man8/cnid_metad.8.gz
 man/man8/netatalk.8.gz
 sbin/afpd
 sbin/cnid_dbd
 sbin/cnid_metad
 sbin/netatalk
 share/aclocal/netatalk.m4
 /var/netatalk/CNID/README
 /var/netatalk/README
 @dir /var/netatalk/CNID
 @dir /var/netatalk