diff -Nur /usr/ports/net/netatalk/Makefile ./Makefile
--- /usr/ports/net/netatalk/Makefile	2010-05-15 11:18:30.245409640 +0000
+++ ./Makefile	2010-05-22 09:57:15.000000000 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	SF
@@ -23,12 +23,12 @@
 USE_AUTOTOOLS=	libtool:22
 USE_BZIP2=	yes
 USE_ICONV=	yes
-USE_BDB=	41+
+USE_BDB=	46+
 USE_RC_SUBR=	netatalk
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc \
 			--with-libiconv=${LOCALBASE} \
-			--with-libgcrypt-prefix=${LOCALBASE}
+			--with-libgcrypt-dir=${LOCALBASE}
 
 .if defined(WITH_KRB5)
 CONFIGURE_ARGS+=	--enable-krbV-uam
@@ -37,6 +37,11 @@
 PLIST_SUB+=		NETATALKKRB5="@comment "
 .endif
 
+.if defined(WITH_APPLETALK)
+CONFIGURE_ARGS+=	--with-ddp
+.else
+CONFIGURE_ARGS+=	--without-ddp
+.endif
 .if defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam
 PLIST_SUB+=		NETATALKPAM=""
@@ -63,18 +68,18 @@
 		atalkd.conf papd.conf netatalk.conf
 LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
 		binheader nadheader
-MAN1=		achfile.1 aecho.1 afile.1 afppasswd.1 getzones.1 \
-		megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 macbinary.1 \
-		nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \
-		single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \
-		netatalk-config.1 apple_cp.1 apple_mv.1 \
-		apple_rm.1 uniconv.1 asip-status.pl.1 cnid_index.1
+MAN1=		achfile.1 ad.1 aecho.1 afile.1 afppasswd.1 apple_cp.1 \
+		apple_dump.1 apple_mv.1 apple_rm.1 asip-status.pl.1 dbd.1 \
+		getzones.1 hqx2bin.1 macbinary.1 megatron.1 nbp.1 nbplkup.1 \
+		nbprgstr.1 nbpunrgstr.1 netatalk-config.1 pap.1 papstatus.1 \
+		psorder.1 single2bin.1 unbin.1 unhex.1 uniconv.1 unsingle.1
 MAN3=		atalk_aton.3 nbp_name.3
 MAN4=		atalk.4
-MAN5=		AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
-		netatalk.conf.5 papd.conf.5
-MAN8=		afpd.8 atalkd.8 cnid_dbd.8 cnid_metad.8 papd.8 papstatus.8 \
-		psf.8 timelord.8
+MAN5=		AppleVolumes.5 AppleVolumes.default.5 \
+		AppleVolumes.system.5 afp_ldap.conf.5 afp_signature.conf.5 \
+		afpd.conf.5 atalkd.conf.5 netatalk.conf.5 papd.conf.5
+MAN8=		afp_acls.8 afpd.8 atalkd.8 cnid_dbd.8 cnid_metad.8 papd.8 \
+		papstatus.8 psf.8 timelord.8
 
 CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-1*
 
