- Update to 1.5pre6

- New MASTER_SITE, see http://netatalk.sourceforge.net/
- This version includes Adrian Sun's improvements
- experimental PAM support (disabled by deafult)
- package won't override existings configurations
- Status script "macusers"
- Maintainer: Joe "Marcus" Clarke

PR:		26248
Submitted by:	jclarke@cisco.com, dirk.meyer@dinoex.sub.org

21 files changed, 430 insertions, 375 deletions

diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index d94a7d955260..73afe9262806 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -6,31 +6,60 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.4b2
-PORTREVISION=	2
+PORTVERSION=	1.5p6
 CATEGORIES=	net print
-MASTER_SITES=   ftp://terminator.rs.itd.umich.edu/unix/netatalk/ \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.hanse.de/sites/transit/mirror/terminator.rs.itd.umich.edu/unix/netatalk/
-MASTER_SITE_SUBDIR=	stb/mirror/terminator.rs.itd.umich.edu/unix/netatalk
+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	netatalk
+DISTNAME=	netatalk-1.5pre6
 
-PATCH_SITES=	http://www.umich.edu/~rsug/netatalk/patches/1.4b2/ \
-		${MASTER_SITE_LOCAL} \
-		ftp://ftp.hanse.de/sites/transit/mirror/www.umich.edu/%257Ersug/netatalk/patches/1.4b2/
-PATCH_SITE_SUBDIR=	stb/mirror/www.umich.edu/%7Ersug/netatalk/patches/1.4b2/
-PATCHFILES=	afpd-macos8.diff afpd-bfree.diff
+MAINTAINER=	marcus@marcuscom.com
 
-MAINTAINER=	ports@freebsd.org
-
-MAN1=		aecho.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
+.if !exists(/usr/include/tcpd.h)
+LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
+.endif
 
+CONFIGURE_ARGS+=	--with-tcp-wrappers
+# CONFIGURE_ARGS+=	--disable-admin-group
+# CONFIGURE_ARGS+=	--disable-ddp
+# CONFIGURE_ARGS+=	--with-shadow
+# CONFIGURE_ARGS+=	--enable-lastdid
+.if defined(NETATALK_WITH_PAM)
+CONFIGURE_ARGS+=	--with-pam # broken
+PLIST_SUB+=             NETATALKPAM=""
+.else
+PLIST_SUB+=             NETATALKPAM="@comment "
+.endif
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
+		atalkd.conf netatalk.conf netatalk.pamd papd.conf
+LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
+		binheader nadheader
+MAN1=		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
 MAN3=		atalk_aton.3 nbp_name.3
 MAN4=		atalk.4
-MAN8=		afpd.8 atalkd.8 papd.8 psf.8
+MAN5=		AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
+		netatalk.conf.5 papd.conf.5
+MAN8=		afpd.8 atalkd.8 pap.8 papd.8 papstatus.8 psf.8
+
+post-extract:
+	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
+		> ${WRKSRC}/netatalk.sh
 
 post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap
