Index: head/lang/angelscript/Makefile =================================================================== --- head/lang/angelscript/Makefile (revision 515183) +++ head/lang/angelscript/Makefile (revision 515184) @@ -1,39 +1,39 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= angelscript -PORTVERSION= 2.33.0 +PORTVERSION= 2.34.0 CATEGORIES= lang MASTER_SITES= http://www.angelcode.com/angelscript/sdk/files/ DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= ndowens@yahoo.com +MAINTAINER= ndowens04@gmail.com COMMENT= AngelCode Scripting Library LICENSE= ZLIB BROKEN_aarch64= Does not build: invokes x86 asm BROKEN_sparc64= Does not build: invokes x86 asm USES= alias compiler:c11 dos2unix gmake zip USE_LDCONFIG= yes DOS2UNIX_FILES= ../../source/as_config.h MAKE_ARGS= CP_SYMLINK="${INSTALL_LIB}" -.include -.if ${ARCH} == "i386" -pre-build: - (cd ${WRKDIR}/sdk/angelscript/source && ${REINPLACE_CMD} -e 's|ifdef __OPTIMIZE__|if defined(__OPTIMIZE__) \&\&\ !defined(__clang__)|g' \ - -e 's,ifdef __OPTIMIZE__ifdef __OPTIMIZE__,,g' *.cpp) -.endif - WRKSRC= ${WRKDIR}/sdk/angelscript/projects/gnuc/ PLIST_FILES= include/angelscript.h \ lib/libangelscript.a \ lib/libangelscript.so \ lib/libangelscript.so.${PORTVERSION} + +.include +.if ${ARCH} == "i386" +pre-build: + (cd ${WRKDIR}/sdk/angelscript/source && ${REINPLACE_CMD} -e 's|ifdef __OPTIMIZE__|if defined(__OPTIMIZE__) \&\&\ !defined(__clang__)|g' \ + -e 's,ifdef __OPTIMIZE__ifdef __OPTIMIZE__,,g' *.cpp) +.endif .include Index: head/lang/angelscript/distinfo =================================================================== --- head/lang/angelscript/distinfo (revision 515183) +++ head/lang/angelscript/distinfo (revision 515184) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545625239 -SHA256 (angelscript_2.33.0.zip) = 3691090b23d4382849a4f4e0ab71d94526636c64deec94a97d7d9419e2e21ea3 -SIZE (angelscript_2.33.0.zip) = 1954948 +TIMESTAMP = 1571453470 +SHA256 (angelscript_2.34.0.zip) = 6faa043717522ae0fb2677d907ca5b0e35a79d28e5f83294565e6c6229bfbdf7 +SIZE (angelscript_2.34.0.zip) = 2020026 Index: head/lang/angelscript/files/patch-as_config.h =================================================================== --- head/lang/angelscript/files/patch-as_config.h (revision 515183) +++ head/lang/angelscript/files/patch-as_config.h (revision 515184) @@ -1,11 +1,15 @@ ---- ../../source/as_config.h.orig 2019-07-28 15:58:25.283690000 +0200 -+++ ../../source/as_config.h 2019-07-28 16:08:34.592212000 +0200 -@@ -953,6 +953,8 @@ +diff --git sdk/angelscript/source/as_config.h sdk/angelscript/source/as_config.h +index e17d1ee..f0e49b4 100644 +--- ../../source/as_config.h ++++ ../../source/as_config.h +@@ -953,7 +953,9 @@ #define COMPLEX_RETURN_MASK (asOBJ_APP_CLASS_DESTRUCTOR | asOBJ_APP_CLASS_COPY_CONSTRUCTOR | asOBJ_APP_ARRAY) #define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK #define AS_X86 +- #elif defined(__x86_64__) + #elif defined(__powerpc64__) + #define AS_MAX_PORTABILITY - #elif defined(__LP64__) ++ #elif defined(__x86_64__) || defined(__LP64__) #define AS_X64_GCC #define HAS_128_BIT_PRIMITIVES + #define SPLIT_OBJS_BY_MEMBER_TYPES