From owner-cvs-all@FreeBSD.ORG  Tue Nov 25 08:12:20 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6A41C16A4CE; Tue, 25 Nov 2003 08:12:20 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C72E643F3F; Tue, 25 Nov 2003 08:12:19 -0800 (PST)
	(envelope-from trevor@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAPGCJXJ007994;
	Tue, 25 Nov 2003 08:12:19 -0800 (PST)
	(envelope-from trevor@repoman.freebsd.org)
Received: (from trevor@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAPGCJfa007993;
	Tue, 25 Nov 2003 08:12:19 -0800 (PST)
	(envelope-from trevor)
Message-Id: <200311251612.hAPGCJfa007993@repoman.freebsd.org>
From: Trevor Johnson <trevor@FreeBSD.org>
Date: Tue, 25 Nov 2003 08:12:19 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/japanese/linux-JM Makefile ports/japanese/samba
 Makefile ports/net/samba-devel Makefile
 ports/net/samba-libsmbclient Makefile ports/net/samba Makefile
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Nov 2003 16:12:20 -0000

trevor      2003/11/25 08:12:19 PST

  FreeBSD ports repository

  Modified files:
    japanese/linux-JM    Makefile 
    japanese/samba       Makefile 
    net/samba-devel      Makefile 
    net/samba-libsmbclient Makefile 
    net/samba            Makefile 
  Log:
  List conflicts among japanese/linux-JM, japanese/samba,
  net/samba-devel, net/samba-libsmbclient and net/samba ports.
  
  PR:             59599
  Submitted by:   Koop Mast (net/samba-libsmbclient maintainer) with
                  changes by eik
  Approved by:    dwcjr (net/samba-devel and net/samba maintainer),
                  NAKAJI Hiroyuki (japanese/samba maintainer), and
                  portmgr (5.2 freeze)
  
  Revision  Changes    Path
  1.7       +2 -0      ports/japanese/linux-JM/Makefile
  1.39      +2 -0      ports/japanese/samba/Makefile
  1.97      +2 -0      ports/net/samba-devel/Makefile
  1.7       +2 -0      ports/net/samba-libsmbclient/Makefile
  1.128     +2 -0      ports/net/samba/Makefile