From owner-svn-ports-head@freebsd.org Sat May 27 19:30:25 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 600ADD8557C; Sat, 27 May 2017 19:30:25 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AE131AD8; Sat, 27 May 2017 19:30:25 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4RJUO9W065240; Sat, 27 May 2017 19:30:24 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4RJUOM4065239; Sat, 27 May 2017 19:30:24 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201705271930.v4RJUOM4065239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 27 May 2017 19:30:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441863 - head/textproc/docbook2X X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 May 2017 19:30:25 -0000 Author: sunpoet Date: Sat May 27 19:30:24 2017 New Revision: 441863 URL: https://svnweb.freebsd.org/changeset/ports/441863 Log: Update CONFLICTS_INSTALL Modified: head/textproc/docbook2X/Makefile Modified: head/textproc/docbook2X/Makefile ============================================================================== --- head/textproc/docbook2X/Makefile Sat May 27 17:33:15 2017 (r441862) +++ head/textproc/docbook2X/Makefile Sat May 27 19:30:24 2017 (r441863) @@ -22,7 +22,8 @@ BUILD_DEPENDS= OpenSP>=0:textproc/opensp sdocbook-xml>=0:textproc/sdocbook-xml RUN_DEPENDS:= ${BUILD_DEPENDS} -CONFLICTS_INSTALL= docbook-utils-* +# bin/docbook2man bin/docbook2texi man/man1/docbook2man.1.gz man/man1/docbook2texi.1.gz +CONFLICTS_INSTALL= docbook-utils OPTIONS_DEFINE= DOCS