svn commit: r365470 - in head/graphics/mypaint: . files

[Adam Weinberger]

Author: adamw
Date: Wed Aug 20 15:39:50 2014
New Revision: 365470
URL: http://svnweb.freebsd.org/changeset/ports/365470
QAT: https://qat.redports.org/buildarchive/r365470/

Log:
  Fix build after json-c update.
  
  The plist still has some issues, namely trying to remove share/icons/hicolor
  directories.

Modified:
  head/graphics/mypaint/Makefile
  head/graphics/mypaint/files/patch-brushlib-SConscript

Modified: head/graphics/mypaint/Makefile
==============================================================================
--- head/graphics/mypaint/Makefile	Wed Aug 20 15:23:57 2014	(r365469)
+++ head/graphics/mypaint/Makefile	Wed Aug 20 15:39:50 2014	(r365470)
@@ -14,16 +14,15 @@ COMMENT=	Fast painting/scribbling progra
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy \
 		${PYTHON_SITELIBDIR}/cairo:${PORTSDIR}/graphics/py-cairo \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:${PORTSDIR}/devel/py-protobuf
-LIB_DEPENDS=	libjson.so:${PORTSDIR}/devel/json-c \
+LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
 		swig:${PORTSDIR}/devel/swig13 \
 		protoc:${PORTSDIR}/devel/protobuf
 
 USE_GNOME=	glib20 pygtk2
-USE_PYTHON=	yes
 MAKE_ARGS=	prefix="${PREFIX}"
-USES=		gettext pkgconfig scons tar:bzip2
+USES=		gettext pkgconfig scons tar:bzip2 python
 INSTALLS_ICONS=	yes
 
 SUB_FILES=	pkg-install

Modified: head/graphics/mypaint/files/patch-brushlib-SConscript
==============================================================================
--- head/graphics/mypaint/files/patch-brushlib-SConscript	Wed Aug 20 15:23:57 2014	(r365469)
+++ head/graphics/mypaint/files/patch-brushlib-SConscript	Wed Aug 20 15:39:50 2014	(r365470)
@@ -1,5 +1,5 @@
---- brushlib/SConscript.orig	2012-12-31 19:03:38.000000000 +0200
-+++ brushlib/SConscript	2013-03-29 20:13:10.000000000 +0200
+--- 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 @@
      }
      pc_file = env.Substfile('%s.pc' % pkgconfig_name,
@@ -17,3 +17,12 @@
  
  if env['enable_introspection']:
      env['use_glib'] = True
+@@ -73,7 +74,7 @@
+ 
+ env.Append(CPPPATH='./')
+ 
+-pkg_deps = ['json']
++pkg_deps = ['json-c']
+ libs = ['m']
+ linkflags = []
+