diff -Nur /usr/ports/net/netatalk/distinfo ./distinfo
--- /usr/ports/net/netatalk/distinfo	2009-12-05 14:13:24.864646269 +0000
+++ ./distinfo	2010-05-20 19:04:47.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (netatalk-2.0.5.tar.bz2) = 3bd8f4780abc373e0539ab7cd1f9950f
-SHA256 (netatalk-2.0.5.tar.bz2) = aa11b26ad5c6cfb6043458fc849ed82b13b6d13219191a6335fce1bc76288b37
-SIZE (netatalk-2.0.5.tar.bz2) = 993882
+MD5 (netatalk-2.1.tar.bz2) = b780f98a8764daab45d288579320a8a0
+SHA256 (netatalk-2.1.tar.bz2) = 7302b06096dd915e8cf066275e7f0fa1da982cceb234975a274b92f3f56d753c
+SIZE (netatalk-2.1.tar.bz2) = 1120025
diff -Nur /usr/ports/net/netatalk/files/patch-config_Makefile.in ./files/patch-config_Makefile.in
--- /usr/ports/net/netatalk/files/patch-config_Makefile.in	2004-10-12 02:09:27.000000000 +0000
+++ ./files/patch-config_Makefile.in	2010-05-20 20:22:21.000000000 +0000
@@ -1,6 +1,15 @@
---- config/Makefile.in.orig	Mon Mar 22 19:22:45 2004
-+++ config/Makefile.in	Sat Jun  5 22:08:04 2004
-@@ -386,22 +386,11 @@
+--- config/Makefile.in.orig	2010-04-22 07:59:53.000000000 +0000
++++ config/Makefile.in	2010-05-20 20:21:51.000000000 +0000
+@@ -590,19 +590,15 @@
+ 
+ uninstall-local:
+ 	for f in $(CONFFILES) $(GENFILES); do \
+-		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
+-		rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
++		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
++		rm -f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
+ 	done
+ 
  install-config-files: $(CONFFILES) $(GENFILES)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
  	for f in $(CONFFILES) $(GENFILES); do \
@@ -14,14 +23,4 @@
 +		$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)/$$f.dist; \
  	done
  
- @USE_PAM_TRUE@install-data-local: install-config-files $(PAMFILES)
--@USE_PAM_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pamdir)
--@USE_PAM_TRUE@	if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pamdir)/netatalk; then \
--@USE_PAM_TRUE@	    echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk"; \
--@USE_PAM_TRUE@	    $(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || echo "WARNING: Can't install PAM files";		\
--@USE_PAM_TRUE@	else \
--@USE_PAM_TRUE@	    echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
--@USE_PAM_TRUE@	fi; 
- 
- @USE_PAM_FALSE@install-data-local: install-config-files
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ install-webmin:
diff -Nur /usr/ports/net/netatalk/files/patch-config_netatalk.conf ./files/patch-config_netatalk.conf
--- /usr/ports/net/netatalk/files/patch-config_netatalk.conf	2009-07-10 16:41:49.852722313 +0000
+++ ./files/patch-config_netatalk.conf	2010-05-20 19:15:04.000000000 +0000
@@ -1,47 +1,43 @@
---- config/netatalk.conf.orig	2009-04-30 05:30:13.000000000 -0400
-+++ config/netatalk.conf	2009-06-13 22:48:55.000000000 -0400
+--- config/netatalk.conf.orig	2010-04-19 11:35:26.000000000 +0000
++++ config/netatalk.conf	2010-05-20 19:14:32.000000000 +0000
 @@ -1,4 +1,5 @@
--# Appletalk configuration
+-# Netatalk configuration
 +# netatalk configuration
 +# For details see man netatalk.conf
  # Change this to increase the maximum number of clients that can connect:
- AFPD_MAX_CLIENTS=50
+ AFPD_MAX_CLIENTS=20
  
-@@ -8,17 +9,8 @@ AFPD_MAX_CLIENTS=50
- # NOTE: If Netatalk should register AppleTalk services in the standard zone
- #       then you need not to specify a zone name here.
- #
--#       If your zone has spaces in it, you're better off specifying
--#       it in afpd.conf if you realize that your distribution doesn't
--#       handle spaces correctly in the startup script. Remember to use
--#       quotes here if the zone name contains spaces.
--#
- #ATALK_ZONE="@some zone"
+@@ -6,7 +7,7 @@
+ # NOTE: if your zone has spaces in it, you're better off specifying
+ #       it in afpd.conf
+ #ATALK_ZONE=@zone
 -ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
--
--# specify the Mac and unix charsets to be used
--ATALK_MAC_CHARSET='MAC_ROMAN'
--ATALK_UNIX_CHARSET='LOCALE'
 +ATALK_NAME=`/bin/hostname -s`
  
