From owner-freebsd-ports@FreeBSD.ORG  Sat Apr  8 03:28:59 2006
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
X-Original-To: ports@FreeBSD.org
Delivered-To: freebsd-ports@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A5D4E16A404;
	Sat,  8 Apr 2006 03:28:59 +0000 (UTC)
	(envelope-from nork@FreeBSD.org)
Received: from sakura.ninth-nine.com (sakura.ninth-nine.com [219.127.74.120])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0E54E43D55;
	Sat,  8 Apr 2006 03:28:58 +0000 (GMT)
	(envelope-from nork@FreeBSD.org)
Received: from melfina.ninth-nine.com (melfina.ninth-nine.com [192.168.36.6])
	(authenticated bits=0) by sakura.ninth-nine.com
	(8.13.6/8.13.4/NinthNine) with ESMTP id k383SvXu047197
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Sat, 8 Apr 2006 12:28:58 +0900 (JST) (envelope-from nork@FreeBSD.org)
Date: Sat, 8 Apr 2006 12:28:57 +0900
From: Norikatsu Shigemura <nork@FreeBSD.org>
To: eivind@FreeBSD.org, mr@FreeBSD.org
Message-Id: <20060408122857.17213967.nork@FreeBSD.org>
X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.16; i386-portbld-freebsd6.1)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by
	milter-greylist-2.0.2 (sakura.ninth-nine.com [219.127.74.121]);
	Sat, 08 Apr 2006 12:28:58 +0900 (JST)
Cc: ports@FreeBSD.org
Subject: fix make index error
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Apr 2006 03:28:59 -0000

Hi eivind and mr.

	I fixed make index error on 7-current in following ports:
		net-mgmt/nitpicker
		sysutils/etcmerge

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.
===> net-mgmt/nitpicker failed
"/usr/share/mk/bsd.own.mk", line 353: WITH_MAN and WITHOUT_MAN can't both be set.
===> sysutils/etcmerge failed

	like following patches(including cosmetic change).

	Please commit or may I commit ok?

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/nitpicker/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	23 Feb 2004 04:42:05 -0000	1.4
+++ Makefile	8 Apr 2006 02:56:25 -0000
@@ -7,20 +7,16 @@
 
 PORTNAME=	nitpicker
 PORTVERSION=	1.2.1
-PORTEPOCH=1
+PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://nitpicker.de/
 
 MAINTAINER=	mr@freebsd.org
 COMMENT=	IP flow Accounting tools
 
-NO_MAN= YES
-
-.include <bsd.port.pre.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nitpicker ${LOCALBASE}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/parse_flowfile/src/parse_flowfile ${LOCALBASE}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/dumpit/dumpit ${LOCALBASE}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>


Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/etcmerge/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	6 Feb 2004 13:12:22 -0000	1.7
+++ Makefile	8 Apr 2006 02:53:29 -0000
@@ -19,7 +19,6 @@
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-NO_MAN=		yes
 
 SRC=		${.CURDIR}/src