diff options
| -rw-r--r-- | graphics/tuxpaint/Makefile | 19 | ||||
| -rw-r--r-- | graphics/tuxpaint/PLIST | 169 | ||||
| -rw-r--r-- | graphics/tuxpaint/distinfo | 10 | ||||
| -rw-r--r-- | graphics/tuxpaint/patches/patch-aa | 74 | ||||
| -rw-r--r-- | graphics/tuxpaint/patches/patch-ab | 20 |
5 files changed, 181 insertions, 111 deletions
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile index d171ab2cbdc..fa7e6300593 100644 --- a/graphics/tuxpaint/Makefile +++ b/graphics/tuxpaint/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.79 2014/08/17 09:42:27 wiz Exp $ +# $NetBSD: Makefile,v 1.80 2014/08/23 21:12:02 wiz Exp $ -DISTNAME= tuxpaint-0.9.21 +DISTNAME= tuxpaint-0.9.22 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/} @@ -10,17 +10,16 @@ COMMENT= Drawing program for small children # program itself is gnu-gpl-v2, other licenses are packaged fonts LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND public-domain AND modified-bsd -USE_TOOLS+= gmake msgfmt pkg-config +BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf + +USE_TOOLS+= bash:run gmake msgfmt pkg-config USE_PKGLOCALEDIR= YES MANCOMPRESSED= YES -BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6 -BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.7 -BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.4 - CONFLICTS+= tuxpaint-stamps<2003.12.23 BROKEN_GETTEXT_DETECTION= yes +REPLACE_BASH= src/tuxpaint-import.sh PKG_SYSCONFSUBDIR= tuxpaint MAKE_FLAGS+= CONFDIR=${PKG_SYSCONFDIR:Q} @@ -31,10 +30,12 @@ MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} MAKE_FLAGS+= CHMOD=${CHMOD:Q} MAKE_FLAGS+= PREFIX=${PREFIX} MAKE_FLAGS+= MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/ +MAKE_FLAGS+= GPERF=${PREFIX}/bin/gperf EGDIR= ${PREFIX}/share/examples/tuxpaint CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf INSTALL_MAKE_FLAGS+= PKG_ROOT=${DESTDIR} +INSTALL_MAKE_FLAGS+= CONFDIR=${DESTDIR}${PREFIX}/share/examples/tuxpaint .include "../../mk/bsd.fast.prefs.mk" @@ -53,12 +54,16 @@ post-install: ${RM} -f ${DESTDIR}${PREFIX}/share/tuxpaint/fonts/locale/zh_tw_docs/maketuxfont.py ${RM} -f ${DESTDIR}${PREFIX}/share/tuxpaint/fonts/locale/zh_tw_docs/tuxpaintsubset.pe +BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6 .include "../../audio/SDL_mixer/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" +.include "../../devel/SDL_Pango/buildlink3.mk" +BUILDLINK_API_DEPENDS.SDL_ttf+= SDL_ttf>=2.0.7 .include "../../devel/SDL_ttf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.4 .include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" diff --git a/graphics/tuxpaint/PLIST b/graphics/tuxpaint/PLIST index 3fd742af508..66d2cfc32e6 100644 --- a/graphics/tuxpaint/PLIST +++ b/graphics/tuxpaint/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.14 2014/08/17 09:42:27 wiz Exp $ +@comment $NetBSD: PLIST,v 1.15 2014/08/23 21:12:02 wiz Exp $ X11R6/include/X11/pixmaps/tuxpaint.xpm bin/tp-magic-config bin/tuxpaint bin/tuxpaint-import include/tuxpaint/tp_magic_api.h lib/tuxpaint/plugins/alien.so +lib/tuxpaint/plugins/blind.so lib/tuxpaint/plugins/blocks_chalk_drip.so lib/tuxpaint/plugins/blur.so lib/tuxpaint/plugins/bricks.so @@ -19,15 +20,19 @@ lib/tuxpaint/plugins/fisheye.so lib/tuxpaint/plugins/flower.so lib/tuxpaint/plugins/foam.so lib/tuxpaint/plugins/fold.so +lib/tuxpaint/plugins/fretwork.so lib/tuxpaint/plugins/glasstile.so lib/tuxpaint/plugins/grass.so +lib/tuxpaint/plugins/halftone.so lib/tuxpaint/plugins/kalidescope.so lib/tuxpaint/plugins/light.so lib/tuxpaint/plugins/metalpaint.so lib/tuxpaint/plugins/mirror_flip.so lib/tuxpaint/plugins/mosaic.so +lib/tuxpaint/plugins/mosaic_shaped.so lib/tuxpaint/plugins/negative.so lib/tuxpaint/plugins/noise.so +lib/tuxpaint/plugins/perspective.so lib/tuxpaint/plugins/puzzle.so lib/tuxpaint/plugins/rails.so lib/tuxpaint/plugins/rain.so @@ -45,6 +50,7 @@ lib/tuxpaint/plugins/toothpaste.so lib/tuxpaint/plugins/tornado.so lib/tuxpaint/plugins/tv.so lib/tuxpaint/plugins/waves.so +lib/tuxpaint/plugins/xor.so man/man1/tp-magic-config.1 man/man1/tuxpaint-import.1 man/man1/tuxpaint.1 @@ -56,6 +62,7 @@ share/doc/tuxpaint-dev/tp_magic_example.c share/doc/tuxpaint/ADVANCED-STAMPS-HOWTO.txt share/doc/tuxpaint/AUTHORS.txt share/doc/tuxpaint/CHANGES.txt +share/doc/tuxpaint/COPYING-OC.txt share/doc/tuxpaint/COPYING.txt share/doc/tuxpaint/EXTENDING.txt share/doc/tuxpaint/FAQ.txt @@ -328,6 +335,7 @@ share/doc/tuxpaint/ja/INSTALL.txt share/doc/tuxpaint/ja/OPTIONS.txt share/doc/tuxpaint/ja/PNG.txt share/doc/tuxpaint/ja/README.txt +share/doc/tuxpaint/ja/html/README.html share/doc/tuxpaint/ko/AUTHORS.txt share/doc/tuxpaint/ko/COPYING.html share/doc/tuxpaint/ko/FAQ.txt @@ -344,6 +352,7 @@ share/doc/tuxpaint/lt/OPTIONS.txt share/doc/tuxpaint/lt/PNG.txt share/doc/tuxpaint/lt/README.txt share/doc/tuxpaint/magic-docs/Makefile +share/doc/tuxpaint/magic-docs/blinds.txt share/doc/tuxpaint/magic-docs/blocks.txt share/doc/tuxpaint/magic-docs/blur.txt share/doc/tuxpaint/magic-docs/bricks.txt @@ -366,6 +375,8 @@ share/doc/tuxpaint/magic-docs/foam.txt share/doc/tuxpaint/magic-docs/fold.txt share/doc/tuxpaint/magic-docs/glasstile.txt share/doc/tuxpaint/magic-docs/grass.txt +share/doc/tuxpaint/magic-docs/hexagonmosaic.txt +share/doc/tuxpaint/magic-docs/html/blinds.html share/doc/tuxpaint/magic-docs/html/blocks.html share/doc/tuxpaint/magic-docs/html/blur.html share/doc/tuxpaint/magic-docs/html/bricks.html @@ -388,14 +399,20 @@ share/doc/tuxpaint/magic-docs/html/foam.html share/doc/tuxpaint/magic-docs/html/fold.html share/doc/tuxpaint/magic-docs/html/glasstile.html share/doc/tuxpaint/magic-docs/html/grass.html +share/doc/tuxpaint/magic-docs/html/hexagonmosaic.html share/doc/tuxpaint/magic-docs/html/index.html +share/doc/tuxpaint/magic-docs/html/irregularmosaic.html +share/doc/tuxpaint/magic-docs/html/kal_pattern.html +share/doc/tuxpaint/magic-docs/html/kal_tiles.html share/doc/tuxpaint/magic-docs/html/kaleidoscope.html share/doc/tuxpaint/magic-docs/html/light.html share/doc/tuxpaint/magic-docs/html/lighten.html share/doc/tuxpaint/magic-docs/html/metalpaint.html share/doc/tuxpaint/magic-docs/html/mirror.html +share/doc/tuxpaint/magic-docs/html/mosaic.html share/doc/tuxpaint/magic-docs/html/negative.html share/doc/tuxpaint/magic-docs/html/noise.html +share/doc/tuxpaint/magic-docs/html/perspective.html share/doc/tuxpaint/magic-docs/html/picasso.html share/doc/tuxpaint/magic-docs/html/rails.html share/doc/tuxpaint/magic-docs/html/rain.html @@ -403,12 +420,14 @@ share/doc/tuxpaint/magic-docs/html/rainbow.html share/doc/tuxpaint/magic-docs/html/realrainbow.html share/doc/tuxpaint/magic-docs/html/ripples.html share/doc/tuxpaint/magic-docs/html/rosette.html +share/doc/tuxpaint/magic-docs/html/roygbivrainbow.html share/doc/tuxpaint/magic-docs/html/sharpen.html share/doc/tuxpaint/magic-docs/html/shift.html share/doc/tuxpaint/magic-docs/html/silhouette.html share/doc/tuxpaint/magic-docs/html/smudge.html share/doc/tuxpaint/magic-docs/html/snowball.html share/doc/tuxpaint/magic-docs/html/snowflake.html +share/doc/tuxpaint/magic-docs/html/squaremosaic.html share/doc/tuxpaint/magic-docs/html/stringcorner.html share/doc/tuxpaint/magic-docs/html/stringedges.html share/doc/tuxpaint/magic-docs/html/stringv.html @@ -417,14 +436,21 @@ share/doc/tuxpaint/magic-docs/html/toothpaste.html share/doc/tuxpaint/magic-docs/html/tv.html share/doc/tuxpaint/magic-docs/html/wavelets.html share/doc/tuxpaint/magic-docs/html/waves.html +share/doc/tuxpaint/magic-docs/html/wetpaint.html +share/doc/tuxpaint/magic-docs/html/zoom.html share/doc/tuxpaint/magic-docs/index.txt +share/doc/tuxpaint/magic-docs/irregularmosaic.txt +share/doc/tuxpaint/magic-docs/kal_pattern.txt +share/doc/tuxpaint/magic-docs/kal_tiles.txt share/doc/tuxpaint/magic-docs/kaleidoscope.txt share/doc/tuxpaint/magic-docs/light.txt share/doc/tuxpaint/magic-docs/lighten.txt share/doc/tuxpaint/magic-docs/metalpaint.txt share/doc/tuxpaint/magic-docs/mirror.txt +share/doc/tuxpaint/magic-docs/mosaic.txt share/doc/tuxpaint/magic-docs/negative.txt share/doc/tuxpaint/magic-docs/noise.txt +share/doc/tuxpaint/magic-docs/perspective.txt share/doc/tuxpaint/magic-docs/picasso.txt share/doc/tuxpaint/magic-docs/rails.txt share/doc/tuxpaint/magic-docs/rain.txt @@ -432,12 +458,14 @@ share/doc/tuxpaint/magic-docs/rainbow.txt share/doc/tuxpaint/magic-docs/realrainbow.txt share/doc/tuxpaint/magic-docs/ripples.txt share/doc/tuxpaint/magic-docs/rosette.txt +share/doc/tuxpaint/magic-docs/roygbivrainbow.txt share/doc/tuxpaint/magic-docs/sharpen.txt share/doc/tuxpaint/magic-docs/shift.txt share/doc/tuxpaint/magic-docs/silhouette.txt share/doc/tuxpaint/magic-docs/smudge.txt share/doc/tuxpaint/magic-docs/snowball.txt share/doc/tuxpaint/magic-docs/snowflake.txt +share/doc/tuxpaint/magic-docs/squaremosaic.txt share/doc/tuxpaint/magic-docs/src/Makefile share/doc/tuxpaint/magic-docs/src/magic-docs.php share/doc/tuxpaint/magic-docs/stringcorner.txt @@ -448,6 +476,8 @@ share/doc/tuxpaint/magic-docs/toothpaste.txt share/doc/tuxpaint/magic-docs/tv.txt share/doc/tuxpaint/magic-docs/wavelets.txt share/doc/tuxpaint/magic-docs/waves.txt +share/doc/tuxpaint/magic-docs/wetpaint.txt +share/doc/tuxpaint/magic-docs/zoom.txt share/doc/tuxpaint/ms/COPYING.txt share/doc/tuxpaint/nb/AUTHORS.txt share/doc/tuxpaint/nb/COPYING.txt @@ -554,15 +584,24 @@ share/doc/tuxpaint/zh_tw/html/README.html share/doc/tuxpaint/zh_tw/mkTuxpaintIM.py share/doc/tuxpaint/zh_tw/phone.cin share/examples/tuxpaint/tuxpaint.conf +share/locale/ach/LC_MESSAGES/tuxpaint.mo share/locale/af/LC_MESSAGES/tuxpaint.mo +share/locale/ak/LC_MESSAGES/tuxpaint.mo +share/locale/am/LC_MESSAGES/tuxpaint.mo +share/locale/an/LC_MESSAGES/tuxpaint.mo share/locale/ar/LC_MESSAGES/tuxpaint.mo +share/locale/as/LC_MESSAGES/tuxpaint.mo share/locale/ast/LC_MESSAGES/tuxpaint.mo share/locale/az/LC_MESSAGES/tuxpaint.mo share/locale/be/LC_MESSAGES/tuxpaint.mo share/locale/bg/LC_MESSAGES/tuxpaint.mo +share/locale/bm/LC_MESSAGES/tuxpaint.mo share/locale/bo/LC_MESSAGES/tuxpaint.mo share/locale/br/LC_MESSAGES/tuxpaint.mo +share/locale/bs/LC_MESSAGES/tuxpaint.mo share/locale/ca/LC_MESSAGES/tuxpaint.mo +share/locale/ca@valencia/LC_MESSAGES/tuxpaint.mo +share/locale/cgg/LC_MESSAGES/tuxpaint.mo share/locale/cs/LC_MESSAGES/tuxpaint.mo share/locale/cy/LC_MESSAGES/tuxpaint.mo share/locale/da/LC_MESSAGES/tuxpaint.mo @@ -577,6 +616,8 @@ share/locale/es/LC_MESSAGES/tuxpaint.mo share/locale/es_MX/LC_MESSAGES/tuxpaint.mo share/locale/et/LC_MESSAGES/tuxpaint.mo share/locale/eu/LC_MESSAGES/tuxpaint.mo +share/locale/fa/LC_MESSAGES/tuxpaint.mo +share/locale/ff/LC_MESSAGES/tuxpaint.mo share/locale/fi/LC_MESSAGES/tuxpaint.mo share/locale/fo/LC_MESSAGES/tuxpaint.mo share/locale/fr/LC_MESSAGES/tuxpaint.mo @@ -589,36 +630,59 @@ share/locale/he/LC_MESSAGES/tuxpaint.mo share/locale/hi/LC_MESSAGES/tuxpaint.mo share/locale/hr/LC_MESSAGES/tuxpaint.mo share/locale/hu/LC_MESSAGES/tuxpaint.mo +share/locale/hy/LC_MESSAGES/tuxpaint.mo share/locale/id/LC_MESSAGES/tuxpaint.mo share/locale/is/LC_MESSAGES/tuxpaint.mo share/locale/it/LC_MESSAGES/tuxpaint.mo +share/locale/iu/LC_MESSAGES/tuxpaint.mo share/locale/ja/LC_MESSAGES/tuxpaint.mo share/locale/ka/LC_MESSAGES/tuxpaint.mo share/locale/km/LC_MESSAGES/tuxpaint.mo +share/locale/kn/LC_MESSAGES/tuxpaint.mo share/locale/ko/LC_MESSAGES/tuxpaint.mo +share/locale/kok/LC_MESSAGES/tuxpaint.mo +share/locale/kok@roman/LC_MESSAGES/tuxpaint.mo share/locale/ku/LC_MESSAGES/tuxpaint.mo +share/locale/lb/LC_MESSAGES/tuxpaint.mo +share/locale/lg/LC_MESSAGES/tuxpaint.mo share/locale/lt/LC_MESSAGES/tuxpaint.mo share/locale/lv/LC_MESSAGES/tuxpaint.mo +share/locale/mai/LC_MESSAGES/tuxpaint.mo share/locale/mk/LC_MESSAGES/tuxpaint.mo +share/locale/ml/LC_MESSAGES/tuxpaint.mo +share/locale/mn/LC_MESSAGES/tuxpaint.mo +share/locale/mni/LC_MESSAGES/tuxpaint.mo +share/locale/mni@meiteimayek/LC_MESSAGES/tuxpaint.mo +share/locale/mr/LC_MESSAGES/tuxpaint.mo share/locale/ms/LC_MESSAGES/tuxpaint.mo share/locale/nb/LC_MESSAGES/tuxpaint.mo +share/locale/ne/LC_MESSAGES/tuxpaint.mo share/locale/nl/LC_MESSAGES/tuxpaint.mo share/locale/nn/LC_MESSAGES/tuxpaint.mo share/locale/nr/LC_MESSAGES/tuxpaint.mo +share/locale/nso/LC_MESSAGES/tuxpaint.mo share/locale/oc/LC_MESSAGES/tuxpaint.mo share/locale/oj/LC_MESSAGES/tuxpaint.mo +share/locale/or/LC_MESSAGES/tuxpaint.mo +share/locale/pa/LC_MESSAGES/tuxpaint.mo share/locale/pl/LC_MESSAGES/tuxpaint.mo share/locale/pt/LC_MESSAGES/tuxpaint.mo share/locale/pt_BR/LC_MESSAGES/tuxpaint.mo share/locale/ro/LC_MESSAGES/tuxpaint.mo share/locale/ru/LC_MESSAGES/tuxpaint.mo share/locale/rw/LC_MESSAGES/tuxpaint.mo +share/locale/sa/LC_MESSAGES/tuxpaint.mo +share/locale/sat/LC_MESSAGES/tuxpaint.mo +share/locale/sat@olchiki/LC_MESSAGES/tuxpaint.mo share/locale/shs/LC_MESSAGES/tuxpaint.mo +share/locale/si/LC_MESSAGES/tuxpaint.mo share/locale/sk/LC_MESSAGES/tuxpaint.mo share/locale/sl/LC_MESSAGES/tuxpaint.mo share/locale/son/LC_MESSAGES/tuxpaint.mo share/locale/sq/LC_MESSAGES/tuxpaint.mo share/locale/sr/LC_MESSAGES/tuxpaint.mo +share/locale/sr@latin/LC_MESSAGES/tuxpaint.mo +share/locale/su/LC_MESSAGES/tuxpaint.mo share/locale/sv/LC_MESSAGES/tuxpaint.mo share/locale/sw/LC_MESSAGES/tuxpaint.mo share/locale/ta/LC_MESSAGES/tuxpaint.mo @@ -627,9 +691,10 @@ share/locale/th/LC_MESSAGES/tuxpaint.mo share/locale/tl/LC_MESSAGES/tuxpaint.mo share/locale/tlh/LC_MESSAGES/tuxpaint.mo share/locale/tr/LC_MESSAGES/tuxpaint.mo -share/locale/twi/LC_MESSAGES/tuxpaint.mo +share/locale/tw/LC_MESSAGES/tuxpaint.mo share/locale/uk/LC_MESSAGES/tuxpaint.mo share/locale/ve/LC_MESSAGES/tuxpaint.mo +share/locale/vec/LC_MESSAGES/tuxpaint.mo share/locale/vi/LC_MESSAGES/tuxpaint.mo share/locale/wa/LC_MESSAGES/tuxpaint.mo share/locale/wo/LC_MESSAGES/tuxpaint.mo @@ -637,6 +702,7 @@ share/locale/xh/LC_MESSAGES/tuxpaint.mo share/locale/zam/LC_MESSAGES/tuxpaint.mo share/locale/zh_CN/LC_MESSAGES/tuxpaint.mo share/locale/zh_TW/LC_MESSAGES/tuxpaint.mo +share/locale/zu/LC_MESSAGES/tuxpaint.mo share/pixmaps/tuxpaint.png share/tuxpaint/brushes/aa_round_03.png share/tuxpaint/brushes/aa_round_06.png @@ -660,8 +726,11 @@ share/tuxpaint/brushes/flower_5.png share/tuxpaint/brushes/flower_5_small.png share/tuxpaint/brushes/flower_6.png share/tuxpaint/brushes/flower_6_small.png +share/tuxpaint/brushes/flower_7.png share/tuxpaint/brushes/heart.png share/tuxpaint/brushes/hexagon.png +share/tuxpaint/brushes/inksplat.dat +share/tuxpaint/brushes/inksplat.png share/tuxpaint/brushes/kuroneko.dat share/tuxpaint/brushes/kuroneko.png share/tuxpaint/brushes/lines-angled.dat @@ -768,6 +837,7 @@ share/tuxpaint/images/icon96x96.png share/tuxpaint/images/magic/Snow_flake4.png share/tuxpaint/images/magic/Snow_flake5.png share/tuxpaint/images/magic/alien.png +share/tuxpaint/images/magic/blind.png share/tuxpaint/images/magic/blocks.png share/tuxpaint/images/magic/blur.png share/tuxpaint/images/magic/calligraphy.png @@ -792,17 +862,32 @@ share/tuxpaint/images/magic/flower_petals.png share/tuxpaint/images/magic/foam.png share/tuxpaint/images/magic/foam_data.png share/tuxpaint/images/magic/fold.png +share/tuxpaint/images/magic/fretwork.png +share/tuxpaint/images/magic/fretwork_corner.png +share/tuxpaint/images/magic/fretwork_four.png +share/tuxpaint/images/magic/fretwork_one.png +share/tuxpaint/images/magic/fretwork_three.png share/tuxpaint/images/magic/glasstile.png share/tuxpaint/images/magic/grass.png share/tuxpaint/images/magic/grass_data.png +share/tuxpaint/images/magic/halftone.png +share/tuxpaint/images/magic/kal_pattern.png +share/tuxpaint/images/magic/kal_tiles.png share/tuxpaint/images/magic/kalidescope.png share/tuxpaint/images/magic/largebrick.png share/tuxpaint/images/magic/light.png share/tuxpaint/images/magic/metalpaint.png share/tuxpaint/images/magic/mirror.png share/tuxpaint/images/magic/mosaic.png +share/tuxpaint/images/magic/mosaic_shaped_hex.png +share/tuxpaint/images/magic/mosaic_shaped_hex_pattern.png +share/tuxpaint/images/magic/mosaic_shaped_irregular.png +share/tuxpaint/images/magic/mosaic_shaped_irregular_pattern.png +share/tuxpaint/images/magic/mosaic_shaped_square.png +share/tuxpaint/images/magic/mosaic_shaped_square_pattern.png share/tuxpaint/images/magic/negative.png share/tuxpaint/images/magic/noise.png +share/tuxpaint/images/magic/perspective.png share/tuxpaint/images/magic/picasso.png share/tuxpaint/images/magic/puzzle.png share/tuxpaint/images/magic/rails.png @@ -813,6 +898,8 @@ share/tuxpaint/images/magic/rails_three.png share/tuxpaint/images/magic/rain.png share/tuxpaint/images/magic/rainbow.png share/tuxpaint/images/magic/realrainbow-colors.png +share/tuxpaint/images/magic/realrainbow-roygbiv-colors.png +share/tuxpaint/images/magic/realrainbow-roygbiv.png share/tuxpaint/images/magic/realrainbow.png share/tuxpaint/images/magic/ripples.png share/tuxpaint/images/magic/rosette.png @@ -826,6 +913,8 @@ share/tuxpaint/images/magic/snowflake.png share/tuxpaint/images/magic/string_art_angles.png share/tuxpaint/images/magic/string_art_full_by_offset.png share/tuxpaint/images/magic/string_art_triangles.png +share/tuxpaint/images/magic/symmetric_leftright.png +share/tuxpaint/images/magic/symmetric_updown.png share/tuxpaint/images/magic/thick.png share/tuxpaint/images/magic/thin.png share/tuxpaint/images/magic/tint.png @@ -836,6 +925,9 @@ share/tuxpaint/images/magic/tornado_cloud.png share/tuxpaint/images/magic/tv.png share/tuxpaint/images/magic/wavelet.png share/tuxpaint/images/magic/waves.png +share/tuxpaint/images/magic/wetpaint.png +share/tuxpaint/images/magic/xor.png +share/tuxpaint/images/magic/zoom.png share/tuxpaint/images/shapes/circle.png share/tuxpaint/images/shapes/circle_f.png share/tuxpaint/images/shapes/diamond.png @@ -859,6 +951,8 @@ share/tuxpaint/images/title-tuxpaint.svg share/tuxpaint/images/title.png share/tuxpaint/images/tools/brush.png share/tuxpaint/images/tools/eraser.png +share/tuxpaint/images/tools/label.png +share/tuxpaint/images/tools/label_select.png share/tuxpaint/images/tools/lines.png share/tuxpaint/images/tools/magic.png share/tuxpaint/images/tools/new.png @@ -887,8 +981,12 @@ share/tuxpaint/images/tuxpaint-installer.ico share/tuxpaint/images/ui/back.png share/tuxpaint/images/ui/bold.png share/tuxpaint/images/ui/btn_down.png +share/tuxpaint/images/ui/btn_nav.png share/tuxpaint/images/ui/btn_off.png share/tuxpaint/images/ui/btn_up.png +share/tuxpaint/images/ui/btnsm_down.png +share/tuxpaint/images/ui/btnsm_hold.png +share/tuxpaint/images/ui/btnsm_nav.png share/tuxpaint/images/ui/btnsm_off.png share/tuxpaint/images/ui/btnsm_up.png share/tuxpaint/images/ui/color_btn_down.png @@ -915,6 +1013,11 @@ share/tuxpaint/images/ui/no.png share/tuxpaint/images/ui/no_title.png share/tuxpaint/images/ui/no_title_large.png share/tuxpaint/images/ui/open.png +share/tuxpaint/images/ui/osk_capslock.png +share/tuxpaint/images/ui/osk_delete.png +share/tuxpaint/images/ui/osk_enter.png +share/tuxpaint/images/ui/osk_shift.png +share/tuxpaint/images/ui/osk_tab.png share/tuxpaint/images/ui/paintcan.png share/tuxpaint/images/ui/paintwell.png share/tuxpaint/images/ui/play.png @@ -936,6 +1039,13 @@ share/tuxpaint/images/ui/title.png share/tuxpaint/images/ui/title_large.png share/tuxpaint/images/ui/trash.png share/tuxpaint/images/ui/yes.png +share/tuxpaint/osk/abc.h_layout +share/tuxpaint/osk/default.layout +share/tuxpaint/osk/en_US.UTF-8_Compose +share/tuxpaint/osk/keysymdef.h +share/tuxpaint/osk/qwerty.h_layout +share/tuxpaint/osk/qwerty.layout +share/tuxpaint/osk/us-intl-altgr-dead-keys.keymap share/tuxpaint/sounds/areyousure.wav share/tuxpaint/sounds/bleep.wav share/tuxpaint/sounds/bubble.wav @@ -952,6 +1062,7 @@ share/tuxpaint/sounds/keyclick.wav share/tuxpaint/sounds/line_end.wav share/tuxpaint/sounds/line_start.wav share/tuxpaint/sounds/magic/alien.ogg +share/tuxpaint/sounds/magic/blind.ogg share/tuxpaint/sounds/magic/blocks.wav share/tuxpaint/sounds/magic/blur.wav share/tuxpaint/sounds/magic/brick.wav @@ -973,6 +1084,7 @@ share/tuxpaint/sounds/magic/flower_release.ogg share/tuxpaint/sounds/magic/foam.ogg share/tuxpaint/sounds/magic/fold.ogg share/tuxpaint/sounds/magic/fold.wav +share/tuxpaint/sounds/magic/fretwork.ogg share/tuxpaint/sounds/magic/glasstile.ogg share/tuxpaint/sounds/magic/grass.wav share/tuxpaint/sounds/magic/kaleidoscope.ogg @@ -981,8 +1093,12 @@ share/tuxpaint/sounds/magic/light2.ogg share/tuxpaint/sounds/magic/metalpaint.wav share/tuxpaint/sounds/magic/mirror.wav share/tuxpaint/sounds/magic/mosaic.ogg +share/tuxpaint/sounds/magic/mosaic_shaped_hex.ogg +share/tuxpaint/sounds/magic/mosaic_shaped_irregular.ogg +share/tuxpaint/sounds/magic/mosaic_shaped_square.ogg share/tuxpaint/sounds/magic/negative.wav share/tuxpaint/sounds/magic/noise.ogg +share/tuxpaint/sounds/magic/perspective.ogg share/tuxpaint/sounds/magic/picasso.ogg share/tuxpaint/sounds/magic/rails.wav share/tuxpaint/sounds/magic/rain.ogg @@ -1006,6 +1122,9 @@ share/tuxpaint/sounds/magic/tornado_release.ogg share/tuxpaint/sounds/magic/tv.ogg share/tuxpaint/sounds/magic/wavelet.ogg share/tuxpaint/sounds/magic/waves.ogg +share/tuxpaint/sounds/magic/xor.ogg +share/tuxpaint/sounds/magic/zoom_down.ogg +share/tuxpaint/sounds/magic/zoom_up.ogg share/tuxpaint/sounds/mirror.wav share/tuxpaint/sounds/paint1.wav share/tuxpaint/sounds/paint2.wav @@ -1036,30 +1155,53 @@ share/tuxpaint/stamps/cartoon/tux/tux-yes2.dat share/tuxpaint/stamps/cartoon/tux/tux-yes2.png share/tuxpaint/starters/Jigsaw_3x3.png share/tuxpaint/starters/Jigsaw_5x5.png +share/tuxpaint/starters/bald_eagle.svg +share/tuxpaint/starters/car2.svg share/tuxpaint/starters/carcassone.png share/tuxpaint/starters/chessboard-back.png share/tuxpaint/starters/chessboard.png share/tuxpaint/starters/chicken.png +share/tuxpaint/starters/desert_tortoise.svg +share/tuxpaint/starters/elephant.svg +share/tuxpaint/starters/fish_icon.svg +share/tuxpaint/starters/frame_filmstrip.png +share/tuxpaint/starters/frame_flowers.png +share/tuxpaint/starters/frame_gold.png +share/tuxpaint/starters/frame_heart.png +share/tuxpaint/starters/frame_hearts.svg +share/tuxpaint/starters/frame_neon.png +share/tuxpaint/starters/frame_picture.png +share/tuxpaint/starters/frame_screen.png +share/tuxpaint/starters/frame_silver.png +share/tuxpaint/starters/frame_television.png +share/tuxpaint/starters/gecko.svg share/tuxpaint/starters/grid_10x10.png share/tuxpaint/starters/grid_20x20.png +share/tuxpaint/starters/hat.png +share/tuxpaint/starters/hat.svg share/tuxpaint/starters/jetplane.png share/tuxpaint/starters/jigsaw.png share/tuxpaint/starters/jigsaw.svg +share/tuxpaint/starters/manatee.svg +share/tuxpaint/starters/mosaic.svg share/tuxpaint/starters/nagasaki.png share/tuxpaint/starters/nagasaki.svg +share/tuxpaint/starters/old_soviet_car.svg +share/tuxpaint/starters/pansy.png share/tuxpaint/starters/reef-back.png share/tuxpaint/starters/reef.png share/tuxpaint/starters/reef.txt share/tuxpaint/starters/rocket.png share/tuxpaint/starters/shipwreck.png -share/tuxpaint/starters/silver_frame.png +share/tuxpaint/starters/skull.svg share/tuxpaint/starters/skyline-sf-dusk-back.jpeg share/tuxpaint/starters/skyline-sf-dusk.png share/tuxpaint/starters/skyline-sf-dusk.txt -share/tuxpaint/starters/spirograph.png share/tuxpaint/starters/spirograph.svg +share/tuxpaint/starters/stained_glass.svg share/tuxpaint/starters/street.png share/tuxpaint/starters/tux_farmer.png +share/tuxpaint/starters/woodpecker.svg share/tuxpaint/starters/worldmap.png share/tuxpaint/starters/worldmap_africa.png share/tuxpaint/starters/worldmap_america_north.png @@ -1072,3 +1214,22 @@ share/tuxpaint/starters/worldmap_australasia.png share/tuxpaint/starters/worldmap_canada.png share/tuxpaint/starters/worldmap_europe.png share/tuxpaint/starters/worldmap_japan.png +share/tuxpaint/templates/burnt_bark.jpg +share/tuxpaint/templates/cliff.jpg +share/tuxpaint/templates/corn_maze.jpg +share/tuxpaint/templates/jellyfish.jpg +share/tuxpaint/templates/lighthouse.jpg +share/tuxpaint/templates/mossy_bark.jpg +share/tuxpaint/templates/mossy_log.jpg +share/tuxpaint/templates/mudstone.jpg +share/tuxpaint/templates/ocean_splash.jpg +share/tuxpaint/templates/ocean_waves.jpg +share/tuxpaint/templates/redwoods_above.jpg +share/tuxpaint/templates/rocks.jpg +share/tuxpaint/templates/sheep.jpg +share/tuxpaint/templates/spiders_web.jpg +share/tuxpaint/templates/sun_behind_clouds.jpg +share/tuxpaint/templates/sun_behind_leaves.jpg +share/tuxpaint/templates/trees_above.jpg +share/tuxpaint/templates/trees_at_dusk.jpg +share/tuxpaint/templates/wool_mill_machine.jpg diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo index cbd57c38845..241e2322f2f 100644 --- a/graphics/tuxpaint/distinfo +++ b/graphics/tuxpaint/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.23 2014/08/17 09:42:27 wiz Exp $ +$NetBSD: distinfo,v 1.24 2014/08/23 21:12:02 wiz Exp $ -SHA1 (tuxpaint-0.9.21.tar.gz) = 082a179a3cb44ee17af47421bc92125a890846e4 -RMD160 (tuxpaint-0.9.21.tar.gz) = 0c6892341c2e6c3abad7cf28caefdb2f8dc6d74d -Size (tuxpaint-0.9.21.tar.gz) = 9543034 bytes -SHA1 (patch-aa) = 004a8d7d89895da31cb7df6efd03eecaf9414f6f -SHA1 (patch-ab) = 508052e3b1fdbc3b4d46a4f0d0eb3057bbe2dc0b +SHA1 (tuxpaint-0.9.22.tar.gz) = 62ab3069f5a8e81edb83912fe3d9906c1e9b138f +RMD160 (tuxpaint-0.9.22.tar.gz) = 4a122b87f01babb988c250f51d006a5dd59bf1de +Size (tuxpaint-0.9.22.tar.gz) = 13301628 bytes diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa deleted file mode 100644 index ed0070ec4d0..00000000000 --- a/graphics/tuxpaint/patches/patch-aa +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-aa,v 1.14 2014/08/17 09:42:27 wiz Exp $ - ---- Makefile.orig 2009-04-29 05:18:57.000000000 +0000 -+++ Makefile -@@ -81,7 +84,7 @@ windows_ARCH_LINKS:=-lintl $(PNG) -lwins - osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) - beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)" - linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) --ARCH_LINKS:=$($(OS)_ARCH_LINKS) -+ARCH_LINKS:=$($(OS)_ARCH_LINKS) $(LIBS) - - windows_ARCH_HEADERS:=src/win32_print.h - osx_ARCH_HEADERS:= -@@ -301,9 +304,12 @@ nokia770: - POFILES:=$(wildcard src/po/*.po) - MOFILES:=$(patsubst src/po/%.po,trans/%.mo,$(POFILES)) - INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo,$(MOFILES)) -+INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES)) - -+$(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo -+ install -d -m 755 $@ - $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo -- install -D -m 644 $< $@ -+ install -m 644 $< $@ - - .PHONY: uninstall-i18n - uninstall-i18n: -@@ -331,7 +337,8 @@ install-gettext: - @echo "You will not be able to run Tux Paint in non-U.S. English modes." - @echo "--------------------------------------------------------------" - else --install-gettext: $(INSTALLED_MOFILES) -+install-gettextdirs: $(INSTALLED_MODIRS) -+install-gettext: install-gettextdirs $(INSTALLED_MOFILES) - endif - - -@@ -556,9 +563,8 @@ uninstall: uninstall-i18n - install-default-config: - @echo - @echo "...Installing default config file..." -- @install -d $(CONFDIR) -- @cp src/tuxpaint.conf $(CONFDIR) -- @chmod 644 $(CONFDIR)/tuxpaint.conf -+ @$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/share/examples/tuxpaint -+ @$(BSD_INSTALL_DATA) src/tuxpaint.conf ${DESTDIR}$(PREFIX)/share/examples/tuxpaint - - - # Install example stamps -@@ -575,11 +581,13 @@ STARTERS:=$(wildcard starters/*.*) - INSTALLED_STARTERS:=$(patsubst %,$(DATA_PREFIX)/%,$(STARTERS)) - - $(INSTALLED_STARTERS): $(DATA_PREFIX)/%: % -- install -D -m 644 $< $@ -+ install -m 644 $< $@ - - # Install example starters - .PHONY: install-example-starters --install-example-starters: $(INSTALLED_STARTERS) -+install-example-starters-dirs: -+ install -d -m 755 $(DATA_PREFIX)/starters -+install-example-starters: install-example-starters-dirs $(INSTALLED_STARTERS) - - - # Install a launcher icon in the Gnome menu -@@ -832,7 +840,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/ - $(ARCH_LIBS) - @echo - @echo "...Linking Tux Paint..." -- $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ -+ $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(LDFLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ - -o tuxpaint $^ \ - $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) - @$(RSRC_CMD) diff --git a/graphics/tuxpaint/patches/patch-ab b/graphics/tuxpaint/patches/patch-ab deleted file mode 100644 index c9166c34a32..00000000000 --- a/graphics/tuxpaint/patches/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2014/08/17 09:42:27 wiz Exp $ - -Fix build with png-1.5. - ---- src/tuxpaint.c.orig 2009-06-18 20:51:58.000000000 +0000 -+++ src/tuxpaint.c -@@ -12898,12 +12898,7 @@ static int do_png_save(FILE * fi, const - { - png_init_io(png_ptr, fi); - -- info_ptr->width = surf->w; -- info_ptr->height = surf->h; -- info_ptr->bit_depth = 8; -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -- info_ptr->interlace_type = 1; -- info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */ -+ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, - PNG_sRGB_INTENT_PERCEPTUAL); |