- # specify this if you don't want dhx and dhx2
- # available options: uams_guest.so, uams_clrtxt.so, 
-@@ -28,18 +20,3 @@ ATALK_UNIX_CHARSET='LOCALE'
- 
+ # specify the Mac and unix charsets to be used
+ ATALK_MAC_CHARSET='MAC_ROMAN'
+@@ -20,24 +21,5 @@
  # Change this to set the id of the guest user
  AFPD_GUEST=nobody
--
--# Set which daemons to run (papd is dependent upon atalkd):
--ATALKD_RUN=yes
+ 
+-# Set which daemons to run.
+-# If you need legacy AppleTalk, run atalkd.
+-# papd, timelord and a2boot are dependent upon atalkd.
+-# If you use "AFP over TCP" server only, run only cnid_metad and afpd.
+-ATALKD_RUN=no
 -PAPD_RUN=no
--CNID_METAD_RUN=yes
--AFPD_RUN=yes
 -TIMELORD_RUN=no
 -A2BOOT_RUN=no
+-CNID_METAD_RUN=yes
+-AFPD_RUN=yes
 -
--# Control whether the daemons are started in the background
+-# Control whether the daemons are started in the background.
+-# If it is dissatisfied that atalkd starts slowly, set "yes".
 -ATALK_BGROUND=no
 -
 -# export the charsets, read form ENV by apps
 -export ATALK_MAC_CHARSET
 -export ATALK_UNIX_CHARSET
+-
+ # config for cnid_metad. Default log config:
+ # CNID_CONFIG="-l log_note"
diff -Nur /usr/ports/net/netatalk/files/patch-configure ./files/patch-configure
--- /usr/ports/net/netatalk/files/patch-configure	2009-07-10 16:41:49.855722448 +0000
+++ ./files/patch-configure	2010-05-20 19:17:42.000000000 +0000
@@ -1,11 +1,11 @@
---- configure.orig	2009-03-29 03:24:33.000000000 -0400
-+++ configure	2009-06-13 22:52:07.000000000 -0400
-@@ -30193,7 +30193,7 @@ if test "x$bdb_required" = "xyes"; then
+--- configure.orig	2010-04-22 07:59:58.000000000 +0000
++++ configure	2010-05-20 19:17:21.000000000 +0000
+@@ -30958,7 +30958,7 @@
      trybdbdir=""
      dobdbsearch=yes
      bdb_search_dirs="/usr/local /usr"
--    search_subdirs="/ /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 /db4"
-+    search_subdirs="/%%DB_NAME%% / /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4.3 /db43 /db4.2 /db42 /db4.1 /db41 /db4"
+-    search_subdirs="/ /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4"
++    search_subdirs="/%%DB_NAME%% / /db4.7 /db47 /db4.6 /db46 /db4.5 /db45 /db4.4 /db44 /db4"
  
-         DB_MAJOR_REQ=4
-     DB_MINOR_REQ=1
+     bdbfound=no
+     savedcflags="$CFLAGS"
diff -Nur /usr/ports/net/netatalk/files/patch-etc-uams_Makefile.in ./files/patch-etc-uams_Makefile.in
--- /usr/ports/net/netatalk/files/patch-etc-uams_Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ ./files/patch-etc-uams_Makefile.in	2010-05-22 10:16:18.000000000 +0000
@@ -0,0 +1,11 @@
+--- etc/uams/Makefile.in.orig	2010-05-22 10:15:34.000000000 +0000
++++ etc/uams/Makefile.in	2010-05-22 10:15:51.000000000 +0000
+@@ -402,7 +402,7 @@
+ AM_CFLAGS = @SSL_CFLAGS@ @LIBGCRYPT_CFLAGS@
+ uams_pam_la_CFLAGS = @PAM_CFLAGS@
+ uams_dhx_pam_la_CFLAGS = @PAM_CFLAGS@
+-uams_dhx2_pam_la_CFLAGS = @PAM_CFLAGS@
++uams_dhx2_pam_la_CFLAGS = @PAM_CFLAGS@ @LIBGCRYPT_CFLAGS@
+ uams_gss_la_CFLAGS = @GSSAPI_CFLAGS@
+ uams_guest_la_LDFLAGS = -module -avoid-version
+ uams_randnum_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
diff -Nur /usr/ports/net/netatalk/pkg-plist ./pkg-plist
--- /usr/ports/net/netatalk/pkg-plist	2009-07-10 16:41:49.856722587 +0000
+++ ./pkg-plist	2010-05-20 20:56:07.000000000 +0000
@@ -1,39 +1,39 @@
 bin/achfile
