From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:04:49 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4595412; Sat, 25 Jan 2014 13:04:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A3C551FD8; Sat, 25 Jan 2014 13:04:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PD4noL010354; Sat, 25 Jan 2014 13:04:49 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD4kpt010334; Sat, 25 Jan 2014 13:04:46 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251304.s0PD4kpt010334@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:04:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341025 - in branches/2014Q1/graphics/ipe: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 13:04:49 -0000 Author: miwi Date: Sat Jan 25 13:04:46 2014 New Revision: 341025 URL: http://svnweb.freebsd.org/changeset/ports/341025 QAT: https://qat.redports.org/buildarchive/r341025/ Log: MFH: r340291 - Fix build with clang PR: 185318 Submitted by: ports fury Added: branches/2014Q1/graphics/ipe/files/patch-include__ipedoc.h - copied unchanged from r340291, head/graphics/ipe/files/patch-include__ipedoc.h branches/2014Q1/graphics/ipe/files/patch-include__ipereference.h - copied unchanged from r340291, head/graphics/ipe/files/patch-include__ipereference.h branches/2014Q1/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp branches/2014Q1/graphics/ipe/files/patch-ipeextract__ipeextract.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipebase.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipebase.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipedct.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipedct.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipegeo.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipegeo.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipelatex.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipelatex.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp branches/2014Q1/graphics/ipe/files/patch-ipelib__ipeshape.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipelib__ipeshape.cpp branches/2014Q1/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp - copied unchanged from r340291, head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp Modified: branches/2014Q1/graphics/ipe/Makefile branches/2014Q1/graphics/ipe/pkg-plist Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/ipe/Makefile ============================================================================== --- branches/2014Q1/graphics/ipe/Makefile Sat Jan 25 13:03:14 2014 (r341024) +++ branches/2014Q1/graphics/ipe/Makefile Sat Jan 25 13:04:46 2014 (r341025) @@ -24,12 +24,13 @@ USES= gmake iconv pkgconfig USE_QT4= gui moc_build qmake_build rcc_build uic_build USE_TEX= latex MAKE_ENV= DLL_CFLAGS="-fPIC" \ - ICONV_CFLAGS="-I${LOCALBASE}/include" \ - ICONV_LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \ + ICONV_CFLAGS="-I${ICONV_PREFIX}/include" \ + ICONV_LIBS="-L${ICONV_PREFIX}/lib ${ICONV_LIB}" \ INSTALL_DIR="${MKDIR}" \ INSTALL_FILES="${INSTALL_DATA}" \ INSTALL_SCRIPTS="${INSTALL_SCRIPT}" \ INSTALL_PROGRAMS="${INSTALL_PROGRAM}" \ + INSTALL_ROOT="${STAGEDIR}" \ IPE_USE_ICONV="-DIPE_USE_ICONV" \ IPEDOCDIR="${DOCSDIR}" \ IPEMANDIR="${MANPREFIX}/man/man1" \ @@ -41,14 +42,11 @@ USE_LDCONFIG= yes PLIST_SUB= VERSION="${PORTVERSION}" -MAN1= ipe.1 ipe6upgrade.1 ipeextract.1 iperender.1 ipetoipe.1 \ - ipescript.1 PORTDOCS= * DESKTOP_ENTRIES="Ipe" "" "${DATADIR}/${PORTVERSION}/ipe.png" \ "${PORTNAME}" "" true -NO_STAGE= yes .include post-patch: @@ -68,10 +66,9 @@ post-patch: post-install: (cd ${WRKSRC}/../fontmaps && ${INSTALL_DATA} fontmap.xml \ - ${DATADIR}/${PORTVERSION}) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}/../build/doc && ${COPYTREE_SHARE} . ${DOCSDIR}) -.endif + ${STAGEDIR}${DATADIR}/${PORTVERSION}) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/../build/doc && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${DOCSDIR}) .include Copied: branches/2014Q1/graphics/ipe/files/patch-include__ipedoc.h (from r340291, head/graphics/ipe/files/patch-include__ipedoc.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-include__ipedoc.h Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-include__ipedoc.h) @@ -0,0 +1,10 @@ +--- include/ipedoc.h.orig ++++ include/ipedoc.h +@@ -37,6 +37,7 @@ + #include "ipeimage.h" + #include "ipestyle.h" + #include "ipefontpool.h" ++#include + + // -------------------------------------------------------------------- + Copied: branches/2014Q1/graphics/ipe/files/patch-include__ipereference.h (from r340291, head/graphics/ipe/files/patch-include__ipereference.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-include__ipereference.h Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-include__ipereference.h) @@ -0,0 +1,10 @@ +--- include/ipereference.h.orig ++++ include/ipereference.h +@@ -33,6 +33,7 @@ + #define IPEREF_H + + #include "ipeobject.h" ++#include + + // -------------------------------------------------------------------- + Copied: branches/2014Q1/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp (from r340291, head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp) @@ -0,0 +1,11 @@ +--- ipe6upgrade/ipe6upgrade.cpp.orig ++++ ipe6upgrade/ipe6upgrade.cpp +@@ -30,6 +30,8 @@ + + #include "ipexml.h" + #include "ipeattributes.h" ++#include ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp (from r340291, head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp) @@ -0,0 +1,10 @@ +--- ipecairo/ipecairopainter.cpp.orig ++++ ipecairo/ipecairopainter.cpp +@@ -32,6 +32,7 @@ + #include "ipepdfparser.h" + #include "ipecairopainter.h" + #include "ipefonts.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp (from r340291, head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp) @@ -0,0 +1,10 @@ +--- ipecairo/ipestdfonts.cpp.orig ++++ ipecairo/ipestdfonts.cpp +@@ -30,6 +30,7 @@ + */ + + #include "ipebase.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipeextract__ipeextract.cpp (from r340291, head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipeextract__ipeextract.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp) @@ -0,0 +1,10 @@ +--- ipeextract/ipeextract.cpp.orig ++++ ipeextract/ipeextract.cpp +@@ -31,6 +31,7 @@ + #include "ipexml.h" + #include "ipeutils.h" + #include "ipepdfparser.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipebase.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipebase.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipebase.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipebase.cpp) @@ -0,0 +1,12 @@ +--- ipelib/ipebase.cpp.orig ++++ ipelib/ipebase.cpp +@@ -29,7 +29,9 @@ + */ + + #include "ipebase.h" ++#include + #include ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipedct.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipedct.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipedct.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipedct.cpp) @@ -0,0 +1,10 @@ +--- ipelib/ipedct.cpp.orig ++++ ipelib/ipedct.cpp +@@ -31,6 +31,7 @@ + */ + + #include "ipebase.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipegeo.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipegeo.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipegeo.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipegeo.cpp) @@ -0,0 +1,11 @@ +--- ipelib/ipegeo.cpp.orig ++++ ipelib/ipegeo.cpp +@@ -38,6 +38,8 @@ + */ + + #include "ipegeo.h" ++#include ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipelatex.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipelatex.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipelatex.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipelatex.cpp) @@ -0,0 +1,11 @@ +--- ipelib/ipelatex.cpp.orig ++++ ipelib/ipelatex.cpp +@@ -35,6 +35,8 @@ + #include "ipefontpool.h" + #include "ipelatex.h" + ++#include ++ + using namespace ipe; + + /*! \class ipe::Latex Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp) @@ -0,0 +1,10 @@ +--- ipelib/ipepdfparser.cpp.orig ++++ ipelib/ipepdfparser.cpp +@@ -30,6 +30,7 @@ + + #include "ipepdfparser.h" + #include "ipeutils.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipelib__ipeshape.cpp (from r340291, head/graphics/ipe/files/patch-ipelib__ipeshape.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipelib__ipeshape.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipelib__ipeshape.cpp) @@ -0,0 +1,10 @@ +--- ipelib/ipeshape.cpp.orig ++++ ipelib/ipeshape.cpp +@@ -30,6 +30,7 @@ + + #include "ipeshape.h" + #include "ipepainter.h" ++#include + + using namespace ipe; + Copied: branches/2014Q1/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp (from r340291, head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp Sat Jan 25 13:04:46 2014 (r341025, copy of r340291, head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp) @@ -0,0 +1,10 @@ +--- ipetoipe/ipetoipe.cpp.orig ++++ ipetoipe/ipetoipe.cpp +@@ -29,6 +29,7 @@ + */ + + #include "ipedoc.h" ++#include + + using ipe::Document; + using ipe::String; Modified: branches/2014Q1/graphics/ipe/pkg-plist ============================================================================== --- branches/2014Q1/graphics/ipe/pkg-plist Sat Jan 25 13:03:14 2014 (r341024) +++ branches/2014Q1/graphics/ipe/pkg-plist Sat Jan 25 13:04:46 2014 (r341025) @@ -56,6 +56,12 @@ lib/libipelua.so lib/libipelua.so.%%VERSION%% lib/libipeui.so lib/libipeui.so.%%VERSION%% +man/man1/ipe.1.gz +man/man1/ipe6upgrade.1.gz +man/man1/ipeextract.1.gz +man/man1/iperender.1.gz +man/man1/ipescript.1.gz +man/man1/ipetoipe.1.gz %%DATADIR%%/%%VERSION%%/fontmap.xml %%DATADIR%%/%%VERSION%%/icons/copy.png %%DATADIR%%/%%VERSION%%/icons/cut.png