From owner-cvs-all@FreeBSD.ORG  Mon Jan  8 18:34:05 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4D04E16A415;
	Mon,  8 Jan 2007 18:34:05 +0000 (UTC)
	(envelope-from fjoe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 3E4A813C428;
	Mon,  8 Jan 2007 18:34:05 +0000 (UTC)
	(envelope-from fjoe@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l08IY5qk052306;
	Mon, 8 Jan 2007 18:34:05 GMT (envelope-from fjoe@repoman.freebsd.org)
Received: (from fjoe@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l08IY5UX052305;
	Mon, 8 Jan 2007 18:34:05 GMT (envelope-from fjoe)
Message-Id: <200701081834.l08IY5UX052305@repoman.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Mon, 8 Jan 2007 18:34:05 +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/x11-toolkits/wxgtk26 Makefile
 ports/x11-toolkits/wxgtk26/files
 patch-Makefile.in patch-src-common-intl.cpp
 ports/x11-toolkits/wxgtk26-common Makefile pkg-plist
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jan 2007 18:34:05 -0000

fjoe        2007-01-08 18:34:04 UTC

  FreeBSD ports repository

  Modified files:
    x11-toolkits/wxgtk26 Makefile 
    x11-toolkits/wxgtk26/files patch-Makefile.in 
    x11-toolkits/wxgtk26-common Makefile pkg-plist 
  Added files:
    x11-toolkits/wxgtk26/files patch-src-common-intl.cpp 
  Log:
  Fix file conflicts with wxgtk-common 2.4 and 2.8 ports.
  
  Revision  Changes    Path
  1.6       +1 -1      ports/x11-toolkits/wxgtk26-common/Makefile
  1.6       +27 -28    ports/x11-toolkits/wxgtk26-common/pkg-plist
  1.31      +1 -1      ports/x11-toolkits/wxgtk26/Makefile
  1.6       +16 -5     ports/x11-toolkits/wxgtk26/files/patch-Makefile.in
  1.3       +20 -0     ports/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp (new)