Patches were not added, although I thought they were :-(

10 files changed, 372 insertions, 0 deletions

diff --git a/net/netatalk-devel/files/patch-ab b/net/netatalk-devel/files/patch-ab
new file mode 100644
index 000000000000..433387c6cb5e
--- /dev/null
+++ b/net/netatalk-devel/files/patch-ab
@@ -0,0 +1,25 @@
+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 --git a/net/netatalk-devel/files/patch-ac b/net/netatalk-devel/files/patch-ac
new file mode 100644
index 000000000000..55fdc164df70
--- /dev/null
+++ b/net/netatalk-devel/files/patch-ac
@@ -0,0 +1,56 @@
+*** ../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 ${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-devel/files/patch-ad b/net/netatalk-devel/files/patch-ad
new file mode 100644
index 000000000000..b7b1bf86c691
--- /dev/null
+++ b/net/netatalk-devel/files/patch-ad
@@ -0,0 +1,48 @@
+*** 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-devel/files/patch-ae b/net/netatalk-devel/files/patch-ae
new file mode 100644
index 000000000000..ccb04e77d285
--- /dev/null
+++ b/net/netatalk-devel/files/patch-ae
@@ -0,0 +1,45 @@
+*** 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-devel/files/patch-af b/net/netatalk-devel/files/patch-af
new file mode 100644
index 000000000000..9aabbf3a0648
--- /dev/null
+++ b/net/netatalk-devel/files/patch-af
@@ -0,0 +1,12 @@
+*** etc/atalkd/rtmp.c.orig	Wed Feb 25 18:28:16 1998
+--- etc/atalkd/rtmp.c	Wed Feb 25 18:28:29 1998
+***************
+*** 7,12 ****
+--- 7,13 ----
+  #include <sys/types.h>
+  #include <sys/socket.h>
+  #include <sys/ioctl.h>
++ #include <sys/time.h>
+  #include <net/if.h>
+  #include <net/route.h>
+  #include <netatalk/endian.h>
diff --git a/net/netatalk/files/patch-ab b/net/netatalk/files/patch-ab
new file mode 100644
index 000000000000..433387c6cb5e
--- /dev/null
+++ b/net/netatalk/files/patch-ab
@@ -0,0 +1,25 @@
+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 --git a/net/netatalk/files/patch-ac b/net/netatalk/files/patch-ac
new file mode 100644
index 000000000000..55fdc164df70
--- /dev/null
+++ b/net/netatalk/files/patch-ac
@@ -0,0 +1,56 @@
+*** ../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 ${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
new file mode 100644
index 000000000000..b7b1bf86c691
--- /dev/null
+++ b/net/netatalk/files/patch-ad
@@ -0,0 +1,48 @@
+*** 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
new file mode 100644
index 000000000000..ccb04e77d285
--- /dev/null
+++ b/net/netatalk/files/patch-ae
@@ -0,0 +1,45 @@
+*** 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-af b/net/netatalk/files/patch-af
new file mode 100644
index 000000000000..9aabbf3a0648
--- /dev/null
+++ b/net/netatalk/files/patch-af
@@ -0,0 +1,12 @@
+*** etc/atalkd/rtmp.c.orig	Wed Feb 25 18:28:16 1998
+--- etc/atalkd/rtmp.c	Wed Feb 25 18:28:29 1998
+***************
+*** 7,12 ****
+--- 7,13 ----
+  #include <sys/types.h>
+  #include <sys/socket.h>
+  #include <sys/ioctl.h>
++ #include <sys/time.h>
+  #include <net/if.h>
+  #include <net/route.h>
+  #include <netatalk/endian.h>