svn commit: r414046 - in head/graphics/mypaint: . files
Jan Beich
jbeich at FreeBSD.org
Tue Apr 26 12:29:33 UTC 2016
Author: jbeich
Date: Tue Apr 26 12:29:31 2016
New Revision: 414046
URL: https://svnweb.freebsd.org/changeset/ports/414046
Log:
graphics/mypaint: fix minor issues
- Move to new home [1]
- Define LICENSE [2]
- Strip python C module [3]
- Add USES=desktop-file-utils [3]
- Apply style (echo, makepatch) [2]
Noticed by: portscout [1], portlint [2], stage-qa [3]
Modified:
head/graphics/mypaint/Makefile (contents, props changed)
head/graphics/mypaint/distinfo (contents, props changed)
head/graphics/mypaint/files/patch-SConstruct (contents, props changed)
head/graphics/mypaint/files/patch-brushlib-SConscript (contents, props changed)
head/graphics/mypaint/files/patch-brushlib-tests-SConscript (contents, props changed)
head/graphics/mypaint/files/patch-mypaint.py (contents, props changed)
head/graphics/mypaint/pkg-descr (contents, props changed)
Modified: head/graphics/mypaint/Makefile
==============================================================================
--- head/graphics/mypaint/Makefile Tue Apr 26 11:57:42 2016 (r414045)
+++ head/graphics/mypaint/Makefile Tue Apr 26 12:29:31 2016 (r414046)
@@ -2,15 +2,20 @@
# $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 at 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
@@ -20,28 +25,31 @@ 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,<malloc.h>,<stdlib.h>,' \
+ @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
${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 <bsd.port.mk>
Modified: head/graphics/mypaint/distinfo
==============================================================================
--- head/graphics/mypaint/distinfo Tue Apr 26 11:57:42 2016 (r414045)
+++ head/graphics/mypaint/distinfo Tue Apr 26 12:29:31 2016 (r414046)
@@ -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
Modified: head/graphics/mypaint/files/patch-SConstruct
==============================================================================
--- head/graphics/mypaint/files/patch-SConstruct Tue Apr 26 11:57:42 2016 (r414045)
+++ head/graphics/mypaint/files/patch-SConstruct Tue Apr 26 12:29:31 2016 (r414046)
@@ -1,6 +1,6 @@
---- 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']
@@ -9,7 +9,7 @@
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)
Modified: head/graphics/mypaint/files/patch-brushlib-SConscript
==============================================================================
--- head/graphics/mypaint/files/patch-brushlib-SConscript Tue Apr 26 11:57:42 2016 (r414045)
+++ head/graphics/mypaint/files/patch-brushlib-SConscript Tue Apr 26 12:29:31 2016 (r414046)
@@ -1,6 +1,6 @@
---- 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)
@@ -9,7 +9,7 @@
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()
@@ -17,7 +17,7 @@
if env['enable_introspection']:
env['use_glib'] = True
-@@ -73,7 +74,7 @@
+@@ -73,7 +74,7 @@ if env['enable_docs']:
env.Append(CPPPATH='./')
Modified: head/graphics/mypaint/files/patch-brushlib-tests-SConscript
==============================================================================
--- head/graphics/mypaint/files/patch-brushlib-tests-SConscript Tue Apr 26 11:57:42 2016 (r414045)
+++ head/graphics/mypaint/files/patch-brushlib-tests-SConscript Tue Apr 26 12:29:31 2016 (r414046)
@@ -1,6 +1,6 @@
---- 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)]
Modified: head/graphics/mypaint/files/patch-mypaint.py
==============================================================================
--- head/graphics/mypaint/files/patch-mypaint.py Tue Apr 26 11:57:42 2016 (r414045)
+++ head/graphics/mypaint/files/patch-mypaint.py Tue Apr 26 12:29:31 2016 (r414046)
@@ -1,6 +1,6 @@
---- 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
Modified: head/graphics/mypaint/pkg-descr
==============================================================================
--- head/graphics/mypaint/pkg-descr Tue Apr 26 11:57:42 2016 (r414045)
+++ head/graphics/mypaint/pkg-descr Tue Apr 26 12:29:31 2016 (r414046)
@@ -8,4 +8,4 @@ ink to emulate real media, but the highl
allows you to experiment with your own brushes and with not-quite-natural
painting.
-WWW: http://mypaint.intilinux.com/
+WWW: http://mypaint.org/
More information about the svn-ports-all
mailing list