From nakaji@xa12.heimat.gr.jp  Wed Jan 12 23:25:20 2005
Return-Path: <nakaji@xa12.heimat.gr.jp>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7CCFE16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Jan 2005 23:25:20 +0000 (GMT)
Received: from www.heimat.gr.jp (catv-118-241.tees.ne.jp [203.141.118.241])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4A2CE43D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Jan 2005 23:25:19 +0000 (GMT)
	(envelope-from nakaji@xa12.heimat.gr.jp)
Received: from xa12.heimat.gr.jp (xa12.heimat.gr.jp [202.216.136.35])
	by www.heimat.gr.jp (8.13.1/8.13.1) with ESMTP id j0CNPGGc041714;
	Thu, 13 Jan 2005 08:25:16 +0900 (JST)
	(envelope-from nakaji@xa12.heimat.gr.jp)
Received: from xa12.heimat.gr.jp (localhost [127.0.0.1])
	by xa12.heimat.gr.jp (8.13.1/8.13.1) with ESMTP id j0CNPF0e003500;
	Thu, 13 Jan 2005 08:25:15 +0900 (JST)
	(envelope-from nakaji@xa12.heimat.gr.jp)
Received: (from nakaji@localhost)
	by xa12.heimat.gr.jp (8.13.1/8.13.1/Submit) id j0CNPE8v003499;
	Thu, 13 Jan 2005 08:25:14 +0900 (JST)
	(envelope-from nakaji)
Message-Id: <200501122325.j0CNPE8v003499@xa12.heimat.gr.jp>
Date: Thu, 13 Jan 2005 08:25:14 +0900 (JST)
From: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
Reply-To: NAKAJI Hiroyuki <nakaji@jp.freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: kris@obsecurity.org
Subject: [japanese/samba] fix incomplete pkg-plist and add rcNG notice
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         76181
>Category:       ports
>Synopsis:       [japanese/samba] fix incomplete pkg-plist and add rcNG notice
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    nork
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 12 23:30:18 GMT 2005
>Closed-Date:    Tue Jan 18 14:25:42 GMT 2005
>Last-Modified:  Tue Jan 18 14:25:42 GMT 2005
>Originator:     NAKAJI Hiroyuki
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD xa12.heimat.gr.jp 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Mon Jan 3 20:50:13 JST 2005 root@xa12.heimat.gr.jp:/usr/obj/home/nakaji/FreeBSD-PC98/src/sys/NAKAJI i386


>Description:
	Kris "Ports Janitor" Kennaway reminded me of an error in
japanese/samba/pkg-plist, because of which pakage build fails. And
Shimaoka Shunsuke submitted an additional sentences in
files/README.FreeBSD about rcNG notice.

>How-To-Repeat:

>Fix:
	Here is a diff from ports-current to fix two problems
described above. I sent the diff for pkg-plist to Kris, but it hasn't
been committed yet. Thanks.

Index: Makefile
===================================================================
RCS file: /net/pcat/home/ncvs/ports/japanese/samba/Makefile,v
retrieving revision 1.46
diff -u -r1.46 Makefile
--- Makefile	31 Oct 2004 12:23:05 -0000	1.46
+++ Makefile	12 Jan 2005 23:22:04 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	samba
 PORTVERSION=	${SAMBA_VERSION}.j${SAMBA_JA_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.samba.gr.jp/pub/samba-jp/%SUBDIR%/ \
 		ftp://ftp.iij.ad.jp/pub/SAMBA/samba-jp/%SUBDIR%/ \
Index: pkg-plist
===================================================================
RCS file: /net/pcat/home/ncvs/ports/japanese/samba/pkg-plist,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist
--- pkg-plist	12 Oct 2004 17:01:48 -0000	1.18
+++ pkg-plist	19 Dec 2004 00:11:53 -0000
@@ -778,6 +778,7 @@
 %%PORTDOCS%%@dirrm share/doc/samba/textdocs/outdated
 %%PORTDOCS%%@dirrm share/doc/samba/textdocs
 %%PORTDOCS%%@dirrm share/doc/samba/yodldocs
+%%PORTDOCS%%@dirrm share/doc/samba
 share/examples/samba/LDAP/README
 share/examples/samba/LDAP/export_smbpasswd.pl
 share/examples/samba/LDAP/import_smbpasswd.pl
@@ -1534,6 +1535,7 @@
 @dirrm share/swat/using_samba/ja/gifs
 @dirrm share/swat/using_samba/ja
 @dirrm share/swat/using_samba
+@dirrm share/swat
 @exec /bin/cat %D/share/doc/samba/README.FreeBSD
 @unexec /bin/rmdir /var/db/samba 2>/dev/null || true
 %%LIBSAMBA%%@dirrm lib/samba
Index: files/README.FreeBSD
===================================================================
RCS file: /net/pcat/home/ncvs/ports/japanese/samba/files/README.FreeBSD,v
retrieving revision 1.7
diff -u -r1.7 README.FreeBSD
--- files/README.FreeBSD	9 Apr 2003 09:56:20 -0000	1.7
+++ files/README.FreeBSD	12 Jan 2005 23:13:10 -0000
@@ -5,12 +5,20 @@
 1. Copy /usr/local/etc/smb.conf.default to /usr/local/etc/smb.conf, and edit
    it.
 2. Copy /usr/local/etc/rc.d/samba.sh.sample to /usr/local/etc/rc.d/samba.sh
-3. Type /usr/local/etc/rc.d/samba.sh or reboot.
+3. Add
+	samba_enable="YES"
+   in your /etc/rc.conf or /etc/rc.conf.local to run smbd, nmbd and winbindd.
+   You can set
+	smbd_enable="YES"
+	nmbd_enable="YES" or
+	winbindd_enable="YES"
+   to run smbd, nmbd or winbindd respectively.
+4. Type "/usr/local/etc/rc.d/samba.sh start" or reboot.
 
 See document files in /usr/local/share/doc/samba and example config files in
 /usr/local/share/examples/samba for details.
 
-Samba Japanese Edition is based on Samba 2.2.7b, implemented the
+Samba Japanese Edition is based on Samba 2.2.11, implemented the
 internationalized SWAT and fixed several problems arond functions for
 Japanese support. See smb.conf.sample for details. If you want to use
 NT4+SP3 or Win95+updates clients, set "encrypt passwords" parameter to
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nork 
Responsible-Changed-By: nork 
Responsible-Changed-When: Thu Jan 13 12:41:48 GMT 2005 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76181 
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Tue Jan 18 14:25:32 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=76181 
>Unformatted:
