Date: Tue, 31 Dec 2013 05:47:35 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185318: graphics/ipe: Fix build with clang Message-ID: <20131231054735.bbb40558a9b62e39821339a0@yahoo.com> Resent-Message-ID: <201312302110.rBULA3C5098631@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185318
>Category: ports
>Synopsis: graphics/ipe: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 30 21:10:02 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
New file:
files/patch-include__ipedoc.h
files/patch-include__ipereference.h
files/patch-ipe6upgrade__ipe6upgrade.cpp
files/patch-ipecairo__ipecairopainter.cpp
files/patch-ipecairo__ipestdfonts.cpp
files/patch-ipeextract__ipeextract.cpp
files/patch-ipelib__ipebase.cpp
files/patch-ipelib__ipedct.cpp
files/patch-ipelib__ipegeo.cpp
files/patch-ipelib__ipelatex.cpp
files/patch-ipelib__ipepdfparser.cpp
files/patch-ipelib__ipeshape.cpp
files/patch-ipetoipe__ipetoipe.cpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/ipe/Makefile graphics/ipe/Makefile
--- /usr/ports/graphics/ipe/Makefile 2013-12-25 04:14:23.000000000 +0900
+++ graphics/ipe/Makefile 2013-12-31 00:00:00.000000000 +0900
@@ -24,12 +24,13 @@
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 @@
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-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>
diff -urN /usr/ports/graphics/ipe/files/patch-include__ipedoc.h graphics/ipe/files/patch-include__ipedoc.h
--- /usr/ports/graphics/ipe/files/patch-include__ipedoc.h 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-include__ipedoc.h 2013-12-31 00:00:00.000000000 +0900
@@ -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>
+
+ // --------------------------------------------------------------------
+
diff -urN /usr/ports/graphics/ipe/files/patch-include__ipereference.h graphics/ipe/files/patch-include__ipereference.h
--- /usr/ports/graphics/ipe/files/patch-include__ipereference.h 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-include__ipereference.h 2013-12-31 00:00:00.000000000 +0900
@@ -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>
+
+ // --------------------------------------------------------------------
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp
--- /usr/ports/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp
--- /usr/ports/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp
--- /usr/ports/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipeextract__ipeextract.cpp graphics/ipe/files/patch-ipeextract__ipeextract.cpp
--- /usr/ports/graphics/ipe/files/patch-ipeextract__ipeextract.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipeextract__ipeextract.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipelib__ipebase.cpp graphics/ipe/files/patch-ipelib__ipebase.cpp
--- /usr/ports/graphics/ipe/files/patch-ipelib__ipebase.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipelib__ipebase.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipelib__ipedct.cpp graphics/ipe/files/patch-ipelib__ipedct.cpp
--- /usr/ports/graphics/ipe/files/patch-ipelib__ipedct.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipelib__ipedct.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipelib__ipegeo.cpp graphics/ipe/files/patch-ipelib__ipegeo.cpp
--- /usr/ports/graphics/ipe/files/patch-ipelib__ipegeo.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipelib__ipegeo.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipelib__ipelatex.cpp graphics/ipe/files/patch-ipelib__ipelatex.cpp
--- /usr/ports/graphics/ipe/files/patch-ipelib__ipelatex.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipelib__ipelatex.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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
diff -urN /usr/ports/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp graphics/ipe/files/patch-ipelib__ipepdfparser.cpp
--- /usr/ports/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipelib__ipepdfparser.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipelib__ipeshape.cpp graphics/ipe/files/patch-ipelib__ipeshape.cpp
--- /usr/ports/graphics/ipe/files/patch-ipelib__ipeshape.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipelib__ipeshape.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
+
diff -urN /usr/ports/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp
--- /usr/ports/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp 2013-12-31 00:00:00.000000000 +0900
@@ -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;
diff -urN /usr/ports/graphics/ipe/pkg-plist graphics/ipe/pkg-plist
--- /usr/ports/graphics/ipe/pkg-plist 2013-11-06 22:02:06.000000000 +0900
+++ graphics/ipe/pkg-plist 2013-12-31 00:00:00.000000000 +0900
@@ -56,6 +56,12 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131231054735.bbb40558a9b62e39821339a0>