Module Name:	pkgsrc
Committed By:	kei
Date:		Sun Sep  3 09:17:01 UTC 2000

Modified Files:
	pkgsrc/net/samba: Makefile
	pkgsrc/net/samba/files: md5 patch-sum
	pkgsrc/net/samba/patches: patch-aa patch-ac patch-ae patch-af
	pkgsrc/net/samba/pkg: DESCR PLIST

Log Message:
Merged japanese/samba package to net/samba, as per discussion of
Hubert Feyrer and Manuel Bouyer.


To generate a diff of this commit:
cvs rdiff -r1.35 -r1.36 pkgsrc/net/samba/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/net/samba/files/md5
cvs rdiff -r1.6 -r1.7 pkgsrc/net/samba/files/patch-sum
cvs rdiff -r1.10 -r1.11 pkgsrc/net/samba/patches/patch-aa
cvs rdiff -r1.4 -r1.5 pkgsrc/net/samba/patches/patch-ac
cvs rdiff -r1.2 -r1.3 pkgsrc/net/samba/patches/patch-ae \
    pkgsrc/net/samba/patches/patch-af
cvs rdiff -r1.3 -r1.4 pkgsrc/net/samba/pkg/DESCR
cvs rdiff -r1.17 -r1.18 pkgsrc/net/samba/pkg/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.