Index: head/games/netradiant/Makefile =================================================================== --- head/games/netradiant/Makefile (revision 459079) +++ head/games/netradiant/Makefile (revision 459080) @@ -1,63 +1,57 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= netradiant PORTVERSION= 20130630 PORTREVISION= 8 CATEGORIES= games cad MASTER_SITES= http://ingar.satgnu.net/gtkradiant/files/ \ http://freebsd.nsu.ru/distfiles/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src DISTFILES= ${DISTNAME}${EXTRACT_SUFX} q3map2.6 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= danfe@FreeBSD.org COMMENT= Fork of the well-known GtkRadiant 1.5 FPS games map editor LICENSE= GPLv2 LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \ libwebp.so:graphics/webp BROKEN_aarch64= fails to link: ldd: install/modules/archivepak.so: not a FreeBSD ELF shared object BROKEN_armv6= fails to build: h2data.armv6: No such file or directory BROKEN_armv7= fails to build: h2data.armv7: No such file or directory USES= gmake jpeg pkgconfig tar:bzip2 USE_GL= gl USE_GNOME= gtk20 libxml2 MAKE_ENV= BUILD=release DOWNLOAD_GAMEPACKS=no LIBS_DL="" \ RADIANT_ABOUTMSG="For ${OPSYS} ${OSREL} (${ARCH})" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= ${PORTNAME} SUB_LIST= ARCH=${ARCH} PLIST_SUB:= ${SUB_LIST} post-patch: # Add missing checks for __FreeBSD__ @${FIND} ${WRKSRC}/tools -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} \ -e 's/__linux__/__${OPSYS}__ ) || defined ( &/' -# Fix the build against Clang - @${REINPLACE_CMD} -e '/#include "generic\/reference\.h"/x ; 288G' \ - ${WRKSRC}/libs/scenelib.h - @${REINPLACE_CMD} -e '/#include "generic\/referencecounted\.h/ { \ - x ; s/^/#include "scenelib.h"/ ; G ; }' \ - ${WRKSRC}/plugins/mapq3/parse.h pre-install: # Fix permissions of some files (drop bogus execute bit) @${FIND} ${WRKSRC}/install/osirion.game -type f | ${XARGS} ${CHMOD} a-x @${CHMOD} a-x ${WRKSRC}/install/games/osirion.game # Remove a copy of GNU GPL from what we are going to install @${RM} ${WRKSRC}/install/GPL.txt do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${CP} -a ${WRKSRC}/install/* ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${DISTDIR}/q3map2.6 ${STAGEDIR}${MANPREFIX}/man/man6 .include Index: head/games/netradiant/files/patch-more-clang-fixes =================================================================== --- head/games/netradiant/files/patch-more-clang-fixes (revision 459079) +++ head/games/netradiant/files/patch-more-clang-fixes (revision 459080) @@ -1,82 +1,132 @@ ---- contrib/bobtoolz/DTreePlanter.h.orig 2013-06-30 22:04:35.000000000 +0800 -+++ contrib/bobtoolz/DTreePlanter.h 2013-09-12 22:07:28.000000000 +0800 +--- contrib/bobtoolz/DPatch.cpp.orig 2013-06-30 14:04:35 UTC ++++ contrib/bobtoolz/DPatch.cpp +@@ -302,7 +302,7 @@ DPatch* DPatch::MergePatches( patch_merge_t merge_info + + int newHeight = p1->height + p2->height - 1; + if ( newHeight > MAX_PATCH_HEIGHT ) { +- return false; ++ return NULL; + } + + DPatch* newPatch = new DPatch(); +--- contrib/bobtoolz/DTreePlanter.h.orig 2013-06-30 14:04:35 UTC ++++ contrib/bobtoolz/DTreePlanter.h @@ -20,6 +20,8 @@ #ifndef __DTREE_H__ #define __DTREE_H__ +#include + #include "qerplugin.h" #include "signal/isignal.h" #include "string/string.h" ---- contrib/bobtoolz/dialogs/dialogs-gtk.cpp.orig 2013-06-30 22:04:35.000000000 +0800 -+++ contrib/bobtoolz/dialogs/dialogs-gtk.cpp 2013-09-12 22:09:01.000000000 +0800 +--- contrib/bobtoolz/dialogs/dialogs-gtk.cpp.orig 2013-06-30 14:04:35 UTC ++++ contrib/bobtoolz/dialogs/dialogs-gtk.cpp @@ -22,6 +22,7 @@ #include "str.h" #include +#include #include #include "gtkutil/pointer.h" ---- contrib/bobtoolz/misc.cpp.orig 2013-06-30 22:04:35.000000000 +0800 -+++ contrib/bobtoolz/misc.cpp 2013-09-12 22:10:25.000000000 +0800 +--- contrib/bobtoolz/misc.cpp.orig 2013-06-30 14:04:35 UTC ++++ contrib/bobtoolz/misc.cpp @@ -31,7 +31,7 @@ #include "funchandlers.h" -#ifdef __linux__ +#if defined (__linux__) || defined(__FreeBSD__) #include #include #endif ---- contrib/bobtoolz/shapes.cpp.orig 2013-06-30 22:04:35.000000000 +0800 -+++ contrib/bobtoolz/shapes.cpp 2013-09-12 22:20:34.000000000 +0800 +--- contrib/bobtoolz/shapes.cpp.orig 2013-06-30 14:04:35 UTC ++++ contrib/bobtoolz/shapes.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include #include "scenelib.h" ---- contrib/bobtoolz/visfind.cpp.orig 2013-06-30 22:04:35.000000000 +0800 -+++ contrib/bobtoolz/visfind.cpp 2013-09-12 22:21:08.000000000 +0800 +--- contrib/bobtoolz/visfind.cpp.orig 2013-06-30 14:04:35 UTC ++++ contrib/bobtoolz/visfind.cpp @@ -8,6 +8,7 @@ #include "bsploader.h" #include +#include typedef struct { int portalclusters; ---- contrib/sunplug/sunplug.cpp.orig 2013-06-30 22:04:35.000000000 +0800 -+++ contrib/sunplug/sunplug.cpp 2013-09-12 22:24:14.000000000 +0800 +--- contrib/sunplug/sunplug.cpp.orig 2013-06-30 14:04:35 UTC ++++ contrib/sunplug/sunplug.cpp @@ -35,6 +35,7 @@ #include "qerplugin.h" // declaration to use other interfaces as a plugin #include // to display something with gtk (windows, buttons etc.), the whole package might not be necessary +#include void about_plugin_window(); void MapCoordinator(); ---- contrib/ufoaiplug/ufoai_level.cpp.orig 2013-06-30 22:04:35.000000000 +0800 -+++ contrib/ufoaiplug/ufoai_level.cpp 2013-09-12 22:24:53.000000000 +0800 +--- contrib/ufoaiplug/ufoai_level.cpp.orig 2013-06-30 14:04:35 UTC ++++ contrib/ufoaiplug/ufoai_level.cpp @@ -25,6 +25,7 @@ #include "string/string.h" #include +#include class Level; ---- libs/cmdlib/cmdlib.cpp.orig 2013-06-30 22:04:34.000000000 +0800 -+++ libs/cmdlib/cmdlib.cpp 2013-09-12 22:22:08.000000000 +0800 +--- libs/cmdlib/cmdlib.cpp.orig 2013-06-30 14:04:34 UTC ++++ libs/cmdlib/cmdlib.cpp @@ -27,6 +27,7 @@ #include #include +#include #include "string/string.h" #include "os/path.h" +--- libs/scenelib.h.orig 2013-06-30 14:04:34 UTC ++++ libs/scenelib.h +@@ -32,7 +32,6 @@ + #include "math/aabb.h" + #include "transformlib.h" + #include "generic/callback.h" +-#include "generic/reference.h" + #include "container/stack.h" + #include "typesystem.h" + +@@ -286,6 +285,7 @@ inline bool operator!=( scene::Node& node, scene::Node + return !::operator==( node, other ); + } + ++#include "generic/reference.h" + + inline scene::Node& NewNullNode(){ + return ( new scene::NullNode )->node(); +--- plugins/mapq3/parse.h.orig 2013-06-30 14:04:35 UTC ++++ plugins/mapq3/parse.h +@@ -40,6 +40,7 @@ namespace scene + class Node; + } + ++#include "scenelib.h" + #include "generic/referencecounted.h" + typedef SmartReference > NodeSmartReference; + +--- radiant/texwindow.cpp.orig 2013-06-30 14:04:35 UTC ++++ radiant/texwindow.cpp +@@ -1880,7 +1880,7 @@ void TextureBrowser_SetNotex(){ + name << GlobalRadiant().getAppPath() << "bitmaps/notex.png"; + g_notex = name.c_str(); + +- name = NULL; ++ name.clear(); + name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.png"; + g_shadernotex = name.c_str(); + }