-bin/acleandir.rc
+bin/ad
+bin/add_netatalk_printer
 bin/adv1tov2
 bin/aecho
 bin/afile
 bin/afppasswd
 bin/apple_cp
+bin/apple_dump
 bin/apple_mv
 bin/apple_rm
 bin/asip-status.pl
-bin/cleanappledouble.pl
 bin/cnid2_create
-bin/cnid_index
-bin/cnid_maint
+bin/dbd
 bin/getzones
+bin/logger_test
 bin/macusers
 bin/megatron
-@unexec rm -f %B/unbin
-@unexec rm -f %B/unhex
-@unexec rm -f %B/unsingle
-@unexec rm -f %B/hqx2bin
-@unexec rm -f %B/single2bin
-@unexec rm -f %B/macbinary
-@unexec rm -f %B/binheader
-@unexec rm -f %B/nadheader
-@exec cd %B && ln -s megatron unbin
-@exec cd %B && ln -s megatron unhex
-@exec cd %B && ln -s megatron unsingle
 @exec cd %B && ln -s megatron hqx2bin
-@exec cd %B && ln -s megatron single2bin
 @exec cd %B && ln -s megatron macbinary
-@exec cd %B && ln -s megatron binheader
 @exec cd %B && ln -s megatron nadheader
+@exec cd %B && ln -s megatron single2bin
+@exec cd %B && ln -s megatron unbin
+@exec cd %B && ln -s megatron unhex
+@exec cd %B && ln -s megatron unsingle
+@unexec rm -f %B/hqx2bin
+@unexec rm -f %B/macbinary
+@unexec rm -f %B/nadheader
+@unexec rm -f %B/single2bin
+@unexec rm -f %B/unbin
+@unexec rm -f %B/unhex
+@unexec rm -f %B/unsingle
 bin/nbplkup
 bin/nbprgstr
 bin/nbpunrgstr
+bin/netacnv
 bin/netatalk-config
 bin/pap
 bin/papstatus
@@ -88,6 +88,7 @@
 etc/uams/uams_randnum.a
 etc/uams/uams_randnum.la
 etc/uams/uams_randnum.so
+include/atalk/acl.h
 include/atalk/adouble.h
 include/atalk/aep.h
 include/atalk/afp.h
@@ -97,7 +98,11 @@
 include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h
+include/atalk/directory.h
 include/atalk/dsi.h
+include/atalk/ea.h
+include/atalk/hash.h
+include/atalk/ldapconfig.h
 include/atalk/list.h
 include/atalk/logger.h
 include/atalk/nbp.h
@@ -110,15 +115,19 @@
 include/atalk/tdb.h
 include/atalk/uam.h
 include/atalk/unicode.h
+include/atalk/unix.h
 include/atalk/util.h
+include/atalk/uuid.h
+include/atalk/vfs.h
 include/atalk/volinfo.h
+include/atalk/volume.h
 include/atalk/zip.h
 include/netatalk/aarp.h
 include/netatalk/at.h
 include/netatalk/at_var.h
 include/netatalk/ddp.h
-include/netatalk/endian.h
 include/netatalk/ddp_var.h
+include/netatalk/endian.h
 include/netatalk/phase2.h
 lib/libatalk.a
 lib/libatalk.la