Index: head/graphics/mypaint/Makefile =================================================================== --- head/graphics/mypaint/Makefile (revision 414045) +++ head/graphics/mypaint/Makefile (revision 414046) @@ -1,47 +1,55 @@ # Created by: Andrew Pantyukhin # $FreeBSD$ PORTNAME= mypaint -PORTVERSION= 1.1.0 -PORTREVISION= 5 +DISTVERSIONPREFIX= v +DISTVERSION= 1.1.0 +PORTREVISION= 6 CATEGORIES= graphics -MASTER_SITES= http://download.gna.org/mypaint/ \ - http://mirror.amdmi3.ru/distfiles/ MAINTAINER= ports@FreeBSD.org COMMENT= Fast painting/scribbling program +LICENSE= GPLv2+ ISCL MIT +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING +LICENSE_FILE_ISCL= ${WRKSRC}/brushlib/COPYING +LICENSE_FILE_MIT= ${WRKSRC}/COPYING.cursors + RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo \ ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf LIB_DEPENDS= libjson-c.so:devel/json-c \ liblcms2.so:graphics/lcms2 BUILD_DEPENDS:= ${RUN_DEPENDS} \ swig:devel/swig13 \ protoc:devel/protobuf +USE_GITHUB= yes USE_GNOME= glib20 pygtk2 MAKE_ARGS= prefix="${PREFIX}" # XXX gcc-c++11-lib to fix runtime issues with old -lgcc_s and Clang -USES= compiler:gcc-c++11-lib gettext pkgconfig scons tar:bzip2 python +USES= compiler:gcc-c++11-lib desktop-file-utils gettext \ + pkgconfig python scons tar:bzip2 INSTALLS_ICONS= yes SUB_FILES= pkg-install post-patch: - ${REINPLACE_CMD} -e 's,,,' \ + @${REINPLACE_CMD} -e 's,,,' \ ${WRKSRC}/brushlib/operationqueue.c \ ${WRKSRC}/brushlib/fifo.c @${REINPLACE_CMD} 's|-O3||g; s|-g||g' \ ${WRKSRC}/SConstruct pre-install: - @${RM} -rf ${WRKSRC}/sandbox 2>/dev/null || true - @cd ${WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} --install-sandbox=pre-stage + @${RM} -rf ${WRKSRC}/sandbox 2>/dev/null || ${TRUE} + @(cd ${WRKSRC} && ${DO_MAKE_BUILD} --install-sandbox=pre-stage) do-install: .for d in . po brushlib brushlib/po - @cd ${WRKSRC}/${d}/pre-stage; ${PAX} -rw . ${STAGEDIR} + (cd ${WRKSRC}/${d}/pre-stage && ${PAX} -rw . ${STAGEDIR}) .endfor + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mypaint/_mypaintlib.so .include Index: head/graphics/mypaint/distinfo =================================================================== --- head/graphics/mypaint/distinfo (revision 414045) +++ head/graphics/mypaint/distinfo (revision 414046) @@ -1,2 +1,2 @@ -SHA256 (mypaint-1.1.0.tar.bz2) = 780d57e50dd90afd586873bc5120261930ea4c309d4d0958020916932122e838 -SIZE (mypaint-1.1.0.tar.bz2) = 37416388 +SHA256 (mypaint-mypaint-v1.1.0_GH0.tar.gz) = 59d8323c60423c9a15e02ff93e406d25a7919df3af826089f0cf7f1124c9dbd1 +SIZE (mypaint-mypaint-v1.1.0_GH0.tar.gz) = 37871920 Index: head/graphics/mypaint/files/patch-SConstruct =================================================================== --- head/graphics/mypaint/files/patch-SConstruct (revision 414045) +++ head/graphics/mypaint/files/patch-SConstruct (revision 414046) @@ -1,24 +1,24 @@ ---- SConstruct.orig 2012-12-31 19:03:38.000000000 +0200 -+++ SConstruct 2013-01-11 20:45:33.000000000 +0200 -@@ -39,7 +39,7 @@ +--- SConstruct.orig 2012-12-31 16:35:54 UTC ++++ SConstruct +@@ -39,7 +39,7 @@ opts.Add('python_config', 'python-config tools = ['default', 'textfile'] -env = Environment(ENV=os.environ, options=opts, tools=tools) +env = Environment(ENV=os.environ, options=opts, tools=tools, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems())) print('building for %r (use scons python_binary=xxx to change)' % env['python_binary']) print('using %r (use scons python_config=xxx to change)' % env['python_config']) if sys.platform == "win32": -@@ -47,9 +47,9 @@ +@@ -47,9 +47,9 @@ if sys.platform == "win32": env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts) opts.Update(env) -env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings') -env.Append(CCFLAGS='-Wall') -env.Append(CFLAGS='-std=c99') +env.Append(CXXFLAGS=['-Wall', '-Wno-sign-compare', '-Wno-write-strings']) +env.Append(CCFLAGS=['-Wall']) +env.Append(CFLAGS=['-std=c99']) # Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008) env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L') Index: head/graphics/mypaint/files/patch-brushlib-SConscript =================================================================== --- head/graphics/mypaint/files/patch-brushlib-SConscript (revision 414045) +++ head/graphics/mypaint/files/patch-brushlib-SConscript (revision 414046) @@ -1,28 +1,28 @@ ---- brushlib/SConscript.orig 2012-12-31 12:03:38.000000000 -0500 -+++ brushlib/SConscript 2014-08-20 11:36:09.000000000 -0400 -@@ -47,7 +47,7 @@ +--- brushlib/SConscript.orig 2012-12-31 16:35:54 UTC ++++ brushlib/SConscript +@@ -47,7 +47,7 @@ def create_pkgconfig_files(env, pkgconfi } pc_file = env.Substfile('%s.pc' % pkgconfig_name, "pkgconfig.pc.in", SUBST_DICT=pkg_info) - install_perms(env, '$prefix/lib/pkgconfig', pc_file) + install_perms(env, '$prefix/libdata/pkgconfig', pc_file) return pc_file -@@ -56,6 +56,7 @@ +@@ -56,6 +56,7 @@ def create_pkgconfig_files(env, pkgconfi # and also add our own specifics ones without affecting the other builds top_env = env env = env.Clone() +env.Prepend(LIBPATH=[".."]) if env['enable_introspection']: env['use_glib'] = True -@@ -73,7 +74,7 @@ +@@ -73,7 +74,7 @@ if env['enable_docs']: env.Append(CPPPATH='./') -pkg_deps = ['json'] +pkg_deps = ['json-c'] libs = ['m'] linkflags = [] Index: head/graphics/mypaint/files/patch-brushlib-tests-SConscript =================================================================== --- head/graphics/mypaint/files/patch-brushlib-tests-SConscript (revision 414045) +++ head/graphics/mypaint/files/patch-brushlib-tests-SConscript (revision 414046) @@ -1,14 +1,14 @@ ---- brushlib/tests/SConscript.orig 2012-12-31 19:03:38.000000000 +0200 -+++ brushlib/tests/SConscript 2013-03-29 20:06:21.000000000 +0200 -@@ -13,8 +13,9 @@ +--- brushlib/tests/SConscript.orig 2012-12-31 16:35:54 UTC ++++ brushlib/tests/SConscript +@@ -13,8 +13,9 @@ def is_test(fn): tests_sources = [fn for fn in os.listdir("./") if is_test(fn) and is_csource(fn)] testlib_sources = [fn for fn in os.listdir("./") if not is_test(fn) and is_csource(fn)] -testlib_env.Append(LIBS=['mypaint']) -testlib_env.Append(CPPPATH=['../'], LIBPATH=['../..']) +testlib_env.Append(LIBS=['intl', 'mypaint']) +testlib_env.Append(CPPPATH=['../']) +testlib_env.Prepend(LIBPATH=['../..']) if testlib_env['enable_gperftools']: testlib_env.ParseConfig('pkg-config --cflags --libs libprofiler') Index: head/graphics/mypaint/files/patch-mypaint.py =================================================================== --- head/graphics/mypaint/files/patch-mypaint.py (revision 414045) +++ head/graphics/mypaint/files/patch-mypaint.py (revision 414046) @@ -1,14 +1,14 @@ ---- mypaint.py.orig 2013-04-16 20:22:02.000000000 +0200 -+++ mypaint.py 2013-04-16 20:22:19.000000000 +0200 -@@ -172,11 +172,6 @@ +--- mypaint.py.orig 2012-12-31 16:35:54 UTC ++++ mypaint.py +@@ -172,11 +172,6 @@ if __name__ == '__main__': print "DEBUG: localepath: ", localepath print "DEBUG: localepath_brushlib: ", localepath_brushlib - # Low-level bindtextdomain, required for GtkBuilder stuff. - locale.bindtextdomain("mypaint", localepath) - locale.bindtextdomain("libmypaint", localepath_brushlib) - locale.textdomain("mypaint") - # Python gettext module. # See http://docs.python.org/release/2.7/library/locale.html gettext.bindtextdomain("mypaint", localepath) Index: head/graphics/mypaint/pkg-descr =================================================================== --- head/graphics/mypaint/pkg-descr (revision 414045) +++ head/graphics/mypaint/pkg-descr (revision 414046) @@ -1,11 +1,11 @@ MyPaint is a fast and easy open-source graphics application for digital painters. It lets you focus on the art instead of the program. You work on your canvas with minimum distractions, bringing up the interface only when you need it. MyPaint comes with a large brush collection including charcoal and ink to emulate real media, but the highly configurable brush engine allows you to experiment with your own brushes and with not-quite-natural painting. -WWW: http://mypaint.intilinux.com/ +WWW: http://mypaint.org/