- Fix build with clang

PR:		185318
Submitted by:	ports fury

15 files changed, 148 insertions, 10 deletions

diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 3d2b920dbaf7..213c9fe0b03e 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -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>
diff --git a/graphics/ipe/files/patch-include__ipedoc.h b/graphics/ipe/files/patch-include__ipedoc.h
new file mode 100644
index 000000000000..ee3ab1140025
--- /dev/null
+++ b/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 <sys/types.h>
+ 
+ // --------------------------------------------------------------------
+ 
diff --git a/graphics/ipe/files/patch-include__ipereference.h b/graphics/ipe/files/patch-include__ipereference.h
new file mode 100644
index 000000000000..353e053875a0
--- /dev/null
+++ b/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 <sys/types.h>
+ 
+ // --------------------------------------------------------------------
+ 
diff --git a/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp b/graphics/ipe/files/patch-ipe6upgrade__ipe6upgrade.cpp
new file mode 100644
index 000000000000..debdade73f98
--- /dev/null
+++ b/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 <cstdlib>
++#include <sys/types.h>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp b/graphics/ipe/files/patch-ipecairo__ipecairopainter.cpp
new file mode 100644
index 000000000000..6906362c4f7d
--- /dev/null
+++ b/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 <sys/types.h>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp b/graphics/ipe/files/patch-ipecairo__ipestdfonts.cpp
new file mode 100644
index 000000000000..0dae3521f3aa
--- /dev/null
+++ b/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 <sys/types.h>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipeextract__ipeextract.cpp b/graphics/ipe/files/patch-ipeextract__ipeextract.cpp
new file mode 100644
index 000000000000..5e1bcb21012b
--- /dev/null
+++ b/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 <cstdlib>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipelib__ipebase.cpp b/graphics/ipe/files/patch-ipelib__ipebase.cpp
new file mode 100644
index 000000000000..102d22049f26
--- /dev/null
+++ b/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 <cstdlib>
+ #include <cmath>
++#include <sys/types.h>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipelib__ipedct.cpp b/graphics/ipe/files/patch-ipelib__ipedct.cpp
new file mode 100644
index 000000000000..9d87dcb01fd9
--- /dev/null
+++ b/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 <sys/types.h>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipelib__ipegeo.cpp b/graphics/ipe/files/patch-ipelib__ipegeo.cpp
new file mode 100644
index 000000000000..f56473d41aaf
--- /dev/null
+++ b/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 <cstdlib>
++#include <sys/types.h>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipelib__ipelatex.cpp b/graphics/ipe/files/patch-ipelib__ipelatex.cpp
new file mode 100644
index 000000000000..e8310bf8fd77
--- /dev/null
+++ b/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 <cstdlib>
++
+ using namespace ipe;
+ 
+ /*! \class ipe::Latex
diff --git a/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp b/graphics/ipe/files/patch-ipelib__ipepdfparser.cpp
new file mode 100644
index 000000000000..7b11f9209a8e
--- /dev/null
+++ b/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 <cstdlib>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipelib__ipeshape.cpp b/graphics/ipe/files/patch-ipelib__ipeshape.cpp
new file mode 100644
index 000000000000..18b8978d3d88
--- /dev/null
+++ b/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 <sys/types.h>
+ 
+ using namespace ipe;
+ 
diff --git a/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp b/graphics/ipe/files/patch-ipetoipe__ipetoipe.cpp
new file mode 100644
index 000000000000..f2d8f35c0d00
--- /dev/null
+++ b/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 <cstdlib>
+ 
+ using ipe::Document;
+ using ipe::String;
diff --git a/graphics/ipe/pkg-plist b/graphics/ipe/pkg-plist
index 6d84e6c1051d..c96441869e63 100644
--- a/graphics/ipe/pkg-plist
+++ b/graphics/ipe/pkg-plist
@@ -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