Merged japanese/samba package to net/samba, as per discussion of

Hubert Feyrer and Manuel Bouyer.

4 files changed, 23 insertions, 23 deletions

diff --git a/net/samba/patches/patch-aa b/net/samba/patches/patch-aa
index 411880a5b9c..1d0ac65b721 100644
--- a/net/samba/patches/patch-aa
+++ b/net/samba/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $
+$NetBSD: patch-aa,v 1.11 2000/09/03 09:17:00 kei Exp $
 
---- Makefile.in.orig	Tue Apr 25 19:06:11 2000
-+++ Makefile.in	Fri Apr 28 16:26:52 2000
-@@ -25,10 +25,12 @@
+--- Makefile.in.orig	Thu Jun  8 13:31:59 2000
++++ Makefile.in	Sun Sep  3 06:23:06 2000
+@@ -26,10 +26,12 @@
  BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $
  SAMBABOOK = @sambabook@
  
  # The permissions to give the executables
-@@ -37,12 +39,12 @@
+@@ -38,12 +40,12 @@
  # set these to where to find various files
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
@@ -35,12 +35,12 @@ $NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -463,14 +465,14 @@
+@@ -470,14 +472,14 @@
  
  installdirs:
  	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) \
--	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR)
-+	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR)
+-	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(VARDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK}
++	$(BASEDIR) $(SBINDIR) $(BINDIR) $(LIBDIR) $(ETCDIR) $(LOGDIR) $(CODEPAGEDIR) ${SWATDIR} ${SAMBABOOK}
  
  installservers: all installdirs
 -	@$(SHELL) $(srcdir)/script/installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@@ -54,7 +54,7 @@ $NetBSD: patch-aa,v 1.10 2000/05/02 15:24:09 jlam Exp $
  
  installscripts: installdirs
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
-@@ -495,8 +497,8 @@
+@@ -502,8 +504,8 @@
  	@$(SHELL) $(srcdir)/script/uninstallman.sh $(MANDIR) $(srcdir)
  
  uninstallbin:
diff --git a/net/samba/patches/patch-ac b/net/samba/patches/patch-ac
index 20339626b91..104548bcc54 100644
--- a/net/samba/patches/patch-ac
+++ b/net/samba/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2000/05/02 15:24:10 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2000/09/03 09:17:00 kei Exp $
 
---- acconfig.h.orig	Tue Apr 25 19:06:11 2000
-+++ acconfig.h	Fri Apr 28 16:27:20 2000
-@@ -79,7 +79,9 @@
+--- acconfig.h.orig	Tue Jul 11 02:37:45 2000
++++ acconfig.h	Sun Sep  3 06:23:07 2000
+@@ -80,7 +80,9 @@
  #undef SIZEOF_INO_T
  #undef SIZEOF_OFF_T
  #undef STAT_STATVFS64
diff --git a/net/samba/patches/patch-ae b/net/samba/patches/patch-ae
index 2d3ca094b97..6d946001f70 100644
--- a/net/samba/patches/patch-ae
+++ b/net/samba/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2000/05/02 15:24:10 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2000/09/03 09:17:00 kei Exp $
 
---- configure.in.orig	Tue Apr 25 19:06:39 2000
-+++ configure.in	Fri Apr 28 16:33:54 2000
-@@ -234,9 +234,6 @@
+--- configure.in.orig	Tue Jul 11 02:37:45 2000
++++ configure.in	Sun Sep  3 06:23:09 2000
+@@ -237,9 +237,6 @@
  AC_CHECK_TYPE(offset_t,loff_t)
  AC_CHECK_TYPE(ssize_t, int)
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 15:24:10 jlam Exp $
  # we need libdl for PAM and the new VFS code
  AC_CHECK_LIB(dl,main)
  
-@@ -312,7 +309,14 @@
+@@ -315,7 +312,14 @@
  # test for where we get readline() from
  if test "$ac_cv_header_readline_h" = "yes" ||
     test "$ac_cv_header_readline_readline_h" = "yes"; then
@@ -28,7 +28,7 @@ $NetBSD: patch-ae,v 1.2 2000/05/02 15:24:10 jlam Exp $
  fi
  
  
-@@ -1138,6 +1142,24 @@
+@@ -1227,6 +1231,24 @@
      AC_DEFINE(BROKEN_NISPLUS_INCLUDE_FILES)
  fi
  
diff --git a/net/samba/patches/patch-af b/net/samba/patches/patch-af
index 7f22299d1c7..bda5fdc5778 100644
--- a/net/samba/patches/patch-af
+++ b/net/samba/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2000/05/02 15:24:10 jlam Exp $
+$NetBSD: patch-af,v 1.3 2000/09/03 09:17:00 kei Exp $
 
---- include/includes.h.orig	Tue Apr 25 19:06:46 2000
-+++ include/includes.h	Fri Apr 28 16:34:56 2000
-@@ -808,20 +808,20 @@
+--- include/includes.h.orig	Sat Jul 15 01:52:58 2000
++++ include/includes.h	Sun Sep  3 06:23:10 2000
+@@ -832,20 +832,20 @@
  #define ULTRIX_AUTH 1
  #endif