svn commit: r340291 - in head/graphics/ipe: . files
Martin Wilke
miwi at FreeBSD.org
Sun Jan 19 13:46:22 UTC 2014
Author: miwi
Date: Sun Jan 19 13:46:19 2014
New Revision: 340291
URL: http://svnweb.freebsd.org/changeset/ports/340291
QAT: https://qat.redports.org/buildarchive/r340291/
Log:
- Fix build with clang
PR: 185318
Submitted by: ports fury
Added:
head/graphics/ipe/files/patch-include__ipedoc.h (contents, props changed)
head/graphics/ipe/files/patch-include__ipereference.h (contents, props changed)
head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipelib__ipebase.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipelib__ipedct.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipelib__ipegeo.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipelib__ipelatex.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipelib__ipeshape.cpp (contents, props changed)
head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp (contents, props changed)
Modified:
head/graphics/ipe/Makefile
head/graphics/ipe/pkg-plist
Modified: head/graphics/ipe/Makefile
==============================================================================
--- head/graphics/ipe/Makefile Sun Jan 19 13:45:39 2014 (r340290)
+++ head/graphics/ipe/Makefile Sun Jan 19 13:46:19 2014 (r340291)
@@ -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 <bsd.port.options.mk>
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 <bsd.port.mk>
Added: head/graphics/ipe/files/patch-include__ipedoc.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-include__ipedoc.h Sun Jan 19 13:46:19 2014 (r340291)
@@ -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 <sys/types.h>
+
+ // --------------------------------------------------------------------
+
Added: head/graphics/ipe/files/patch-include__ipereference.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-include__ipereference.h Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,10 @@
+--- include/ipereference.h.orig
++++ include/ipereference.h
+@@ -33,6 +33,7 @@
+ #define IPEREF_H
+
+ #include "ipeobject.h"
++#include <sys/types.h>
+
+ // --------------------------------------------------------------------
+
Added: head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,11 @@
+--- ipe6upgrade/ipe6upgrade.cpp.orig
++++ ipe6upgrade/ipe6upgrade.cpp
+@@ -30,6 +30,8 @@
+
+ #include "ipexml.h"
+ #include "ipeattributes.h"
++#include <cstdlib>
++#include <sys/types.h>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -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 <sys/types.h>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,10 @@
+--- ipecairo/ipestdfonts.cpp.orig
++++ ipecairo/ipestdfonts.cpp
+@@ -30,6 +30,7 @@
+ */
+
+ #include "ipebase.h"
++#include <sys/types.h>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipeextract__ipeextract.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -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 <cstdlib>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipelib__ipebase.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipelib__ipebase.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,12 @@
+--- ipelib/ipebase.cpp.orig
++++ ipelib/ipebase.cpp
+@@ -29,7 +29,9 @@
+ */
+
+ #include "ipebase.h"
++#include <cstdlib>
+ #include <cmath>
++#include <sys/types.h>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipelib__ipedct.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipelib__ipedct.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,10 @@
+--- ipelib/ipedct.cpp.orig
++++ ipelib/ipedct.cpp
+@@ -31,6 +31,7 @@
+ */
+
+ #include "ipebase.h"
++#include <sys/types.h>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipelib__ipegeo.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipelib__ipegeo.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,11 @@
+--- ipelib/ipegeo.cpp.orig
++++ ipelib/ipegeo.cpp
+@@ -38,6 +38,8 @@
+ */
+
+ #include "ipegeo.h"
++#include <cstdlib>
++#include <sys/types.h>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipelib__ipelatex.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipelib__ipelatex.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,11 @@
+--- ipelib/ipelatex.cpp.orig
++++ ipelib/ipelatex.cpp
+@@ -35,6 +35,8 @@
+ #include "ipefontpool.h"
+ #include "ipelatex.h"
+
++#include <cstdlib>
++
+ using namespace ipe;
+
+ /*! \class ipe::Latex
Added: head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,10 @@
+--- ipelib/ipepdfparser.cpp.orig
++++ ipelib/ipepdfparser.cpp
+@@ -30,6 +30,7 @@
+
+ #include "ipepdfparser.h"
+ #include "ipeutils.h"
++#include <cstdlib>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipelib__ipeshape.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipelib__ipeshape.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,10 @@
+--- ipelib/ipeshape.cpp.orig
++++ ipelib/ipeshape.cpp
+@@ -30,6 +30,7 @@
+
+ #include "ipeshape.h"
+ #include "ipepainter.h"
++#include <sys/types.h>
+
+ using namespace ipe;
+
Added: head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp Sun Jan 19 13:46:19 2014 (r340291)
@@ -0,0 +1,10 @@
+--- ipetoipe/ipetoipe.cpp.orig
++++ ipetoipe/ipetoipe.cpp
+@@ -29,6 +29,7 @@
+ */
+
+ #include "ipedoc.h"
++#include <cstdlib>
+
+ using ipe::Document;
+ using ipe::String;
Modified: head/graphics/ipe/pkg-plist
==============================================================================
--- head/graphics/ipe/pkg-plist Sun Jan 19 13:45:39 2014 (r340290)
+++ head/graphics/ipe/pkg-plist Sun Jan 19 13:46:19 2014 (r340291)
@@ -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
More information about the svn-ports-all
mailing list