From owner-cvs-ports@FreeBSD.ORG  Sat Apr 15 12:10:51 2006
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
X-Original-To: cvs-ports@FreeBSD.org
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7540416A413;
	Sat, 15 Apr 2006 12:10:51 +0000 (UTC)
	(envelope-from nork@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2DBC943D46;
	Sat, 15 Apr 2006 12:10:51 +0000 (GMT)
	(envelope-from nork@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FCAocV054449;
	Sat, 15 Apr 2006 12:10:50 GMT
	(envelope-from nork@repoman.freebsd.org)
Received: (from nork@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FCAoQG054448;
	Sat, 15 Apr 2006 12:10:50 GMT (envelope-from nork)
Message-Id: <200604151210.k3FCAoQG054448@repoman.freebsd.org>
From: Norikatsu Shigemura <nork@FreeBSD.org>
Date: Sat, 15 Apr 2006 12:10:50 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/sysutils/etcmerge Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Apr 2006 12:10:52 -0000

nork        2006-04-15 12:10:50 UTC

  FreeBSD ports repository

  Modified files:
    sysutils/etcmerge    Makefile 
  Log:
  Fix make index error on 7-current(No more NO_MAN).
  
  Updating the ports index ... Generating INDEX.tmp - please wait.."/usr/share/mk/bsd.own.mk", line 353: WITH_MAN and WITHOUT_MAN can't both be set.
  ===> sysutils/etcmerge failed
  "/usr/share/mk/bsd.own.mk", line 353: WITH_MAN and WITHOUT_MAN can't both be set.
  
  Approved by:    maintainer timeout (1 week)
  
  Revision  Changes    Path
  1.8       +0 -1      ports/sysutils/etcmerge/Makefile