3 files changed, 32 insertions, 61 deletions

diff --git a/net/netatalk/files/patch-configure b/net/netatalk/files/patch-configure
index 6c68a480848d..f50ca2940735 100644
--- a/net/netatalk/files/patch-configure
+++ b/net/netatalk/files/patch-configure
@@ -1,13 +1,13 @@
---- configure.orig	Mon Jan  7 11:00:12 2002
-+++ configure	Mon Jan  7 11:00:34 2002
-@@ -8249,14 +8249,14 @@
+--- configure.orig	Sat Jan 26 16:25:38 2002
++++ configure	Sat Jan 26 16:25:51 2002
+@@ -8250,14 +8250,14 @@
  			savedldflags="$LDFLAGS"
  			CFLAGS="$CFLAGS -I$db3dir"
  			LDFLAGS="-L$db3libdir $LDFLAGS"
 -			echo $ac_n "checking for main in -ldb""... $ac_c" 1>&6
--echo "configure:8254: checking for main in -ldb" >&5
+-echo "configure:8255: checking for main in -ldb" >&5
 +			echo $ac_n "checking for main in -ldb3""... $ac_c" 1>&6
-+echo "configure:8254: checking for main in -ldb3" >&5
++echo "configure:8255: checking for main in -ldb3" >&5
  ac_lib_var=`echo db'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -16,9 +16,9 @@
 -LIBS="-ldb  $LIBS"
 +LIBS="-ldb3  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8262 "configure"
+ #line 8263 "configure"
  #include "confdefs.h"
-@@ -8283,7 +8283,7 @@
+@@ -8284,7 +8284,7 @@
    
  				db3found=yes
  				DB3_CFLAGS="-I$db3dir"
diff --git a/net/netatalk/files/patch-ltmain.sh b/net/netatalk/files/patch-ltmain.sh
new file mode 100644
index 000000000000..2ac052749556
--- /dev/null
+++ b/net/netatalk/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/netatalk/files/patch-macusers b/net/netatalk/files/patch-macusers
deleted file mode 100644
index 763e5ec339af..000000000000
--- a/net/netatalk/files/patch-macusers
+++ /dev/null
@@ -1,54 +0,0 @@
---- contrib/macusers/macusers.orig	Wed Aug 29 12:20:32 2001
-+++ contrib/macusers/macusers	Sun Jun 17 01:47:44 2001
-@@ -1,8 +1,8 @@
- #!/usr/bin/perl
--# $Id: macusers,v 1.4 2001/06/29 14:14:46 rufustfirefly Exp $
- 
- use strict;
--use vars qw($MAC_PROCESS $PS_STR $MATCH_STR $ASIP_PORT $LSOF);
-+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.
- 
-@@ -25,10 +25,11 @@
-         $PS_STR    = "-ef";
-         $MATCH_STR = '\s*(\w+)\s+(\d+)\s+(\d+)\s+\d+\s+([\d\w:]+)';
- }
--$ASIP_PORT = "afpovertcp";
-+$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 ) {
-@@ -43,8 +44,25 @@
-                 ($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";
- }