+	${INSTALL_SCRIPT} ${WRKSRC}/netatalk.sh ${PREFIX}/etc/rc.d/netatalk.sh
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
+		${PREFIX}/bin/macusers
+.for i in ${FILES}
+	[ -f ${PREFIX}/etc/${i} ] || \
+		${INSTALL_DATA} -c ${PREFIX}/etc/${i}.dist ${PREFIX}/etc/${i}
+.endfor
+.for i in ${LINKS}
+	( cd ${PREFIX} && ${LN} -sf megatron ${i} )
+.endfor
 
 .include <bsd.port.mk>
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index 3d3050874891..9d24bfc3866f 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,3 +1 @@
-MD5 (netatalk-1.4b2.tar.gz) = b7541838044e167405bb33236faf4ce7
-MD5 (afpd-macos8.diff) = 55c6943f03c06aa7e1ff195553dcbe98
-MD5 (afpd-bfree.diff) = 54817f22f00471109a88b554097125b2
+MD5 (netatalk-1.5pre6.tar.gz) = fdeb528ba0bbe4c2083a06ea2fffb773
diff --git a/net/netatalk/files/netatalk.sh b/net/netatalk/files/netatalk.sh
new file mode 100644
index 000000000000..90290112db48
--- /dev/null
+++ b/net/netatalk/files/netatalk.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/net/netatalk/files/Attic/netatalk.sh,v 1.1 2001-05-18 20:00:29 dinoex Exp $
+#
+# AppleTalk daemons. Make sure not to start atalkd in the background:
+# its data structures must have time to stablize before running the
+# other processes.
+#
+if ! test -x %%PREFIX%%/sbin/atalkd
+then
+#	exit 0
+fi
+HOSTNAME=`hostname|sed 's/\..*$//'`
+case $1 in
+start)
+	echo -n ' netatalk'
+	%%PREFIX%%/sbin/atalkd
+	%%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:Workstation &
+	%%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:netatalk &
+	%%PREFIX%%/sbin/papd
+	%%PREFIX%%/sbin/afpd -s %%PREFIX%%/etc/AppleVolumes.system \
+		-f %%PREFIX%%/etc/AppleVolumes.default
+	;;
+stop)
+	killall afpd
+	killall papd
+	killall atalkd
+	;;
+*)
+	echo "Usage: $0: [ start | stop ]" 2>&1
+	exit 65
+	;;
+esac
diff --git a/net/netatalk/files/patch-Makefile.in b/net/netatalk/files/patch-Makefile.in
new file mode 100644
index 000000000000..05dd7dd19c17
--- /dev/null
+++ b/net/netatalk/files/patch-Makefile.in
@@ -0,0 +1,54 @@
+--- config/Makefile.in.orig	Thu Apr 12 15:27:32 2001
++++ config/Makefile.in	Fri May 11 07:01:47 2001
+@@ -129,11 +129,11 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)
+ 	@list='$(config_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configdir)/$$p; \
++	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configdir)/$$p.dist"; \
++	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(configdir)/$$p.dist; \
+ 	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(configdir)/$$p; \
++	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(configdir)/$$p.dist"; \
++	    $(INSTALL_DATA) $$p $(DESTDIR)$(configdir)/$$p.dist; \
+ 	  fi; fi; \
+ 	done
+ 
+@@ -145,16 +145,6 @@
+ 
+ install-pamDATA: $(pam_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(pamdir)
+-	@list='$(pam_DATA)'; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pamdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pamdir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pamdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(pamdir)/$$p; \
+-	  fi; fi; \
+-	done
+ 
+ uninstall-pamDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -209,7 +199,7 @@
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+-	$(mkinstalldirs)  $(DESTDIR)$(configdir) $(DESTDIR)$(pamdir)
++	$(mkinstalldirs)  $(DESTDIR)$(configdir)
+ 
+ 
+ mostlyclean-generic:
+@@ -258,9 +248,6 @@
+ 
+ @USE_PAM_TRUE@netatalk:
+ @USE_PAM_TRUE@	cp -f $(PAMD) netatalk
+-
+-@USE_PAM_TRUE@install-data-local: netatalk
+-@USE_PAM_TRUE@	$(INSTALL) netatalk $(DESTDIR)$(pamdir)/
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net/netatalk/files/patch-aa b/net/netatalk/files/patch-aa
deleted file mode 100644
index ae3c38bf154b..000000000000
--- a/net/netatalk/files/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.old	Wed Sep  9 02:42:06 1998
-+++ Makefile	Wed Sep  9 02:42:37 1998
-@@ -1,15 +1,15 @@
- # Root of installation. Subdirectories will be ${DESTDIR}/etc,
- # ${DESTDIR}/bin, and ${DESTDIR}/lib.
--DESTDIR=/usr/local/atalk
-+DESTDIR=$(PREFIX)
- 
- # for system-level binaries
--SBINDIR=$(DESTDIR)/etc
-+SBINDIR=$(DESTDIR)/libexec
- # for user-level binaries
- BINDIR=$(DESTDIR)/bin
- # for program libraries (*.a)
- LIBDIR=$(DESTDIR)/lib
- # for machine-independent resources (pagecount.ps, etc.)
--RESDIR=$(DESTDIR)/etc
-+RESDIR=$(DESTDIR)/share
- # for configuration files (AppleVolumes.system, etc.)
- ETCDIR=$(DESTDIR)/etc
- # for include files
-@@ -54,7 +54,7 @@
- 	    SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
- 	    ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
- 	    DESTDIR="${DESTDIR}" MANDIR="${MANDIR}" \
--	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" $@
-+	    AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" OPTOPTS="${CFLAGS}" $@
- 
- FRC:
- 
diff --git a/net/netatalk/files/patch-ab b/net/netatalk/files/patch-ab
deleted file mode 100644
index 4007e5d7c12a..000000000000
--- a/net/netatalk/files/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -crP ../netatalk-1.4b2/rc.atalk.freebsd ./rc.atalk.freebsd
-*** ../netatalk-1.4b2/rc.atalk.freebsd	Thu Jan  1 01:00:00 1970
---- ./rc.atalk.freebsd	Thu Jul 24 02:14:39 1997
-***************
-*** 0 ****
---- 1,27 ----
-+ #!/bin/sh
-+ #
-+ # AppleTalk daemons. Make sure not to start atalkd in the background:
-+ # its data structures must have time to stablize before running the
-+ # other processes.
-+ #
-+ PREFIX=/`expr $0 : '/\(.*\)/etc/rc.d/netatalk.sh'`
-+ if [ "x${PREFIX}" = "x/" ]; then
-+ 	printf "\nnetatalk: Cannot determine PREFIX.\n" >&2
-+ 	exit 64
-+ fi
-+ HOSTNAME=`hostname|sed 's/\..*$//'`
-+ 
-+ case $1 in
-+ 	start)	echo -n ' netatalk'
-+ 		${PREFIX}/libexec/atalkd
-+ 		${PREFIX}/bin/nbprgstr -p 4 ${HOSTNAME}:Workstation &
-+ 		${PREFIX}/bin/nbprgstr -p 4 ${HOSTNAME}:netatalk &
-+ 		${PREFIX}/libexec/papd
-+ 		${PREFIX}/libexec/afpd -s ${PREFIX}/etc/AppleVolumes.system \
-+			-f ${PREFIX}/etc/AppleVolumes.default
-+ 		;;
-+ 	stop)	killall afpd
-+ 		killall papd
-+ 		killall atalkd
-+ 		;;
-+ esac
diff --git a/net/netatalk/files/patch-ac b/net/netatalk/files/patch-ac
deleted file mode 100644
index e6ec20e0ab56..000000000000
--- a/net/netatalk/files/patch-ac
+++ /dev/null
@@ -1,43 +0,0 @@
---- sys/freebsd/Makefile.orig	Tue Oct 22 23:31:01 1996
-+++ sys/freebsd/Makefile	Wed Sep  9 02:09:02 1998
-@@ -1,6 +1,5 @@
- # FreeBSD specific defines, passed to subdirectories.
- DEFS=	-DBSD4_4
--OPTOPTS=	-O2
- CC=	gcc
- INSTALL=	install
- ADDLIBS=	-lcrypt
-@@ -21,7 +20,8 @@
- FRC:
- 
- install :
--	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-+	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} \
-+		${ETCDIR}/rc.d ${RESDIR}/examples/netatalk
- 	for i in ${ALL}; \
- 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
- 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-@@ -30,17 +30,16 @@
- 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
- 		INSTALL="${INSTALL}" $@); \
- 	done
--	rm -f ${ETCDIR}/rc.atalk
- 	sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
- 		-e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
- 		-e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
- 		-e s@:INCDIR:@${INCDIR}@ \
--	    < ../../rc.atalk.bsd > ${ETCDIR}/rc.atalk
--	@echo
--	@echo "Install is done.  Don't forget to add lines from"
--	@echo "services.atalk to /etc/services and to call rc.atalk"
--	@echo "in /etc/rc.  See README and README.FREEBSD for more"
--	@echo "information."
-+	    < ../../rc.atalk.freebsd > ${ETCDIR}/rc.d/netatalk.sh
-+	chmod +x ${ETCDIR}/rc.d/netatalk.sh
-+	cp ../../config/AppleVolumes.default ${ETCDIR}/AppleVolumes.default.dist
-+	cp ../../config/AppleVolumes.system ${ETCDIR}/AppleVolumes.system.dist
-+	cp ../../config/atalkd.conf ../../config/papd.conf \
-+		${RESDIR}/examples/netatalk
- 
- clean :
- 	for i in ${ALL}; \
diff --git a/net/netatalk/files/patch-ad b/net/netatalk/files/patch-ad
deleted file mode 100644
index b7b1bf86c691..000000000000
--- a/net/netatalk/files/patch-ad
+++ /dev/null
@@ -1,48 +0,0 @@
-*** etc/atalkd/main.c.orig	Tue Oct 22 00:45:03 1996
---- etc/atalkd/main.c	Wed Feb 25 02:39:21 1998
-***************
-*** 19,24 ****
---- 19,35 ----
-  #include <net/if.h>
-  #include <net/route.h>
-  
-+ #if __FreeBSD__ >= 2
-+ #  include <osreldate.h>
-+ #  if __FreeBSD_version >= 300000
-+ #    define __FreeBSD_CURRENT
-+ #  endif
-+ #endif
-+ 
-+ #ifdef __FreeBSD_CURRENT
-+ #include <net/if_dl.h>
-+ #endif
-+ 
-  #include <signal.h>
-  #include <syslog.h>
-  #include <stdio.h>
-***************
-*** 1150,1158 ****
---- 1161,1183 ----
-  	    }
-  	} else {
-  	    /* configure multicast for this interface */
-+ #ifdef __FreeBSD_CURRENT
-+ 	    struct sockaddr_dl *sdl = (struct sockaddr_dl *)&sa;
-+ 	    bzero( sdl, sizeof( struct sockaddr ));
-+ 	    sdl->sdl_family = AF_LINK;
-+ 	    sdl->sdl_nlen = 0 /* strlen(iface->i_name)*/;
-+ 	    /*strncpy(sdl->sdl_data, iface->i_name, sdl->sdl_nlen);*/
-+ 	    bcopy( ethermulti, LLADDR(sdl), sizeof( ethermulti ));
-+ 	    sdl->sdl_alen = sizeof( ethermulti );
-+ 	    sdl->sdl_len = sizeof(*sdl);
-+ 			/* (sdl->sdl_data + sdl->sdl_alen + sdl->sdl_nlen) 
-+ 				- (char *)sdl; */
-+ 	    if ( ifconfig( iface->i_name, SIOCADDMULTI, sdl )) {
-+ #else
-  	    bzero( &sa, sizeof( struct sockaddr ));
-  	    bcopy( ethermulti, sa.sa_data, sizeof( ethermulti ));
-  	    if ( ifconfig( iface->i_name, SIOCADDMULTI, &sa )) {
-+ #endif
-  		syslog( LOG_ERR, "addmulti: %m" );
-  		exit( 1 );
-  	    }
diff --git a/net/netatalk/files/patch-ae b/net/netatalk/files/patch-ae
deleted file mode 100644
index ccb04e77d285..000000000000
--- a/net/netatalk/files/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-*** etc/atalkd/nbp.c.orig	Sat Oct  5 17:17:53 1996
---- etc/atalkd/nbp.c	Wed Feb 25 18:24:50 1998
-***************
-*** 7,13 ****
---- 7,26 ----
-  #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <sys/ioctl.h>
-+ #include <sys/time.h>
-  #include <net/if.h>
-+ 
-+ #if __FreeBSD__ >= 2
-+ #  include <osreldate.h>
-+ #  if __FreeBSD_version >= 300000
-+ #    define __FreeBSD_CURRENT
-+ #  endif
-+ #endif
-+ 
-+ #ifdef __FreeBSD_CURRENT
-+ #include <net/if_dl.h>
-+ #endif
-+ 
-  #include <netatalk/at.h>
-  #include <atalk/ddp.h>
-  #include <atalk/nbp.h>
-***************
-*** 185,190 ****
---- 198,214 ----
-  		for ( l = iface->i_rt->rt_zt; l; l = l->l_next ) {
-  		    if ( zt == (struct ziptab *)l->l_data ) {
-  			/* add multicast */
-+ #ifdef __FreeBSD_CURRENT
-+ 			struct sockaddr_dl *sdl = (struct sockaddr_dl *)&sa;
-+ 			sdl->sdl_family = AF_LINK;
-+ 			sdl->sdl_nlen = 0;
-+ 			bcopy( zt->zt_bcast, sdl->sdl_data, sizeof(ethermulti));
-+ 			sdl->sdl_alen = sizeof(ethermulti);
-+ 			sdl->sdl_len = sizeof (*sdl);
-+ 				/* (sdl->sdl_data
-+ 				+ sdl->sdl_alen + sdl->sdl_nlen)  
-+ 				- (char *)sdl; */
-+ #endif
-  			if ( ifconfig( iface->i_name, SIOCADDMULTI, &sa )) {
-  			    syslog( LOG_ERR, "addmulti: %m" );
-  			    exit( 1 );
diff --git a/net/netatalk/files/patch-ag b/net/netatalk/files/patch-ag
deleted file mode 100644
index 4ce2b52d6ee1..000000000000
--- a/net/netatalk/files/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
---- libatalk/asp/asp_getsess.c.orig	Tue Aug 25 21:50:54 1998
-+++ libatalk/asp/asp_getsess.c	Tue Aug 25 21:51:05 1998
-@@ -3,10 +3,10 @@
-  * All Rights Reserved.  See COPYRIGHT.
-  */
- 
-+#include <sys/types.h>
- #include <sys/errno.h>
- #include <sys/signal.h>
- #include <sys/time.h>
--#include <sys/types.h>
- #include <sys/uio.h>
- #include <sys/wait.h>
- #include <sys/syslog.h>
diff --git a/net/netatalk/files/patch-ah b/net/netatalk/files/patch-ah
deleted file mode 100644
index 30164e7616fc..000000000000
--- a/net/netatalk/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- etc/afpd/desktop.c.orig	Tue Aug 25 21:59:28 1998
-+++ etc/afpd/desktop.c	Tue Aug 25 22:00:23 1998
-@@ -429,7 +429,7 @@
-     m = mpath;
-     u = upath;
-     while ( *m != '\0' ) {
--	if ( !isascii( *m ) || *m == '/' || ( i == 0 && *m == '.' )) {
-+	if ( !isprint( (unsigned char)*m ) || *m == '/' || ( i == 0 && *m == '.' )) {
- 	    *u++ = ':';
- 	    *u++ = hexdig[ ( *m & 0xf0 ) >> 4 ];
- 	    *u++ = hexdig[ *m & 0x0f ];
diff --git a/net/netatalk/files/patch-ai b/net/netatalk/files/patch-ai
deleted file mode 100644
index d0c82037f226..000000000000
--- a/net/netatalk/files/patch-ai
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.orig	Tue Feb 20 17:38:02 1996
-+++ Makefile	Mon Sep  7 22:23:04 1998
-@@ -1,4 +1,4 @@
--TARGETS=	atalk netatalk
-+TARGETS=	atalk
- 
- INSTALL=	install
- 
diff --git a/net/netatalk/files/patch-aj b/net/netatalk/files/patch-aj
deleted file mode 100644
index 869cb02661a6..000000000000
--- a/net/netatalk/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/man1/Makefile.orig	Tue Feb 20 18:16:24 1996
-+++ man/man1/Makefile	Tue Sep  8 23:40:31 1998
-@@ -1,6 +1,5 @@
--SRC=	aecho.1 getzones.1 nbp.1 nbplkup.1 nbprgstr.1 nbplkup.1 \
--	pap.1 papstatus.1 psorder.1 megatron.1 unhex.1 unbin.1 \
--	unsingle.1 macbinary.1 hqx2bin.1 single2bin.1
-+SRC=	aecho.1 getzones.1 nbp.1 \
-+	pap.1 psorder.1 megatron.1
- 
- INCPATH=
- CFLAGS=
diff --git a/net/netatalk/files/patch-ak b/net/netatalk/files/patch-ak
deleted file mode 100644
index 96e4fb1be152..000000000000
--- a/net/netatalk/files/patch-ak
+++ /dev/null
@@ -1,20 +0,0 @@
---- etc/psf/Makefile.orig	Thu Apr 18 23:53:09 1996
-+++ etc/psf/Makefile	Sat Oct 10 01:33:08 1998
-@@ -32,14 +32,14 @@
- 
- install : all
- 	-mkdir ${RESDIR}
--	-mkdir ${RESDIR}/filters
-+	-mkdir ${SBINDIR}/filters
- 	${INSTALL} -c psa ${SBINDIR}
- 	${INSTALL} -c etc2ps.sh ${SBINDIR}/etc2ps
- 	${INSTALL} -c pagecount.ps ${RESDIR}
- 	${INSTALL} -c psf ${SBINDIR}
- 	for i in ${LINKS} ; do \
--	    rm -f ${RESDIR}/filters/$$i; \
--	    ln -s ${SBINDIR}/psf ${RESDIR}/filters/$$i; \
-+	    rm -f ${SBINDIR}/filters/$$i; \
-+	    ln -s ${SBINDIR}/psf ${SBINDIR}/filters/$$i; \
- 	done
- 
- clean :
diff --git a/net/netatalk/files/patch-config.h.in b/net/netatalk/files/patch-config.h.in
new file mode 100644
index 000000000000..2ab6e3e58113
--- /dev/null
+++ b/net/netatalk/files/patch-config.h.in
@@ -0,0 +1,11 @@
+--- config.h.in.orig	Thu Apr 12 15:27:26 2001
++++ config.h.in	Fri May 18 08:13:50 2001
+@@ -84,7 +84,7 @@
+ #undef HAVE_GCC_MEMCPY_BUG
+ #undef MACOSX_SERVER
+ #undef NEED_QUOTACTL_WRAPPER
+-#undef NO_CRYPT_H
++#define NO_CRYPT_H
+ #undef NO_DDP
+ #undef NO_DLFCN_H
+ #undef NO_STRUCT_TM_GMTOFF
diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
new file mode 100644
index 000000000000..ece0d3435d00
--- /dev/null
+++ b/net/netatalk/files/patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig	Thu Apr 12 15:27:42 2001
++++ configure	Fri May 18 08:13:51 2001
+@@ -4906,6 +4906,7 @@
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++if test "${with_pam+set}" = set; then
+   echo "$ac_t""yes" 1>&6
+   cat >> confdefs.h <<\EOF
+ #define USE_PAM 1
+@@ -4914,6 +4915,9 @@
+ 	LIBS="$LIBS -lpam"
+ 	compile_pam=yes
+ 
++else
++  echo "$ac_t""no" 1>&6
++fi
+ else
+   echo "$ac_t""no" 1>&6
+ fi
diff --git a/net/netatalk/files/patch-macusers b/net/netatalk/files/patch-macusers
new file mode 100644
index 000000000000..66d75c4d2f65
--- /dev/null
+++ b/net/netatalk/files/patch-macusers
@@ -0,0 +1,138 @@
+--- contrib/macusers/macusers.orig	Fri May 18 14:09:26 2001
++++ contrib/macusers/macusers	Fri May 18 14:08:28 2001
+@@ -1,52 +1,92 @@
+ #!/usr/bin/perl
+ 
++use strict;
++use Socket;
++use vars qw($MAC_PROCESS $PS_STR $MATCH_STR $ASIP_PORT_NO $ASIP_PORT $LSOF);
++
+ # Written for linux; may have to be modified for your brand of Unix.
+ 
+-$MAC_PROCESS="afpd";
+-$PS_STR="-ef";
+-$ASIP_PORT="afpovertcp";
++# Support for FreeBSD added by Joe Clarke <marcus@marcuscom.com>.
++# Support could probably be extended for *BSD, but I do not have Net or
++# OpenBSD machines to test with.  Code has also been cleaned up and made
++# to compile under strict.
++#
++# The new lsof call should also be quicker as it does not involve a 
++# second pipeline.
++#
++# Support has also been added for 16 character usernames.
++
++$MAC_PROCESS = "afpd";
++if ( $^O eq "freebsd" ) {
++        $PS_STR    = "-awwxouser,pid,ppid,start,command";
++        $MATCH_STR = '(\w+)\s+(\d+)\s+(\d+)\s+([\d\w:]+)';
++}
++else {
++        $PS_STR    = "-ef";
++        $MATCH_STR = '\s*(\w+)\s+(\d+)\s+(\d+)\s+\d+\s+([\d\w:]+)';
++}
++$ASIP_PORT    = "afpovertcp";
++$ASIP_PORT_NO = 548;
+ 
+ # Change to 0 if you don't have lsof
+-$LSOF=1;
++$LSOF = 0;
++my %mac = ();
++
++if ( $LSOF == 1 ) {
++        open( LSOF, "lsof -i :$ASIP_PORT |" );
++
++        while (<LSOF>) {
++                next if ( $_ !~ /$ASIP_PORT/ );
++                $_ =~ /\w+\s+(\d+).*->([\w\.-]+).*/;
++                my ( $pid, $host );
++                $pid = $1;
++                $host = $2;
++                ($host) = ( $host =~ /(^[\w\d\-]+)/ );
++                $mac{$pid} = $host;
++        }
++        print
++"PID      UID      Username         Name                 Logintime Mac\n";
++        close(LSOF);
++}
++elsif ( $^O eq "freebsd" ) {
++        open( SOCKSTAT, "sockstat -4 | grep $MAC_PROCESS | grep -v grep |" );
++
++        while (<SOCKSTAT>) {
++                next if ( $_ !~ /$MAC_PROCESS/ );
++                $_ =~
++                  /\S+\s+\S+\s+(\d+)\s+\d+\s+[\w\d]+\s+[\d\.:]+\s+([\d\.]+)/;
++                my ( $pid, $addr, $host );
++                $pid  = $1;
++                $addr = $2;
++                $host =
++                  gethostbyaddr( pack( 'C4', split ( /\./, $addr ) ), AF_INET );
++                ($host) = ( $host =~ /(^[\w\d\-]+)/ );
++                $mac{$pid} = $host;
++        }
++        print
++"PID      UID      Username         Name                 Logintime Mac\n";
++}
++else {
++        print
++          "PID      UID      Username         Name                 Logintime\n";
++}
++
++open( PS, "ps $PS_STR |" ) || die "Unable to open a pipe to ``ps''";
+ 
+-if ($LSOF == 1 )
+-{
+-  open(LSOF,"lsof -i | grep $ASIP_PORT |");
+-
+-  while(<LSOF>)
+-  {
+-    if ($_ !~ /$ASIP_PORT/)
+-    {
+-      next;
+-    }
+-    $_=~/\w+\s+(\d+).*->([\w-]+).*/;
+-    $pid=$1; $host=$2;
+-    $mac{$pid}=$host;
+-  }
+-
+-  close(LSOF);
+-  print "PID      UID      Usercode Name                 Logintime Mac\n";
+-}
+-else
+-{
+-  print "PID      UID      Usercode Name                 Logintime\n";
+-}
+-
+-open(PS," ps $PS_STR |") || die "cannot do ps";
+-
+-while(<PS>)
+-{
+-  if ($_ !~ /$MAC_PROCESS/ )
+-  {
+-    next;
+-  }
+-  $_=~ /\s*(\w+)\s+(\d+)\s+(\d+)\s+\d+\s+([\d\w:]+)/;
+-  $user=$1; $pid=$2; $ppid=$3; $time=$4;
+-  if ($ppid != 1)
+-  {
+-    ($t,$t,$uid,$t,$t,$t,$name,$t,$t)=getpwnam($user);
+-    printf "%-8d %-8d %-8s %-20s %-9s %s\n",$pid,$uid,$user,$name,$time,$mac{$pid};
+-  }
++while (<PS>) {
++        next if ( $_ !~ /$MAC_PROCESS/ );
++        my ( $user, $pid, $ppid, $time, $name, $uid, $t );
++        $_ =~ /$MATCH_STR/;
++        $user = $1;
++        $pid  = $2;
++        $ppid = $3;
++        $time = $4;
++
++        if ( $ppid != 1 ) {
++                ( $t, $t, $uid, $t, $t, $t, $name, $t, $t ) = getpwnam($user);
++                printf "%-8d %-8d %-16s %-20s %-9s %s\n", $pid, $uid, $user,
++                  $name, $time, $mac{$pid};
++        }
+ }
+ 
+-close(PS);  
++close(PS);
diff --git a/net/netatalk/files/patch-netatalk.pamd b/net/netatalk/files/patch-netatalk.pamd
new file mode 100644
index 000000000000..66dcab1a22c8
--- /dev/null
+++ b/net/netatalk/files/patch-netatalk.pamd
@@ -0,0 +1,13 @@
+--- config/netatalk.pamd.orig	Tue Jul 25 23:08:59 2000
++++ config/netatalk.pamd	Fri May 18 08:13:51 2001
+@@ -1,6 +1,5 @@
+ #%PAM-1.0
+-auth       required	/lib/security/pam_pwdb.so shadow
+-account    required	/lib/security/pam_pwdb.so 
+-#password   required	/lib/security/pam_cracklib.so
+-#password   required	/lib/security/pam_pwdb.so shadow use_authtok
+-session    required	/lib/security/pam_pwdb.so 
++auth       required	pam_unix.so
++account    required	pam_unix.so
++password   required	pam_unix.so
++session    required	pam_unix.so
diff --git a/net/netatalk/pkg-descr b/net/netatalk/pkg-descr
index 41f3fc770e7a..6d49d2583a0b 100644
--- a/net/netatalk/pkg-descr
+++ b/net/netatalk/pkg-descr
@@ -1,21 +1,24 @@
 netatalk - File and Print Server for AppleTalk networks
 
-netatalk is a server software for AppleTalk networks. Features include:
-
+Netatalk features include:
 o Access to the UNIX file system for Macintosh and other systems with
   AppleShare client software.
-
 o Spool PostScript print jobs to the lpd(8) spool system via Printer Access
   Protocol (PAP).
-
 o Output PostScript print jobs from the lpd(8) spool system via Printer
   Access Protocol (PAP).
-
 o Filter PostScript, ASCII, and various other formats to PostScript,
   including banner pages and page reversal.
-
 o Route AppleTalk between multiple Ethernet interfaces.
 
+This version includes Adrian Sun's improvements:
+o Access to the file server via AFP-over-TCP.
+o Support for volumes larger that 2GB.
+o Randnum- and 2-Way Randnum authentication methods (courtesy S. Hirsch)
+o Support for Apple II ProDOS.
+o A number of bug fixes.
+
+Many other new features and bug fixes have also been integrated.
 Requires AppleTalk support in the kernel (FreeBSD 2.2 or newer).
 
-WWW: http://www.umich.edu/~rsug/netatalk/
+WWW: http://netatalk.sourceforge.net/
diff --git a/net/netatalk/pkg-install b/net/netatalk/pkg-install
deleted file mode 100644
index e17a582f1265..000000000000
--- a/net/netatalk/pkg-install
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# Check whether config files exist already, and copy the distribution ones
-# if not. Warn the user if the existing ones differ from the distribution,
-# so changes in the distribution can be merged.
-
-checkfile() {
-	diff -bBqw $1 $1.dist >/dev/null 2>&1
-	case $? in
-		0)	# config file exists, but is the same
-			;;
-		1)	# config file exists and differs
-			echo "** Make sure $1 is in sync with this version"; 
-			echo "   of the port.  See $1.dist for details."; 
-			;;
-		*)	# no config file exists, copy it
-			install -c -m 644 $1.dist $1
-			;;
-	esac
-}
-
-case $2 in
-	POST-INSTALL)
-		cd ${PKG_PREFIX}
-		checkfile ${PKG_PREFIX}/etc/AppleVolumes.default
-		checkfile ${PKG_PREFIX}/etc/AppleVolumes.system
-
-		# install man page aliases
-		cd man
-		if [ -f man1/megatron.1.gz ]; then
-			MANEXT=.gz
-		fi
-		for i in hqx2bin macbinary single2bin unbin unhex unsingle; do
-			ln -f man1/megatron.1${MANEXT} man1/$i.1${MANEXT}
-		done
-		for i in nbplkup nbprgstr nbpunrgstr; do
-			ln -f man1/nbp.1${MANEXT} man1/$i.1${MANEXT}
-		done
-		ln -f man1/pap.1${MANEXT} man1/papstatus.1${MANEXT}
-		;;
-esac
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index 57c2672ea890..4d97e720c08d 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -1,75 +1,135 @@
+bin/achfile
+bin/add_netatalk_printer
+bin/adv1tov2
 bin/aecho
+bin/afile
+bin/afppasswd
+bin/apple_cp
+bin/apple_mv
+bin/apple_rm
+bin/cleanappledouble.pl
 bin/getzones
-bin/hqx2bin
-bin/macbinary
+bin/macusers
+bin/makecode
 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
 bin/nbplkup
 bin/nbprgstr
 bin/nbpunrgstr
+bin/netatalk-config
 bin/pap
 bin/papstatus
+bin/parsecode
 bin/psorder
-bin/single2bin
-bin/unbin
-bin/unhex
-bin/unsingle
+bin/timeout
+sbin/afpd
+sbin/atalkd
+sbin/ifmpap
+sbin/ifmpaprev
+sbin/ifpap
+sbin/ifpaprev
+sbin/ifwmpap
+sbin/ifwmpaprev
+sbin/ifwpap
+sbin/ifwpaprev
+sbin/ofmpap
+sbin/ofpap
+sbin/ofwmpap
+sbin/ofwpap
+sbin/papd
+sbin/psa
+sbin/psf
+sbin/tfmpap
+sbin/tfmpaprev
+sbin/tfpap
+sbin/tfpaprev
+sbin/tfwmpap
+sbin/tfwmpaprev
+sbin/tfwpap
+sbin/tfwpaprev
 @unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi
 etc/AppleVolumes.default.dist
+@exec [ ! -f %B/AppleVolumes.default ] && cp %B/%f %B/AppleVolumes.default
 @unexec if cmp -s %D/etc/AppleVolumes.system %D/etc/AppleVolumes.system.dist; then rm -f %D/etc/AppleVolumes.system; fi
 etc/AppleVolumes.system.dist
+@exec [ ! -f %B/AppleVolumes.system ] && cp %B/%f %B/AppleVolumes.system
+@unexec if cmp -s %D/etc/afpd.conf %D/etc/afpd.conf.dist; then rm -f %D/etc/afpd.conf; fi
+etc/afpd.conf.dist
+@exec [ ! -f %B/afpd.conf ] && cp %B/%f %B/afpd.conf
+@unexec if cmp -s %D/etc/atalkd.conf %D/etc/atalkd.conf.dist; then rm -f %D/etc/atalkd.conf; fi
+etc/atalkd.conf.dist
+@exec [ ! -f %B/atalkd.conf ] && cp %B/%f %B/atalkd.conf
+@unexec if cmp -s %D/etc/netatalk.conf %D/etc/netatalk.conf.dist; then rm -f %D/etc/netatalk.conf; fi
+etc/netatalk.conf.dist
+@exec [ ! -f %B/netatalk.conf ] && cp %B/%f %B/netatalk.conf
+@unexec if cmp -s %D/etc/netatalk.pamd %D/etc/netatalk.pamd.dist; then rm -f %D/etc/netatalk.pamd; fi
+etc/netatalk.pamd.dist
+@exec [ ! -f %B/netatalk.pamd ] && cp %B/%f %B/netatalk.pamd
+@unexec if cmp -s %D/etc/papd.conf %D/etc/papd.conf.dist; then rm -f %D/etc/papd.conf; fi
+etc/papd.conf.dist
+@exec [ ! -f %B/papd.conf ] && cp %B/%f %B/papd.conf
+etc/nls/maccode.437
+etc/nls/maccode.850
+etc/nls/maccode.iso8859-1
 etc/rc.d/netatalk.sh
+etc/uams/uams_clrtxt.so
+etc/uams/uams_dhx.so
+%%NETATALKPAM%%etc/uams/uams_dhx_pam.so
+etc/uams/uams_dhx_passwd.so
+etc/uams/uams_guest.so
+%%NETATALKPAM%%etc/uams/uams_pam.so
+etc/uams/uams_passwd.so
+etc/uams/uams_randnum.so
+@dirrm etc/nls
+@dirrm etc/uams
 include/atalk/adouble.h
 include/atalk/aep.h
 include/atalk/afp.h
 include/atalk/asp.h
 include/atalk/atp.h
+include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h
+include/atalk/dsi.h
 include/atalk/nbp.h
+include/atalk/netddp.h
 include/atalk/pap.h
 include/atalk/paths.h
 include/atalk/rtmp.h
+include/atalk/server_child.h
+include/atalk/uam.h
+include/atalk/util.h
 include/atalk/zip.h
+include/netatalk/aarp.c
+include/netatalk/aarp.h
+include/netatalk/at.h
+include/netatalk/at_control.c
+include/netatalk/at_proto.c
+include/netatalk/at_var.h
 include/netatalk/ddp.h
 include/netatalk/endian.h
 include/netatalk/ddp_var.h
+include/netatalk/ddp_input.c
+include/netatalk/ddp_output.c
+include/netatalk/ddp_usrreq.c
 include/netatalk/phase2.h
-include/netatalk/at_var.h
-include/netatalk/at.h
-include/netatalk/aarp.h
-lib/libatalk.a
-lib/libatalk_p.a
-libexec/afpd
-libexec/atalkd
-libexec/etc2ps
-libexec/papd
-libexec/psa
-libexec/psf
-libexec/filters/ifmpap
-libexec/filters/ifmpaprev
-libexec/filters/ifpap
-libexec/filters/ifpaprev
-libexec/filters/ifwmpap
-libexec/filters/ifwmpaprev
-libexec/filters/ifwpap
-libexec/filters/ifwpaprev
-libexec/filters/ofmpap
-libexec/filters/ofpap
-libexec/filters/ofwmpap
-libexec/filters/ofwpap
-libexec/filters/tfmpap
-libexec/filters/tfmpaprev
-libexec/filters/tfpap
-libexec/filters/tfpaprev
-libexec/filters/tfwmpap
-libexec/filters/tfwmpaprev
-libexec/filters/tfwpap
-libexec/filters/tfwpaprev
-share/examples/netatalk/atalkd.conf
-share/examples/netatalk/papd.conf
-share/pagecount.ps
 @dirrm include/atalk
 @dirrm include/netatalk
-@dirrm libexec/filters
-@dirrm share/examples/netatalk
-
+lib/libatalk.a
+lib/libatalk.la
+share/aclocal/netatalk.m4