Added patch to fix problems in displaying volume information for filesystems

larger than 2G, plus patches to make netatalk working on -current (based on
Julian's patch at http://www.umich.edu/~rsug/netatalk/patches/ ).
Reviewed by:	jkh@freebsd.org

8 files changed, 10 insertions, 174 deletions

diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 1230fe8daef1..5ad151ea23a3 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         23 Jul 1997
 # Whom:                 stb
 #
-# $Id: Makefile,v 1.3 1998/01/21 15:00:55 jfieber Exp $
+# $Id: Makefile,v 1.4 1998/01/22 11:06:40 asami Exp $
 #
 
 DISTNAME=       netatalk-1.4b2
@@ -11,7 +11,7 @@ CATEGORIES=	net print
 MASTER_SITES=   ftp://terminator.rs.itd.umich.edu/unix/netatalk/
 
 PATCH_SITES=	http://www.umich.edu/~rsug/netatalk/patches/1.4b2/
-PATCHFILES=	afpd-macos8.diff
+PATCHFILES=	afpd-macos8.diff afpd-bfree.diff
 
 MAINTAINER=	stb@freebsd.org
 
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
index dd0b8b00f154..3d3050874891 100644
--- a/net/netatalk-devel/distinfo
+++ b/net/netatalk-devel/distinfo
@@ -1,2 +1,3 @@
 MD5 (netatalk-1.4b2.tar.gz) = b7541838044e167405bb33236faf4ce7
 MD5 (afpd-macos8.diff) = 55c6943f03c06aa7e1ff195553dcbe98
+MD5 (afpd-bfree.diff) = 54817f22f00471109a88b554097125b2
diff --git a/net/netatalk-devel/files/patch-aa b/net/netatalk-devel/files/patch-aa
index e4b50e1d25fe..265e8f04a286 100644
--- a/net/netatalk-devel/files/patch-aa
+++ b/net/netatalk-devel/files/patch-aa
@@ -1,4 +1,3 @@
-diff -crP ../netatalk-1.4b2/Makefile ./Makefile
 *** ../netatalk-1.4b2/Makefile	Wed Oct  9 20:14:20 1996
 --- ./Makefile	Thu Jul 24 01:40:24 1997
 ***************
@@ -34,85 +33,3 @@ diff -crP ../netatalk-1.4b2/Makefile ./Makefile
   # for configuration files (AppleVolumes.system, etc.)
   ETCDIR=$(DESTDIR)/etc
   # for include files
-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,19 ----
-+ #
-+ # 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
-+ 		;;
-+ esac
-diff -crP ../netatalk-1.4b2/sys/freebsd/Makefile ./sys/freebsd/Makefile
-*** ../netatalk-1.4b2/sys/freebsd/Makefile	Tue Oct 22 23:31:01 1996
---- ./sys/freebsd/Makefile	Thu Jul 24 02:32:58 1997
-***************
-*** 21,27 ****
-  FRC:
-  
-  install :
-! 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-  	for i in ${ALL}; \
-  	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
-  		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
---- 21,28 ----
-  FRC:
-  
-  install :
-! 	-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,46 ****
-  		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."
-  
-  clean :
-  	for i in ${ALL}; \
---- 31,46 ----
-  		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-  		INSTALL="${INSTALL}" $@); \
-  	done
-  	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.freebsd > ${ETCDIR}/rc.d/netatalk.sh
-! 	chmod +x ${ETCDIR}/rc.d/netatalk.sh
-! 	cp ../../config/AppleVolumes.default \
-! 		../../config/AppleVolumes.system ${ETCDIR}
-! 	cp ../../config/atalkd.conf ../../config/papd.conf \
-! 		${RESDIR}/examples/netatalk
-  
-  clean :
-  	for i in ${ALL}; \
diff --git a/net/netatalk-devel/pkg-plist b/net/netatalk-devel/pkg-plist
index 518e244ffbf9..d9af883695b0 100644
--- a/net/netatalk-devel/pkg-plist
+++ b/net/netatalk-devel/pkg-plist
@@ -13,8 +13,8 @@ bin/single2bin
 bin/unbin
 bin/unhex
 bin/unsingle
