Date: Sat, 8 Apr 2006 12:28:57 +0900 From: Norikatsu Shigemura <nork@FreeBSD.org> To: eivind@FreeBSD.org, mr@FreeBSD.org Cc: ports@FreeBSD.org Subject: fix make index error Message-ID: <20060408122857.17213967.nork@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060408122857.17213967.nork>