From owner-cvs-all@FreeBSD.ORG Tue Mar 24 20:00:21 2009 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB0D910656CF; Tue, 24 Mar 2009 20:00:21 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7F598FC12; Tue, 24 Mar 2009 20:00:21 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2OK0L4i085405; Tue, 24 Mar 2009 20:00:21 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2OK0Lqc085404; Tue, 24 Mar 2009 20:00:21 GMT (envelope-from dougb) Message-Id: <200903242000.n2OK0Lqc085404@repoman.freebsd.org> From: Doug Barton Date: Tue, 24 Mar 2009 20:00:21 +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/dns/bind9 Makefile ports/dns/bind94 Makefile ports/dns/bind95 Makefile ports/dns/bind96 Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Mar 2009 20:00:23 -0000 dougb 2009-03-24 20:00:21 UTC FreeBSD ports repository Modified files: dns/bind9 Makefile dns/bind94 Makefile dns/bind95 Makefile dns/bind96 Makefile Log: Fix CONFLICTS (again). The previous example didn't work at all for ports other than plain bind9 since the real PORTNAMEs for the other ports are bind9[456]. This fix has the added advantage of covering REPLACE_BASE. Revision Changes Path 1.88 +1 -1 ports/dns/bind9/Makefile 1.94 +1 -1 ports/dns/bind94/Makefile 1.96 +1 -1 ports/dns/bind95/Makefile 1.97 +1 -1 ports/dns/bind96/Makefile