Index: head/graphics/goxel/Makefile =================================================================== --- head/graphics/goxel/Makefile (revision 489123) +++ head/graphics/goxel/Makefile (revision 489124) @@ -1,40 +1,37 @@ # $FreeBSD$ PORTNAME= goxel DISTVERSIONPREFIX= v -DISTVERSION= 0.7.1-70 -PORTREVISION= 2 -DISTVERSIONSUFFIX= -g193eded +DISTVERSION= 0.8.2 CATEGORIES= graphics MAINTAINER= greg@unrelenting.technology COMMENT= Free and Open Source 3D Voxel Editor LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc64= fails to build: sh: clang++: not found - LIB_DEPENDS= libargp.so:devel/argp-standalone \ libglfw.so:graphics/glfw \ libpng.so:graphics/png -USES= compiler:c++11-lang pkgconfig scons +USES= compiler:c++11-lang pkgconfig scons gnome gl USE_GITHUB= yes GH_ACCOUNT= guillaumechereau USE_GNOME= cairo gtk30 USE_GL= gl INSTALLS_ICONS= yes -MAKE_ARGS= clang=1 debug=0 +MAKE_ARGS= debug=0 +DESKTOP_ENTRIES="Goxel" "${COMMENT}" "${PORTNAME}" \ + "${PORTNAME}" "Graphics;3DGraphics;" false do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .for SZ in 32 64 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps ${INSTALL_DATA} ${WRKSRC}/osx/goxel/goxel/Assets.xcassets/AppIcon.appiconset/${SZ}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/goxel.png .endfor - ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} .include Index: head/graphics/goxel/distinfo =================================================================== --- head/graphics/goxel/distinfo (revision 489123) +++ head/graphics/goxel/distinfo (revision 489124) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506893291 -SHA256 (guillaumechereau-goxel-v0.7.1-70-g193eded_GH0.tar.gz) = b5c4fea8029543f81dff4c73377f0ef6411f87e65463604a581e3bbc277e66cf -SIZE (guillaumechereau-goxel-v0.7.1-70-g193eded_GH0.tar.gz) = 1441265 +TIMESTAMP = 1545486941 +SHA256 (guillaumechereau-goxel-v0.8.2_GH0.tar.gz) = 4f8297560e356cb69469e0a23bcb4e9c4e8549766a0466ffeaa0c9cfb7a04049 +SIZE (guillaumechereau-goxel-v0.8.2_GH0.tar.gz) = 3387515 Index: head/graphics/goxel/files/goxel.desktop =================================================================== --- head/graphics/goxel/files/goxel.desktop (revision 489123) +++ head/graphics/goxel/files/goxel.desktop (nonexistent) @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Goxel -GenericName=3D Voxel Editor -Icon=goxel -Exec=goxel -Keywords=3d;voxel; -Categories=Graphics;3DGraphics; -Terminal=false Property changes on: head/graphics/goxel/files/goxel.desktop ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/goxel/files/patch-SConstruct =================================================================== --- head/graphics/goxel/files/patch-SConstruct (nonexistent) +++ head/graphics/goxel/files/patch-SConstruct (revision 489124) @@ -0,0 +1,35 @@ +--- SConstruct.orig 2018-12-22 14:00:12 UTC ++++ SConstruct +@@ -28,15 +28,18 @@ clang = int(ARGUMENTS.get("clang", 0)) + cycles = int(ARGUMENTS.get('cycles', 1)) + sound = False + +-if os.environ.get('CC') == 'clang': clang = 1 ++import subprocess ++if 'clang' in subprocess.check_output([os.environ.get('CC', 'cc'), '-v'], ++ stderr=subprocess.STDOUT): ++ clang = 1 ++print 'clang', clang + if profile: debug = 0 + +-env = Environment(ENV = os.environ) ++ ++env = Environment(ENV = os.environ, CC = os.environ.get('CC', 'cc'), ++ CXX = os.environ.get('CXX', 'c++')) + conf = env.Configure() + +-if clang: +- env.Replace(CC='clang', CXX='clang++') +- + # Asan & Ubsan (need to come first). + # Cycles doesn't like libasan with clang, so we only use it on + # C code with clang. +@@ -145,7 +148,7 @@ if cycles: + sources += glob.glob('ext_src/cycles/src/subd/*.cpp') + + env.Append(CPPPATH=['ext_src/cycles/src']) +- env.Append(CPPPATH=['ext_src/cycles/third_party/atomic']) ++ env.Prepend(CPPPATH=['ext_src/cycles/third_party/atomic']) + env.Append(CPPFLAGS=[ + '-DCYCLES_STD_UNORDERED_MAP', + '-DCCL_NAMESPACE_BEGIN=namespace ccl {', Property changes on: head/graphics/goxel/files/patch-SConstruct ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/goxel/files/patch-ext__src_cycles_src_util_util__path.cpp =================================================================== --- head/graphics/goxel/files/patch-ext__src_cycles_src_util_util__path.cpp (nonexistent) +++ head/graphics/goxel/files/patch-ext__src_cycles_src_util_util__path.cpp (revision 489124) @@ -0,0 +1,13 @@ +--- ext_src/cycles/src/util/util_path.cpp.orig 2018-12-22 14:23:19 UTC ++++ ext_src/cycles/src/util/util_path.cpp +@@ -38,6 +38,10 @@ + # include + #endif + ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#include ++#endif ++ + #include "util/util_map.h" + #include "util/util_windows.h" + Property changes on: head/graphics/goxel/files/patch-ext__src_cycles_src_util_util__path.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/goxel/pkg-plist =================================================================== --- head/graphics/goxel/pkg-plist (revision 489123) +++ head/graphics/goxel/pkg-plist (revision 489124) @@ -1,5 +1,4 @@ bin/goxel -share/applications/goxel.desktop share/icons/hicolor/32x32/apps/goxel.png share/icons/hicolor/64x64/apps/goxel.png share/icons/hicolor/256x256/apps/goxel.png