-etc/AppleVolumes.default
-etc/AppleVolumes.system
+etc/AppleVolumes.default.dist
+etc/AppleVolumes.system.dist
 etc/rc.d/netatalk.sh
 include/atalk/adouble.h
 include/atalk/aep.h
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 1230fe8daef1..5ad151ea23a3 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -3,7 +3,7 @@
 # Date created:         23 Jul 1997
 # Whom:                 stb
 #
-# $Id: Makefile,v 1.3 1998/01/21 15:00:55 jfieber Exp $
+# $Id: Makefile,v 1.4 1998/01/22 11:06:40 asami Exp $
 #
 
 DISTNAME=       netatalk-1.4b2
@@ -11,7 +11,7 @@ CATEGORIES=	net print
 MASTER_SITES=   ftp://terminator.rs.itd.umich.edu/unix/netatalk/
 
 PATCH_SITES=	http://www.umich.edu/~rsug/netatalk/patches/1.4b2/
-PATCHFILES=	afpd-macos8.diff
+PATCHFILES=	afpd-macos8.diff afpd-bfree.diff
 
 MAINTAINER=	stb@freebsd.org
 
diff --git a/net/netatalk/distinfo b/net/netatalk/distinfo
index dd0b8b00f154..3d3050874891 100644
--- a/net/netatalk/distinfo
+++ b/net/netatalk/distinfo
@@ -1,2 +1,3 @@
 MD5 (netatalk-1.4b2.tar.gz) = b7541838044e167405bb33236faf4ce7
 MD5 (afpd-macos8.diff) = 55c6943f03c06aa7e1ff195553dcbe98
+MD5 (afpd-bfree.diff) = 54817f22f00471109a88b554097125b2
diff --git a/net/netatalk/files/patch-aa b/net/netatalk/files/patch-aa
index e4b50e1d25fe..265e8f04a286 100644
--- a/net/netatalk/files/patch-aa
+++ b/net/netatalk/files/patch-aa
@@ -1,4 +1,3 @@
-diff -crP ../netatalk-1.4b2/Makefile ./Makefile
 *** ../netatalk-1.4b2/Makefile	Wed Oct  9 20:14:20 1996
 --- ./Makefile	Thu Jul 24 01:40:24 1997
 ***************
@@ -34,85 +33,3 @@ diff -crP ../netatalk-1.4b2/Makefile ./Makefile
   # for configuration files (AppleVolumes.system, etc.)
   ETCDIR=$(DESTDIR)/etc
   # for include files
-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,19 ----
-+ #
-+ # 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
-+ 		;;
-+ esac
-diff -crP ../netatalk-1.4b2/sys/freebsd/Makefile ./sys/freebsd/Makefile
-*** ../netatalk-1.4b2/sys/freebsd/Makefile	Tue Oct 22 23:31:01 1996
---- ./sys/freebsd/Makefile	Thu Jul 24 02:32:58 1997
-***************
-*** 21,27 ****
-  FRC:
-  
-  install :
-! 	-mkdir ${DESTDIR} ${SBINDIR} ${BINDIR} ${ETCDIR} ${LIBDIR}
-  	for i in ${ALL}; \
-  	    do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
-  		ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
---- 21,28 ----
-  FRC:
-  
-  install :
-! 	-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,46 ****
-  		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."
-  
-  clean :
-  	for i in ${ALL}; \
---- 31,46 ----
-  		AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
-  		INSTALL="${INSTALL}" $@); \
-  	done
-  	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.freebsd > ${ETCDIR}/rc.d/netatalk.sh
-! 	chmod +x ${ETCDIR}/rc.d/netatalk.sh
-! 	cp ../../config/AppleVolumes.default \
-! 		../../config/AppleVolumes.system ${ETCDIR}
-! 	cp ../../config/atalkd.conf ../../config/papd.conf \
-! 		${RESDIR}/examples/netatalk
-  
-  clean :
-  	for i in ${ALL}; \
diff --git a/net/netatalk/pkg-plist b/net/netatalk/pkg-plist
index 518e244ffbf9..d9af883695b0 100644
--- a/net/netatalk/pkg-plist
+++ b/net/netatalk/pkg-plist
@@ -13,8 +13,8 @@ bin/single2bin
 bin/unbin
 bin/unhex
 bin/unsingle
-etc/AppleVolumes.default
-etc/AppleVolumes.system
+etc/AppleVolumes.default.dist
+etc/AppleVolumes.system.dist
 etc/rc.d/netatalk.sh
 include/atalk/adouble.h
 include/atalk/aep.h