From owner-cvs-ports@FreeBSD.ORG Mon Apr 30 07:18:38 2012 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC3901065670; Mon, 30 Apr 2012 07:18:38 +0000 (UTC) (envelope-from scheidell@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E9898FC0A; Mon, 30 Apr 2012 07:18:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q3U7Icu5038451; Mon, 30 Apr 2012 07:18:38 GMT (envelope-from scheidell@repoman.freebsd.org) Received: (from scheidell@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q3U7IcoP038450; Mon, 30 Apr 2012 07:18:38 GMT (envelope-from scheidell) Message-Id: <201204300718.q3U7IcoP038450@repoman.freebsd.org> From: Michael Scheidell Date: Mon, 30 Apr 2012 07:18:38 +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/devel/libconfig Makefile ports/devel/wand-libconfig Makefile X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Apr 2012 07:18:38 -0000 scheidell 2012-04-30 07:18:38 UTC FreeBSD ports repository Modified files: devel/libconfig Makefile devel/wand-libconfig Makefile Log: - Resolve conflict. Both ports use same binary file name - No PORTREVISION bump PR: ports/165899 Submitted by: Aleksandr A Babaylov <"."@babolo.ru> Approved by: maintainer (implicit, timeout +30 days) Revision Changes Path 1.10 +2 -0 ports/devel/libconfig/Makefile 1.5 +2 -0 ports/devel/wand-libconfig/Makefile