netatalk-asun - File and Print server for AppleTalk, enhanced by Adrian Sun

15 files changed, 914 insertions, 0 deletions

diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
new file mode 100644
index 000000000000..b2574565db98
--- /dev/null
+++ b/net/netatalk-asun/Makefile
@@ -0,0 +1,26 @@
+# Ports collection makefile for:    netatalk-asun
+# Version required:     netatalk-1.4b2-asun-2.0
+# Date created:         07 Sep 1998
+# Whom:                 stb@freebsd.org
+#
+# $Id$
+#
+
+DISTNAME=       netatalk-1.4b2+asun2.1.0
+PKGNAME=	netatalk-1.4b2+asun-2.1.0
+CATEGORIES=	net print
+MASTER_SITES=   ftp://ftp.u.washington.edu/public/asun/
+
+MAINTAINER=	stb@freebsd.org
+
+BUILD_DEPENDS=	${PREFIX}/lib/libwrap.a:security/tcp_wrappers
+
+MAN1=		aecho.1 getzones.1 megatron.1 nbp.1 pap.1 psorder.1
+MAN3=		atalk_aton.3 nbp_name.3
+MAN4=		atalk.4
+MAN8=		afpd.8 atalkd.8 papd.8 psf.8
+
+post-install:
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.mk>
diff --git a/net/netatalk-asun/distinfo b/net/netatalk-asun/distinfo
new file mode 100644
index 000000000000..4bc86471488d
--- /dev/null
+++ b/net/netatalk-asun/distinfo
@@ -0,0 +1 @@
+MD5 (netatalk-1.4b2+asun2.1.0.tar.gz) = 0dac5276cbad4e966cb76a7e0399d3fd
diff --git a/net/netatalk-asun/files/patch-aa b/net/netatalk-asun/files/patch-aa
new file mode 100644
index 000000000000..f5dc3752ee7f
--- /dev/null
+++ b/net/netatalk-asun/files/patch-aa
@@ -0,0 +1,41 @@
+--- Makefile.orig	Mon Oct 13 08:41:56 1997
++++ Makefile	Tue Sep  8 01:44:22 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
+@@ -29,16 +29,16 @@
+ # Location of the DES library and include files. Comment this out if you
+ # don't want Randnum Exchange and 2-Way Randnum Exchange as allowable UAMs 
+ # for afpd. We expect libdes.a in $DESDIR/lib and des.h in $DESDIR/include.
+-DESDIR=/usr/local
++DESDIR=/usr
+ 
+ # Location of the tcp wrapper library and include files. Comment this out
+ # if you don't want tcp wrapper support. having tcp wrapper support is
+ # highly recommended.
+-TCPWRAPDIR=/usr
++TCPWRAPDIR=${PREFIX}
+ 
+ # Location of PAM support library and include files. Comment this out
+ # if you don't want to enable PAM support
+-PAMDIR=/usr
++#PAMDIR=/usr
+ 
+  
+ # Location of the AFS and Kerberos libraries and include files.  Uncomment
diff --git a/net/netatalk-asun/files/patch-ab b/net/netatalk-asun/files/patch-ab
new file mode 100644
index 000000000000..1aab359d2dc6
--- /dev/null
+++ b/net/netatalk-asun/files/patch-ab
@@ -0,0 +1,28 @@
+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,22 ----
++ #
++ # AppleTalk daemons. Make sure not to start atalkd in the background:
++ # its data structures must have time to stablize before running the
++ # other processes.
++ #
++ 
++ case $1 in
++ 	start)	echo -n ' netatalk'
++ 		:SBINDIR:/atalkd
++ 		:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:Workstation
++ 		:BINDIR:/nbprgstr -p 4 `hostname|sed 's/\..*$//'`:netatalk
++ 		:SBINDIR:/papd
++ 		:SBINDIR:/afpd
++ 		;;
++ 	stop)	killall afpd
++ 		killall papd
++ 		killall atalkd
++ 		;;
++ 	*)	echo "usage: $0 {start|stop}"
++ 		exit 64
++ 		;;
++ esac
diff --git a/net/netatalk-asun/files/patch-ac b/net/netatalk-asun/files/patch-ac
new file mode 100644
index 000000000000..3a355b13718c
--- /dev/null
+++ b/net/netatalk-asun/files/patch-ac
@@ -0,0 +1,41 @@
+--- sys/freebsd/Makefile.orig	Fri Sep 18 05:19:27 1998
++++ sys/freebsd/Makefile	Tue Nov 24 01:22:24 1998
+@@ -23,7 +23,8 @@
+ FRC:
+ 
+ install :
+-	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
++	mkdir -p ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR} \
++		${RESDIR}/examples/netatalk ${ETCDIR}/rc.d
+ 	for i in ${ALL}; \
+ 	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
+ 		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
+@@ -32,17 +33,21 @@
+ 		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" AFPLIBS="${AFPLIBS}" \
+ 		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
++	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}@ \
++	    <../../config/afpd.conf >${ETCDIR}/afpd.conf.dist
++	cp ../../config/atalkd.conf ../../config/papd.conf \
++		${RESDIR}/examples/netatalk
+ 
+ clean :
+ 	for i in ${ALL}; \
diff --git a/net/netatalk-asun/files/patch-ag b/net/netatalk-asun/files/patch-ag
new file mode 100644
index 000000000000..216e2154ebfa
--- /dev/null
+++ b/net/netatalk-asun/files/patch-ag
@@ -0,0 +1,8 @@
+--- include/Makefile.orig	Tue May 20 19:35:42 1997
++++ include/Makefile	Tue Nov 24 00:27:05 1998
+@@ -1,4 +1,4 @@
+-TARGETS=	atalk netatalk
++TARGETS=	atalk
+ 
+ INSTALL=	install
+ 
diff --git a/net/netatalk-asun/files/patch-ak b/net/netatalk-asun/files/patch-ak
new file mode 100644
index 000000000000..96e4fb1be152
--- /dev/null
+++ b/net/netatalk-asun/files/patch-ak
@@ -0,0 +1,20 @@
+--- 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-asun/files/patch-ba b/net/netatalk-asun/files/patch-ba
new file mode 100644
index 000000000000..6b727b9a688e
--- /dev/null
+++ b/net/netatalk-asun/files/patch-ba
@@ -0,0 +1,474 @@
+--- man/man8/afpd.8.orig	Tue May 20 19:35:43 1997
++++ man/man8/afpd.8	Tue Nov 24 03:49:13 1998
+@@ -1,108 +1,59 @@
+-.TH AFPD 8 "25 Jan 1994" "netatalk 1.3"
++.TH AFPD 8 "07 Sep 1998" "netatalk 1.4b2/asun 2.1.0"
++
+ .SH NAME
+ afpd \- AppleTalk Filing Protocol daemon
++
+ .SH SYNOPSIS
+-.B :SBINDIR:/afpd
+-[
+-.B -d
+-]
+-[
+-.B -f
+-.I defaultvolumes
+-]
+-[
+-.B -s
+-.I systemvolumes
+-]
+-[
+-.B -u
+-]
+-[
+-.B -n
+-.I nbpname
+-]
+-[
+-.B -c
+-.I maxconnections
+-]
+-[
+-.B -g
+-.I guest
+-]
+-[
+-.B -G
+-]
+-[
+-.B -K
+-]
+-[
+-.B -C
+-]
+-[
+-.B -A
+-]
++\fB:SBINDIR:/afpd\fR [\fIoptions\fR]
++
+ .SH DESCRIPTION
+ .B afpd
+ provides an AppleTalk Filing Protocol (AFP)
+ interface to the Unix file system.  It is normally started at boot time
+ from
+-.BR /etc/rc .
+-The list of volumes offered to the user is generated from
+-.B :ETCDIR:/AppleVolumes.system
+-and one of
+-.BR :ETCDIR:/AppleVolumes.default ,
+-.BR $HOME/AppleVolumes ,
+-or
+-.BR $HOME/.AppleVolumes .
++.BR :ETCDIR:/rc.d/netatalk.sh .
++Configuration information is read from the configuration file 
++.BR :ETCDIR:/afpd.conf ,
++and the command line.
+ .LP
+-The
+-.B AppleVolumes
+-files is used to specify volumes to mount and file name extension mappings.
+-It is formatted as follows, one specification per line:
+-.RS
+-.sp
+-.I pathname
+-[
+-.I volumename
+-]
+-.br
+-.RI . extension
+-[
+-.I type
+-[
+-.I creator
+-]
+-]
+-.sp
+-.RE
+-If
+-.I volumename
+-is unspecified, the last component of
+-.I pathname
+-is used.  No two volumes may have the same name.  If
+-.I type
+-is unspecified
+-.RB ' ???? '
+-is used.  If
+-.I creator
+-is unspecified
+-.RB ' UNIX '
+-is used.  The extension
+-.RB ' . '
+-sets the default creator and type for otherwise untyped Unix files.
+-Blank lines and lines beginning with `#' are ignored.
++.B afpd
++supports some of AFP 2.2's features, in particular access via AFP-over-TCP,
++support for volumes larger than 2\ GB, a login greeting message, ProDOS
++support, and Two-Way Random Number Exchange for Authentication. Access via
++TCP can be protected via TCP Wrappers.
++.B afpd
++can be configured to provide multiple, seperately configured virtual
++servers.
++
+ .SH OPTIONS
+ .TP
+ .B \-d
+ Specifies that the daemon not fork, and that a trace of all AFP
+ commands be written to stdout.
+ .TP
++.BI \-c " maxconnections"
++Specifies the maximum number of connections to allow for this
++.BR afpd .
++The default is 5.
++.TP
+ .BI \-f " defaultvolumes"
+ Specifies that
+ .I defaultvolumes
+ should be read for a list of default volumes to offer, instead of
+ .BR :ETCDIR:/AppleVolumes.default .
+ .TP
++.BI \-g " guest"
++Specifies the name of the guest account.  The default is ``nobody''.
++.TP
++.BI \-n " nbpname"
++Specifies that
++.I nbpname
++should be used for NBP registration, instead of the first component of
++the hostname in the local zone.
++.TP
++.B \-p
++Don't allow the client to save the password locally.
++.TP
+ .BI \-s " systemvolumes"
+ Specifies that
+ .I systemvolumes
+@@ -110,6 +61,9 @@
+ instead of
+ .BR :ETCDIR:/AppleVolumes.system .
+ .TP
++.B \-t
++Allow the user to change her or his password.
++.TP
+ .B \-u
+ Read the user's
+ .B AppleVolumes
+@@ -123,19 +77,24 @@
+ filename extension mappings: the user's AppleVolumes file always has
+ precedence.
+ .TP
+-.BI \-n " nbpname"
+-Specifies that
+-.I nbpname
+-should be used for NBP registration, instead of the first component of
+-the hostname in the local zone.
++.B \-D
++Don't offer connections via DDP (AppleTalk).
+ .TP
+-.BI \-c " maxconnections"
+-Specifies the maximum number of connections to allow for this
+-.BR afpd .
+-The default is 5.
++\fB\-F\fR "\fIfile\fR"
++Read the configuration file from \fIfile\fR instead of the default
++\fB:ETCDIR:/afpd.conf\fR.
+ .TP
+-.BI \-g " guest"
+-Specifies the name of the guest account.  The default is ``nobody''.
++\fB\-L\fR "\fItext\fR"
++After authentication, send \fItext\fR to client.
++.TP
++\fB\-P\fR "\fIfile\fR"
++Record \fBafpd\fR's PID in \fIfile\fR.
++.TP
++\fB\-S\fR \fITCP port\fR
++Listen on port number \fITCP port\fR instead of the default 548.
++.TP
++.B \-T
++Don't offer connections via AFP-over-TCP.
+ .TP
+ .B \-G
+ .TP
+@@ -144,50 +103,191 @@
+ .B \-C
+ .TP
+ .B \-A
+-Causes the server to not offer
++Causes the server to \fBnot\fR offer
+ .BR NoUserAuthent ,
+ .BR "Kerberos IV" ,
+ .BR "Cleartxt Passwrd" ,
+ and
+ .B AFS Kerberos
+ logins, respectively.  The default is to enable all available login methods.
++
++.SH SERVER CONFIGURATION FILE
++.B afpd
++reads the configuration file 
++.BR :ETCDIR:/afpd.conf .
++Any option specified here will override any compiled-in default and any
++option specified on the command line.
++.LP
++Each line in this file specifies a virtual server to be made available.
++Empty lines and lines beginning with ``#'' are ignored. Each line is formatted
++as follows:
++.RS
++.sp
++"\fIserver name\fR"
++[\fIoptions\fR]
++.sp
++.RE
++A
++.I server name
++of ``\fB-\fR'' specifies the default server. Paramters with white space must
++be enclosed in quotes.
++.LP
++The following options are available:
++.TP
++\fB\-\fR[\fBno\fR]\fBddp\fR
++Do offer (do not offer) connections to be made to this server via AppleTalk
++(ASP over DDP).
++.TP
++\fB\-\fR[\fBno\fR]\fBtcp\fR
++Do offer (do not offer) connections to be made to this server via AFP-over-TCP,
++subject to TCP Wrapper restrictions.
++.TP
++.B \-transall
++Offer both connections via DDP and TCP (default).
++.TP
++\fB\-\fR[\fBno\fR]\fBguest\fR
++Allow (do not allow) guest logins (using the \fBNoUserAuthent\fR method).
++.TP
++\fB\-\fR[\fBno\fR]\fBcleartxt\fR
++Allow (do not allow) logins with the password transmitted as clear text
++(using the \fBCleartxt\fR method).
++.TP
++\fB\-\fR[\fBno\fR]\fBrandnum\fR
++Allow (do not allow) logins using Random Number Exchange for authentication
++(using the \fBRandNum\fR method).
++.TP
++\fB\-\fR[\fBno\fR]\fBrand2num\fR
++Allow (do not allow) logins using Two-Way Random Number Exchange for
++authentication (using the \fBTwoWayRandNum\fR method).
++.TP
++\fB\-\fR[\fBno\fR]\fBafskrb\fR
++Allow (do not allow) logins using AFS Kerberos. Whether this option is
++available depends on both the server and the client (using the \fBAFS
++Kerberos\fR method).
++.TP
++\fB\-\fR[\fBno\fR]\fBkrbiv\fR
++Allow (do not allow) logins using Kerberos IV. Whether this option is
++available depends on both the server and the client (using the 
++\fBKerberos\ IV\fR method).
++.TP
++\fB\-\fR[\fBno\fR]\fBsetpassword\fR
++Allow (do not allow) the user to change her or his password.
++.TP
++\fB\-\fR[\fBno\fR]\fBsavepassword\fR
++Allow (do not allow) the client to save the password locally.
++.TP
++\fB\-authall\fR
++Allow all available authentication methods.
++.TP
++\fB\-defaultvol\fR \fIfile\fR
++Specifies an alternate location of the default volume specification file
++instead of the default \fB:ETCDIR:/AppleVolumes.default\fR.
++.TP
++\fB\-systemvol\fR \fIfile\fR
++Specifies an alternate location of the system volume specification file
++instead of the default \fB:ETCDIR:/AppleVolumes.system\fR.
++.TP
++\fB\-\fR[\fBno\fR]\fBuservolfirst\fR
++Read the user's volume specification file before (after) the default and
++system files, allowing the user to override system-wide volume definitions.
++.TP
++\fB\-\fR[\fBno\fR]\fBuservol\fR
++Read (do not read) the user's volume specification file.
++.TP
++\fB\-guestname\fR \fIusername\fR
++User \fIusername\fR as the user id for guest access.
++.TP
++\fB\-address\fR \fIIP address\fR
++Listen on address \fIIP address\fR instead of the system's first IP address.
++.TP
++\fB\-port\fR \fITCP port\fR
++Listen on port \fITCP port\fR instead of the default port 548.
++.TP
++\fB\-loginmesg\fR \fItext\fR
++After authenticating a client, send \fItext\fR to the client. \fItext\fR can
++be up to 253 characters long and must be in Macintosh character encoding.
++.TP
++\fB\-\fR[\fBno\fR]\fBdebug\fR
++Turn on (turn off) output of debugging messages.
++
++.SH VOLUME SPECIFICATION
++The
++.B AppleVolumes
++files are used to specify parts of the file system to be made available to
++clients (``volumes'') and file name extension mappings. Empty lines and
++lines beginning with ``#'' are ignored. Each line either contains a volume
++definition or an extention mapping, providing Mac\ OS type and creator
++information for files that do not yet have this information.
++.LP
++The list of volumes offered to the user is generated from
++.B :ETCDIR:/AppleVolumes.system
++and one of
++.BR :ETCDIR:/AppleVolumes.default ,
++.BR $HOME/AppleVolumes ,
++or
++.BR $HOME/.AppleVolumes ,
++subject to the configuration file and command line options.
++.LP
++Volume definitons are formatted as follows:
++.RS
++.sp
++.I pathname
++[\fIvolumename\fR]
++.sp
++.RE
++If \fIvolumename\fR is unspecified, the last component of
++\fIpathname\fR is used.  No two volumes may have the same name.  
++.LP
++An extension mapping is formatted as follows:
++.RS
++.sp 
++.I .extension
++[\fItype\fR [\fIcreator\fR] ]
++.sp
++.RE
++If \fItype\fR is unspecified, ``\fB????\fR'' is used.  If \fIcreator\fR is
++unspecified, ``\fBUNIX\fR'' is used.  The extension ``\fB.\fR''
++sets the default creator and type for otherwise untyped Unix files.
++
+ .SH AUTHENTICATION
+ .B afpd
+-currently understands three User Authentication Methods (UAMs):
+-.BR NoUserAuthent ,
+-or guest,
+-.B Cleartxt
+-.BR passwrd ,
+-and
+-.B Kerberos
+-.BR IV .
+-If a user uses
+-.BR NoUserAuthent ,
+-s/he will only be offered default volumes to mount, and will only be able
+-to read and write files that are permitted to the guest user.  The
+-.B -G
+-option disables
+-.BR NoUserAuthent .
+-With
+-.B Cleartxt passwd
+-and
+-.B Kerberos
+-.BR IV ,
++provides a number of User Authentication Methods (UAMs). The
++\fBNoUserAuthent\fR (or guest) and the \fBCleartxt\fR methods are always
++available (subject to the configuration file and command line options).
++.LP
++The \fBRandNum\fR and \fBTwoWayRandNum\fR methods are available to a
++particular user if she or he has a file ``\fB.passwd\fR'' in the home
++directory, and that file is readable only by the user herself. When
++authenticating using one of these methods, the user also can change her or
++his password (subject to the configuration file and command line options).
++.LP
++The \fBKerberos IV\fR method depends on both the server and the client
++having installed appropriate Kerberos IV software.
++.LP
++The \fBAFP Kerberos\fR method is deprecated.
++
++.SH FILE STORAGE
+ .B afpd
+-offers the user all volumes listed in
+-.BR $HOME/AppleVolumes .
+-The user may also read and write all files that s/he normally could.
+-.B Cleartxt passwd
+-is not recommended for AFS use.
+-.B Kerberos IV
+-is recommended for AFS use.
+-A forth, depricated UAM is also included in the distribution,
+-.B AFS
+-.BR Kerberos .
++stores files in the \fBAppleDouble\fR file format, which stores the data for
++a Mac\ OS file in a regular file, and the Finder information and resource
++fork in a file with the same name in a subdirectory named
++``\fB.AppleDouble\fR.''
++.LP
++For files that do not yet have Mac OS Finder information, \fBafpd\fR
++automatically creates this information based on the extension mapping table,
++and subject to access permissions on the respective directory. No
++translation is done for files stored from a client.
++.LP
++Files created from a client whose name contains ASCII control characters or
++characters with the eighth bit set are converted, where each such character
++is replaced by the sequence ``:XX'', with ``XX'' being the hexadecimal code
++for the character. File names starting with a ``.'' or longer than 31
++characters are ignored.
++
+ .SH CAVEATS
+ .BR afpd 's
+ Directory IDs are only fixed for the duration of a session.  This means
+-that Mac aliases won't work correctly in all cases.
++that Mac\ OS aliases won't work correctly in all cases.
+ .LP
+ If a user renames a folder that has an application as its progeny, the
+ .B APPL
+@@ -195,16 +295,16 @@
+ that double-clicking on one of the application's documents will no
+ longer launch the application. The
+ .B APPL
+-mapping will be rebuilt by the mac, the next time the Finder see the
+-application.
++mapping will be rebuilt by the Mac OS Finder the next time the Finder see
++the application.
+ .LP
+ If
+ .B afpd
+-is configured to downcase Macintosh filenames, Unix filenames with
++is configured to downcase client filenames, Unix filenames with
+ mixed case will be unavailable.
+ .LP
+ If carriage return/line feed translation is enabled, it is not
+-safe to copy Unix binaries to a Macintosh.
++safe to copy Unix binaries via \fBafpd\fR.
+ .LP
+ It is not possible to move directories between devices.
+ .LP
+@@ -221,7 +321,7 @@
+ so that his home directory is no longer offered, he will no longer be able
+ to edit his
+ .B $HOME/AppleVolumes
+-from the Macintosh.
++from the client.
+ .LP
+ Unix files beginning with `.' are not accessible from the mac.
+ .LP
+@@ -252,8 +352,11 @@
+ synchronization locks use the
+ .BR flock (2)
+ interface.  This interface is not usually ``NFS-aware''.
++
+ .SH FILES
+ .TP 20
++.B :ETCDIR:/afpd.conf
++general options
+ .B :ETCDIR:/AppleVolumes.default
+ list of default volumes to mount
+ .TP 20
+@@ -262,6 +365,14 @@
+ .TP 20
+ .B $HOME/AppleVolumes
+ user's list of volumes to mount
++
++.SH AUTHORS
++\fBafpd\fR is part of the \fBnetatalk\fR suite, originally developed at the
++Research Systems Unix Group at the University of Michigan, by Wesley Craig
++<netatalk@umich.edu>, and a number of contributors. This version of
++\fBnetatalk\fR has been substantially extended by Adrian Sun
++<asun@zoology.washington.edu>.
++
+ .SH BUGS
+ Many calls from the AFP specification are not implemented, because the
+-Macintosh does not use them.
++MacOS does not use them.
diff --git a/net/netatalk-asun/files/patch-bb b/net/netatalk-asun/files/patch-bb
new file mode 100644
index 000000000000..8f0f83f0ba94
--- /dev/null
+++ b/net/netatalk-asun/files/patch-bb
@@ -0,0 +1,11 @@
+--- man/man8/atalkd.8.orig	Mon Sep  7 23:25:57 1998
++++ man/man8/atalkd.8	Mon Sep  7 23:26:21 1998
+@@ -19,7 +19,7 @@
+ .BR ping (8)).
+ .B atalkd
+ is typically started at boot time, out of
+-.B /etc/rc.
++.B :ETCDIR:/rc.d/netatalk.sh .
+ It first reads from it's configuration file,
+ .BR :ETCDIR:/atalkd.conf .
+ If there is no configuration file,
diff --git a/net/netatalk-asun/files/patch-bc b/net/netatalk-asun/files/patch-bc
new file mode 100644
index 000000000000..11764359889b
--- /dev/null
+++ b/net/netatalk-asun/files/patch-bc
@@ -0,0 +1,11 @@
+--- man/man8/papd.8.orig	Mon Sep  7 23:26:29 1998
++++ man/man8/papd.8	Mon Sep  7 23:26:47 1998
+@@ -30,7 +30,7 @@
+ .LP
+ .B papd
+ is typically started at boot time, out of
+-.B /etc/rc.
++.B :ETCDIR:/etc/rc.d/netatalk.sh .
+ It first reads from its configuration file,
+ .BR :ETCDIR:/papd.conf .
+ The file is in the same format as
diff --git a/net/netatalk-asun/files/patch-bd b/net/netatalk-asun/files/patch-bd
new file mode 100644
index 000000000000..927cfab06dd8
--- /dev/null
+++ b/net/netatalk-asun/files/patch-bd
@@ -0,0 +1,94 @@
+--- config/afpd.conf.orig	Sat May  2 05:01:11 1998
++++ config/afpd.conf	Tue Nov 24 04:05:13 1998
+@@ -1,33 +1,59 @@
+ #
+-# Format of lines in this file:
++# CONFIGURATION FOR AFPD
+ #
+-#    server [ -tcp ] [ -ddp ] [ -guest ] [ -loginmesg message ] ...
+-#
+-# To specify a line with the default server name, use a "-" as the
+-# server name.
+-#
+-# There are a whole plethora of options available. Here they are for
+-# your edification:
+-#	toggles (-no<option> turns that option off; -<option> turns
+-#		it on):
+-#		transports: tcp, ddp, transall
+-#		debug: nodebug (can only turn off debug)
+-#		auth: cleartxt, afskrb, krbiv, guest, randnum, rand2num, 
+-#                     authall (doesn't include randnum/rand2num)
+-#               passwd: savepassword, setpassword
+-#		user volumes: uservolfirst, 
+-#		   	      nouservol (don't look for ~/.AppleVolumes)
+-#		
+-#
+-#	options w/ arguments (-<option> <argument>):
+-#	        defaultvol, systemvol, loginmesg, guestname 
+-#	        address (binds a server to a specific address)
+-#		port (has to be specified if more than one tcp server
+-#                    is to be served)
+-#		
+-# Order of precedence:
+-#	options in afpd.conf > command-line options > built-in options
++# Each line defines a virtual server that should be available.
++# Empty lines and lines beginning with `#' are ignored.
++# Options in this file will override both compiled-in defaults
++# and command line options.
++#
++# Format:
++#  - [options]	              to specify options for the default server
++#  "Server name" [options]   to specify an additional server
++#
++# The following options are available:
++#   Transport Protocols:
++#     -[no]tcp       Make AFP-over-TCP [not] available
++#     -[no]ddp       Make AFP over AppleTalk [not] available
++#     -transall      Make both available (default)
++#
++#   Authentication Methods:
++#     -[no]cleartxt  [Don't] Allow logins with password transmitted 
++#                    in the clear (same as -C on command line)
++#     -[no]guest     [Don't] Allow guest logins (will run as nobody/nogroup)
++#                    (same as -G on command line on command line)
++#     -[no]randnum
++#     -[no]rand2num  [Don't] Allow Random Number or Two-Way Random Number
++#                    exchange for transmitting the password (see below)
++#     -authall       Allow all of the above
++#
++#   Password Options:
++#     -[no]savepassword   [Don't] Allow clients to save password locally
++#
++#   AppleVolumes files:
++#     -defaultvol         Specifies path to AppleVolumes.default file
++#                         (default /usr/local/etc/AppleVolumes.default,
++#                         same as -f on command line)
++#     -systemvol          Specifies path to AppleVolumes.system file
++#                         (default /usr/local/etc/AppleVolumes.system,
++#                         same as -s on command line)
++#     -[no]uservolfirst   [Don't] read the user's ~/AppleVolumes or
++#                         ~/.AppleVolumes before reading
++#                         /usr/local/etc/AppleVolumes.default
++#                         (same as -u on command line)
++#     -[no]uservol        [Don't] Read the user's volume file
++#
++#   Miscellaneous:
++#     -guestname "user"   Specifies the user name for the guest login
++#                         (default "nobody", same as -g on command line)
++#     -loginmesg "Message"  Client will display "Message" upon logging in
++#                         (no default, same as -l "Message" on command line)
++#     -address            Specifies the IP address the server should respond
++#                         to (default is the first IP address of the system)
++#     -port               Specifies the TCP port the server should respond
++#                         to (default is 548)
++#     -nodebug            Switch off debugging
+ #
++
+ # Some examples:
+ #
+ #	The simplest case is to not have an afpd.conf.
+@@ -45,4 +71,3 @@
+ #		"Guest Volume" -nocleartxt -loginmesg "Welcome guest!"
+ #		"User Volume" -noguest -port 12000
+ #		"special" -notcp -defaultvol <path> -systemvol <path>
+-#
diff --git a/net/netatalk-asun/pkg-comment b/net/netatalk-asun/pkg-comment
new file mode 100644
index 000000000000..900a786b1ff8
--- /dev/null
+++ b/net/netatalk-asun/pkg-comment
@@ -0,0 +1 @@
+File and print server for AppleTalk networks, with improvements by A. Sun
diff --git a/net/netatalk-asun/pkg-descr b/net/netatalk-asun/pkg-descr
new file mode 100644
index 000000000000..e01f1e775616
--- /dev/null
+++ b/net/netatalk-asun/pkg-descr
@@ -0,0 +1,37 @@
+netatalk-asun - File and Print Server for AppleTalk networks
+
+netatalk is a server software for AppleTalk networks. 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.
+
+
+In addition to the base features, Adrian Sun has added these 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.
+
+
+Don't install this port in parallel to net/netatalk; this will break both.
+
+Requires AppleTalk support in the kernel (FreeBSD 2.2 or newer).
+
+See http://www.umich.edu/~rsug/netatalk/ for further information.
diff --git a/net/netatalk-asun/pkg-install b/net/netatalk-asun/pkg-install
new file mode 100644
index 000000000000..ebc2f2a4430a
--- /dev/null
+++ b/net/netatalk-asun/pkg-install
@@ -0,0 +1,42 @@
+#!/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
+		checkfile ${PKG_PREFIX}/etc/afpd.conf
+
+		# 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-asun/pkg-plist b/net/netatalk-asun/pkg-plist
new file mode 100644
index 000000000000..8d16f18eb010
--- /dev/null
+++ b/net/netatalk-asun/pkg-plist
@@ -0,0 +1,79 @@
+bin/aecho
+bin/getzones
+bin/hqx2bin
+bin/macbinary
+bin/megatron
+bin/nbplkup
+bin/nbprgstr
+bin/nbpunrgstr
+bin/pap
+bin/papstatus
+bin/psorder
+bin/single2bin
+bin/unbin
+bin/unhex
+bin/unsingle
+etc/AppleVolumes.default.dist
+etc/AppleVolumes.system.dist
+etc/afpd.conf.dist
+etc/rc.d/netatalk.sh
+include/atalk/adouble.h
+include/atalk/aep.h
+include/atalk/afp.h
+include/atalk/asp.h
+include/atalk/atp.h
+include/atalk/compat.h
+include/atalk/ddp.h
+include/atalk/dsi.h
+include/atalk/nbp.h
+include/atalk/pap.h
+include/atalk/paths.h
+include/atalk/rtmp.h
+include/atalk/server_child.h
+include/atalk/util.h
+include/atalk/zip.h
+@dirrm include/atalk
+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
+@dirrm libexec/filters
+share/examples/netatalk/atalkd.conf
+share/examples/netatalk/papd.conf
+@dirrm share/examples/netatalk
+share/pagecount.ps
+@comment	Remove man page aliases
+@unexec rm -f %D/man/man1/hqx2bin.1*
+@unexec rm -f %D/man/man1/macbinary.1*
+@unexec rm -f %D/man/man1/single2bin.1*
+@unexec rm -f %D/man/man1/unbin.1*
+@unexec rm -f %D/man/man1/unhex.1*
+@unexec rm -f %D/man/man1/unsingle.1*
+@unexec rm -f %D/man/man1/nbplkup.1*
+@unexec rm -f %D/man/man1/nbprgstr.1*
+@unexec rm -f %D/man/man1/nbpunrgstr.1*
+@unexec rm -f %D/man/man1/papstatus.1*