Index: Makefile =================================================================== --- Makefile (revision 408448) +++ Makefile (working copy) @@ -26,7 +26,7 @@ PLIST_SUB= SHLIB_VER="${PORTVERSION}" post-patch: - ${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ + @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt .include Index: files/patch-src_QGlib_connect.cpp =================================================================== --- files/patch-src_QGlib_connect.cpp (nonexistent) +++ files/patch-src_QGlib_connect.cpp (working copy) @@ -0,0 +1,15 @@ +--- src/QGlib/connect.cpp.orig 2014-07-08 18:38:36 UTC ++++ src/QGlib/connect.cpp +@@ -20,10 +20,12 @@ + #include + #include + #include ++#ifndef Q_MOC_RUN + #include + #include + #include + #include ++#endif + + namespace QGlib { + namespace Private { Index: files/patch-src_QGlib_connect.h =================================================================== --- files/patch-src_QGlib_connect.h (nonexistent) +++ files/patch-src_QGlib_connect.h (working copy) @@ -0,0 +1,14 @@ +--- src/QGlib/connect.h.orig 2014-07-08 18:38:36 UTC ++++ src/QGlib/connect.h +@@ -25,8 +25,11 @@ + #include + #include + #include ++ ++#ifndef Q_MOC_RUN + #include + #include ++#endif + + namespace QGlib { + Index: files/patch-src_QGlib_connectimpl.h =================================================================== --- files/patch-src_QGlib_connectimpl.h (nonexistent) +++ files/patch-src_QGlib_connectimpl.h (working copy) @@ -0,0 +1,12 @@ +--- src/QGlib/connectimpl.h.orig 2014-07-08 18:38:36 UTC ++++ src/QGlib/connectimpl.h +@@ -26,7 +26,9 @@ + # include "refpointer.h" + # include + # include ++#ifndef Q_MOC_RUN + # include ++#endif + + + namespace QGlib { Index: files/patch-src_QGlib_global.h =================================================================== --- files/patch-src_QGlib_global.h (nonexistent) +++ files/patch-src_QGlib_global.h (working copy) @@ -0,0 +1,12 @@ +--- src/QGlib/global.h.orig 2014-07-08 18:38:36 UTC ++++ src/QGlib/global.h +@@ -23,7 +23,9 @@ + #endif + + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + /* defined by cmake when building this library */ + #if defined(QtGLib_EXPORTS) || defined(Qt5GLib_EXPORTS) Index: files/patch-src_QGlib_refpointer.h =================================================================== --- files/patch-src_QGlib_refpointer.h (nonexistent) +++ files/patch-src_QGlib_refpointer.h (working copy) @@ -0,0 +1,13 @@ +--- src/QGlib/refpointer.h.orig 2014-07-08 18:38:36 UTC ++++ src/QGlib/refpointer.h +@@ -23,8 +23,10 @@ + #include "type.h" + #include "wrap.h" + #include ++#ifndef Q_MOC_RUN + #include + #include ++#endif + #include + + namespace QGlib { Index: files/patch-src_QGlib_type.h =================================================================== --- files/patch-src_QGlib_type.h (nonexistent) +++ files/patch-src_QGlib_type.h (working copy) @@ -0,0 +1,12 @@ +--- src/QGlib/type.h.orig 2014-07-08 18:38:36 UTC ++++ src/QGlib/type.h +@@ -21,7 +21,9 @@ + + #include "global.h" + #include ++#ifndef Q_MOC_RUN + #include ++#endif + + /* + * This is a re-definition of GType inside the QGlib::Private namespace. Index: files/patch-src_QGlib_value.h =================================================================== --- files/patch-src_QGlib_value.h (nonexistent) +++ files/patch-src_QGlib_value.h (working copy) @@ -0,0 +1,13 @@ +--- src/QGlib/value.h.orig 2014-07-08 18:38:36 UTC ++++ src/QGlib/value.h +@@ -23,8 +23,10 @@ + #include "type.h" + #include "refpointer.h" + #include "error.h" ++#ifndef Q_MOC_RUN + #include + #include ++#endif + #include + #include + #include