From owner-cvs-all@FreeBSD.ORG  Sun Jul 17 21:23:48 2011
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 5921D1065670;
	Sun, 17 Jul 2011 21:23:48 +0000 (UTC)
	(envelope-from avilla@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 47C688FC0A;
	Sun, 17 Jul 2011 21:23:48 +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 p6HLNmG8095684;
	Sun, 17 Jul 2011 21:23:48 GMT
	(envelope-from avilla@repoman.freebsd.org)
Received: (from avilla@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p6HLNmSp095683;
	Sun, 17 Jul 2011 21:23:48 GMT (envelope-from avilla)
Message-Id: <201107172123.p6HLNmSp095683@repoman.freebsd.org>
From: Alberto Villa <avilla@FreeBSD.org>
Date: Sun, 17 Jul 2011 21:23:48 +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/editors/koffice-kde4 Makefile pkg-plist
 ports/editors/koffice-kde4/files patch-filters-kword-CMakeLists.txt
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** 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: Sun, 17 Jul 2011 21:23:48 -0000

avilla      2011-07-17 21:23:48 UTC

  FreeBSD ports repository

  Modified files:
    editors/koffice-kde4 Makefile pkg-plist 
  Added files:
    editors/koffice-kde4/files patch-filters-kword-CMakeLists.txt 
  Log:
  - Depend on the embedded wv2 instead of the one from ports.
  - Correctly link to iconv in the wv2 tests. [1]
  - Add conflict with the yet-to-come calligra port.
  - Bump PORTREVISION.
  
  This fix finally enables the build of the msword-odf filter.
  
  Reported by:    Axel Gonzalez <loox@e-shell.net> [1]
  Submitted by:   Raphael Kubo da Costa <kubito@gmail.com> via area51
  
  Revision  Changes    Path
  1.146     +3 -6      ports/editors/koffice-kde4/Makefile
  1.1       +16 -0     ports/editors/koffice-kde4/files/patch-filters-kword-CMakeLists.txt (new)
  1.43      +5 -0      ports/editors/koffice-kde4/pkg-plist