From 9b679729ff0a48fcc1180c297177540169f5e91b Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 4 Sep 2007 21:11:57 +0000 Subject: update to 0.9.17 changes: Scalable Vector Graphic (SVG) stamps, Japanese and Korean text entry, improved printing and monitor support, and stamp categories are just a few of the many improvements. --- graphics/tuxpaint/Makefile | 11 +- graphics/tuxpaint/PLIST | 295 +++++++++++++++++++++++++++++++++++-- graphics/tuxpaint/distinfo | 14 +- graphics/tuxpaint/patches/patch-aa | 74 ++++++---- graphics/tuxpaint/patches/patch-ab | 43 +++--- graphics/tuxpaint/patches/patch-ac | 14 -- graphics/tuxpaint/patches/patch-ad | 12 ++ 7 files changed, 372 insertions(+), 91 deletions(-) delete mode 100644 graphics/tuxpaint/patches/patch-ac create mode 100644 graphics/tuxpaint/patches/patch-ad diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile index 14bd8fb25ba..77089d7604b 100644 --- a/graphics/tuxpaint/Makefile +++ b/graphics/tuxpaint/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.43 2007/02/22 19:01:19 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2007/09/04 21:11:57 drochner Exp $ # -DISTNAME= tuxpaint-0.9.14 -PKGREVISION= 9 +DISTNAME= tuxpaint-0.9.17 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxpaint/} \ ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/source/ @@ -23,6 +22,7 @@ CONFLICTS+= tuxpaint-stamps<2003.12.23 BROKEN_GETTEXT_DETECTION= yes +PKG_SYSCONFSUBDIR= tuxpaint MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR:Q} CP=${CP:Q} CHMOD=${CHMOD:Q} EGDIR= ${PREFIX}/share/examples/tuxpaint CONF_FILES= ${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf @@ -35,7 +35,6 @@ LIBS+= -lpng post-install: -${FIND} ${PREFIX}/share/doc/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null - -${RMDIR} ${PREFIX}/share/doc/tuxpaint/cz -${FIND} ${PREFIX}/share/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null .include "../../audio/SDL_mixer/buildlink3.mk" @@ -45,5 +44,7 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" - +.include "../../graphics/librsvg2/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" +.include "../../print/libpaper/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tuxpaint/PLIST b/graphics/tuxpaint/PLIST index e0e8cd5fb35..f35683416c5 100644 --- a/graphics/tuxpaint/PLIST +++ b/graphics/tuxpaint/PLIST @@ -1,18 +1,21 @@ -@comment $NetBSD: PLIST,v 1.11 2006/04/17 07:07:22 jlam Exp $ +@comment $NetBSD: PLIST,v 1.12 2007/09/04 21:11:57 drochner Exp $ bin/tuxpaint bin/tuxpaint-import man/man1/tuxpaint-import.1 man/man1/tuxpaint.1 man/pl/man1/tuxpaint.1 +share/doc/tuxpaint/ADVANCED-STAMPS-HOWTO.txt share/doc/tuxpaint/AUTHORS.txt share/doc/tuxpaint/CHANGES.txt share/doc/tuxpaint/COPYING.txt +share/doc/tuxpaint/EXTENDING.txt share/doc/tuxpaint/FAQ.txt share/doc/tuxpaint/INSTALL.txt +share/doc/tuxpaint/Makefile share/doc/tuxpaint/OPTIONS.txt share/doc/tuxpaint/PNG.txt share/doc/tuxpaint/README.txt -share/doc/tuxpaint/TODO.txt +share/doc/tuxpaint/SVG.txt share/doc/tuxpaint/af/AUTHORS.txt share/doc/tuxpaint/af/COPYING.txt share/doc/tuxpaint/af/FAQ.txt @@ -77,6 +80,8 @@ share/doc/tuxpaint/de/GELESEN_MIR.txt share/doc/tuxpaint/de/KOPIE.txt share/doc/tuxpaint/de/OPTIONS.txt share/doc/tuxpaint/de/PNG.txt +share/doc/tuxpaint/default_colors.txt +share/doc/tuxpaint/dejavu.txt share/doc/tuxpaint/el/AUTHORS.txt share/doc/tuxpaint/el/COPYING.txt share/doc/tuxpaint/el/FAQ.txt @@ -90,9 +95,11 @@ share/doc/tuxpaint/es/COPIADO.txt share/doc/tuxpaint/es/FAQ.txt share/doc/tuxpaint/es/INSTALACION.txt share/doc/tuxpaint/es/LEEME.txt +share/doc/tuxpaint/es/OPCIONES.txt share/doc/tuxpaint/es/OPTIONS.txt share/doc/tuxpaint/es/PNG.txt share/doc/tuxpaint/es/html/LEEME.html +share/doc/tuxpaint/es/html/OPCIONES.html share/doc/tuxpaint/eu/AUTHORS.txt share/doc/tuxpaint/eu/COPYING.txt share/doc/tuxpaint/eu/FAQ.txt @@ -110,9 +117,69 @@ share/doc/tuxpaint/fr/AUTHORS.txt share/doc/tuxpaint/fr/COPIER.txt share/doc/tuxpaint/fr/FAQ.txt share/doc/tuxpaint/fr/INSTALL.txt +share/doc/tuxpaint/fr/Makefile share/doc/tuxpaint/fr/OPTIONS.txt share/doc/tuxpaint/fr/PNG.txt -share/doc/tuxpaint/fr/README.txt +share/doc/tuxpaint/fr/README1.txt +share/doc/tuxpaint/fr/README2.txt +share/doc/tuxpaint/fr/html/FAQ.html +share/doc/tuxpaint/fr/html/OPTIONS.html +share/doc/tuxpaint/fr/html/PNG.html +share/doc/tuxpaint/fr/html/README1.html +share/doc/tuxpaint/fr/html/README2.html +share/doc/tuxpaint/fr/html/images/captures/controles_tampon_ds_selecteur.jpg +share/doc/tuxpaint/fr/html/images/captures/fenetre_de_demarrage.jpg +share/doc/tuxpaint/fr/html/images/captures/forme-rotation.jpg +share/doc/tuxpaint/fr/html/images/captures/forme_choix_taille.jpg +share/doc/tuxpaint/fr/html/images/captures/lettre2.jpg +share/doc/tuxpaint/fr/html/images/captures/ligne.jpg +share/doc/tuxpaint/fr/html/images/captures/magic1.jpg +share/doc/tuxpaint/fr/html/images/captures/magic2.jpg +share/doc/tuxpaint/fr/html/images/captures/outil_dessin.jpg +share/doc/tuxpaint/fr/html/images/captures/outil_tampon.jpg +share/doc/tuxpaint/fr/html/images/captures/ouvrir.jpg +share/doc/tuxpaint/fr/html/images/captures/texte1.jpg +share/doc/tuxpaint/fr/html/images/tete_de_chien.png +share/doc/tuxpaint/gl/PNG.txt +share/doc/tuxpaint/gl/README.txt +share/doc/tuxpaint/gl/html/README.html +share/doc/tuxpaint/gl/html/images/brush_edit.png +share/doc/tuxpaint/gl/html/images/canvas.jpg +share/doc/tuxpaint/gl/html/images/colors.jpg +share/doc/tuxpaint/gl/html/images/ex_colorable.png +share/doc/tuxpaint/gl/html/images/ex_lines.png +share/doc/tuxpaint/gl/html/images/ex_paint.png +share/doc/tuxpaint/gl/html/images/ex_shapes.png +share/doc/tuxpaint/gl/html/images/ex_stamps.png +share/doc/tuxpaint/gl/html/images/ex_text.png +share/doc/tuxpaint/gl/html/images/ex_tintable.png +share/doc/tuxpaint/gl/html/images/fontsizes.png +share/doc/tuxpaint/gl/html/images/icon-win32.png +share/doc/tuxpaint/gl/html/images/open_back.png +share/doc/tuxpaint/gl/html/images/open_dialog.jpg +share/doc/tuxpaint/gl/html/images/open_erase.png +share/doc/tuxpaint/gl/html/images/open_open.png +share/doc/tuxpaint/gl/html/images/saveover.png +share/doc/tuxpaint/gl/html/images/selector.jpg +share/doc/tuxpaint/gl/html/images/stamp_edit.png +share/doc/tuxpaint/gl/html/images/tips.jpg +share/doc/tuxpaint/gl/html/images/tool_eraser.png +share/doc/tuxpaint/gl/html/images/tool_lines.png +share/doc/tuxpaint/gl/html/images/tool_magic.png +share/doc/tuxpaint/gl/html/images/tool_new.png +share/doc/tuxpaint/gl/html/images/tool_open.png +share/doc/tuxpaint/gl/html/images/tool_paint.png +share/doc/tuxpaint/gl/html/images/tool_print.png +share/doc/tuxpaint/gl/html/images/tool_quit.png +share/doc/tuxpaint/gl/html/images/tool_redo.png +share/doc/tuxpaint/gl/html/images/tool_save.png +share/doc/tuxpaint/gl/html/images/tool_shapes.png +share/doc/tuxpaint/gl/html/images/tool_stamp.png +share/doc/tuxpaint/gl/html/images/tool_text.png +share/doc/tuxpaint/gl/html/images/tool_undo.png +share/doc/tuxpaint/gl/html/images/tools.jpg +share/doc/tuxpaint/gl/html/images/tuxpaint-title.jpg +share/doc/tuxpaint/gl/html/images/tuxpaint-title.png share/doc/tuxpaint/he/AUTHORS.txt share/doc/tuxpaint/he/COPYING.html share/doc/tuxpaint/he/FAQ.txt @@ -134,6 +201,9 @@ share/doc/tuxpaint/hr/INSTALL.txt share/doc/tuxpaint/hr/OPTIONS.txt share/doc/tuxpaint/hr/PNG.txt share/doc/tuxpaint/hr/README.txt +share/doc/tuxpaint/html/ADVANCED-STAMPS-HOWTO.html +share/doc/tuxpaint/html/EXTENDING.html +share/doc/tuxpaint/html/FAQ.html share/doc/tuxpaint/html/OPTIONS.html share/doc/tuxpaint/html/README.html share/doc/tuxpaint/html/images/brush_edit.png @@ -152,6 +222,7 @@ share/doc/tuxpaint/html/images/open_back.png share/doc/tuxpaint/html/images/open_dialog.jpg share/doc/tuxpaint/html/images/open_erase.png share/doc/tuxpaint/html/images/open_open.png +share/doc/tuxpaint/html/images/open_slides.png share/doc/tuxpaint/html/images/saveover.png share/doc/tuxpaint/html/images/selector.jpg share/doc/tuxpaint/html/images/stamp_edit.png @@ -166,8 +237,11 @@ share/doc/tuxpaint/html/images/tool_print.png share/doc/tuxpaint/html/images/tool_quit.png share/doc/tuxpaint/html/images/tool_redo.png share/doc/tuxpaint/html/images/tool_save.png +share/doc/tuxpaint/html/images/tool_sfx.png share/doc/tuxpaint/html/images/tool_shapes.png share/doc/tuxpaint/html/images/tool_stamp.png +share/doc/tuxpaint/html/images/tool_stamp_categories.png +share/doc/tuxpaint/html/images/tool_stamp_controls.png share/doc/tuxpaint/html/images/tool_text.png share/doc/tuxpaint/html/images/tool_undo.png share/doc/tuxpaint/html/images/tools.jpg @@ -266,6 +340,11 @@ share/doc/tuxpaint/ro/OPTIONS.txt share/doc/tuxpaint/ro/PNG.txt share/doc/tuxpaint/ro/README.txt share/doc/tuxpaint/ru/COPYING.txt +share/doc/tuxpaint/ru/Makefile +share/doc/tuxpaint/ru/OPTIONS.txt +share/doc/tuxpaint/ru/README.txt +share/doc/tuxpaint/ru/html/OPTIONS.html +share/doc/tuxpaint/ru/html/README.html share/doc/tuxpaint/sk/COPYING.txt share/doc/tuxpaint/sr/AUTHORS.txt share/doc/tuxpaint/sr/FAQ.txt @@ -299,11 +378,14 @@ share/doc/tuxpaint/zh_tw/INSTALL.txt share/doc/tuxpaint/zh_tw/OPTIONS.txt share/doc/tuxpaint/zh_tw/PNG.txt share/doc/tuxpaint/zh_tw/README.txt +share/doc/tuxpaint/zh_tw/html/OPTIONS.html share/doc/tuxpaint/zh_tw/html/README.html share/examples/tuxpaint/tuxpaint.conf share/locale/af/LC_MESSAGES/tuxpaint.mo +share/locale/ar/LC_MESSAGES/tuxpaint.mo share/locale/be/LC_MESSAGES/tuxpaint.mo share/locale/bg/LC_MESSAGES/tuxpaint.mo +share/locale/bo/LC_MESSAGES/tuxpaint.mo share/locale/br/LC_MESSAGES/tuxpaint.mo share/locale/ca/LC_MESSAGES/tuxpaint.mo share/locale/cs/LC_MESSAGES/tuxpaint.mo @@ -312,10 +394,19 @@ share/locale/da/LC_MESSAGES/tuxpaint.mo share/locale/de/LC_MESSAGES/tuxpaint.mo share/locale/el/LC_MESSAGES/tuxpaint.mo share/locale/en_GB/LC_MESSAGES/tuxpaint.mo +share/locale/en_ZA/LC_MESSAGES/tuxpaint.mo 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/fi/LC_MESSAGES/tuxpaint.mo +share/locale/fo/LC_MESSAGES/tuxpaint.mo share/locale/fr/LC_MESSAGES/tuxpaint.mo +share/locale/ga/LC_MESSAGES/tuxpaint.mo +share/locale/gd/LC_MESSAGES/tuxpaint.mo +share/locale/gl/LC_MESSAGES/tuxpaint.mo +share/locale/gos/LC_MESSAGES/tuxpaint.mo +share/locale/gu/LC_MESSAGES/tuxpaint.mo share/locale/he/LC_MESSAGES/tuxpaint.mo share/locale/hi/LC_MESSAGES/tuxpaint.mo share/locale/hr/LC_MESSAGES/tuxpaint.mo @@ -324,43 +415,84 @@ share/locale/id/LC_MESSAGES/tuxpaint.mo share/locale/is/LC_MESSAGES/tuxpaint.mo share/locale/it/LC_MESSAGES/tuxpaint.mo share/locale/ja/LC_MESSAGES/tuxpaint.mo +share/locale/ka/LC_MESSAGES/tuxpaint.mo share/locale/ko/LC_MESSAGES/tuxpaint.mo +share/locale/ku/LC_MESSAGES/tuxpaint.mo share/locale/lt/LC_MESSAGES/tuxpaint.mo +share/locale/lv/LC_MESSAGES/tuxpaint.mo share/locale/ms/LC_MESSAGES/tuxpaint.mo share/locale/nb/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/pl/LC_MESSAGES/tuxpaint.mo share/locale/pt_BR/LC_MESSAGES/tuxpaint.mo share/locale/pt_PT/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/sk/LC_MESSAGES/tuxpaint.mo share/locale/sl/LC_MESSAGES/tuxpaint.mo +share/locale/sq/LC_MESSAGES/tuxpaint.mo share/locale/sr/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 +share/locale/te/LC_MESSAGES/tuxpaint.mo +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/uk/LC_MESSAGES/tuxpaint.mo +share/locale/ve/LC_MESSAGES/tuxpaint.mo share/locale/vi/LC_MESSAGES/tuxpaint.mo share/locale/wa/LC_MESSAGES/tuxpaint.mo +share/locale/xh/LC_MESSAGES/tuxpaint.mo share/locale/zh_CN/LC_MESSAGES/tuxpaint.mo share/locale/zh_TW/LC_MESSAGES/tuxpaint.mo -share/tuxpaint/brushes/round_03.png -share/tuxpaint/brushes/round_06.png -share/tuxpaint/brushes/round_12.png -share/tuxpaint/brushes/round_24.png -share/tuxpaint/brushes/round_36.png -share/tuxpaint/brushes/round_fuzz.png -share/tuxpaint/brushes/round_seethru.png -share/tuxpaint/brushes/round_seethru_05.png -share/tuxpaint/brushes/round_seethru_10.png +share/tuxpaint/brushes/aa_round_03.png +share/tuxpaint/brushes/aa_round_06.png +share/tuxpaint/brushes/aa_round_12.png +share/tuxpaint/brushes/aa_round_24.png +share/tuxpaint/brushes/aa_round_36.png +share/tuxpaint/brushes/aa_round_fuzz.png +share/tuxpaint/brushes/aa_round_seethru.png +share/tuxpaint/brushes/aa_round_seethru_05.png +share/tuxpaint/brushes/aa_round_seethru_10.png +share/tuxpaint/brushes/arrow_compass_points.dat +share/tuxpaint/brushes/arrow_compass_points.png +share/tuxpaint/brushes/arrow_triangles.dat +share/tuxpaint/brushes/arrow_triangles.png +share/tuxpaint/brushes/blob.png +share/tuxpaint/brushes/chisle.png +share/tuxpaint/brushes/cutout_square_diamond.png +share/tuxpaint/brushes/cutout_star_circle.png +share/tuxpaint/brushes/diamond.png +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/heart.png +share/tuxpaint/brushes/hexagon.png +share/tuxpaint/brushes/kuroneko.dat +share/tuxpaint/brushes/kuroneko.png +share/tuxpaint/brushes/lines-angled.dat +share/tuxpaint/brushes/lines-angled.png +share/tuxpaint/brushes/lozenge.png +share/tuxpaint/brushes/oval.png +share/tuxpaint/brushes/pentagon.png share/tuxpaint/brushes/slash_10_lt.png share/tuxpaint/brushes/slash_10_rt.png share/tuxpaint/brushes/slash_16_lt.png share/tuxpaint/brushes/slash_16_rt.png share/tuxpaint/brushes/slash_20_lt.png share/tuxpaint/brushes/slash_20_rt.png +share/tuxpaint/brushes/sphere.png +share/tuxpaint/brushes/spiral.dat +share/tuxpaint/brushes/spiral.png +share/tuxpaint/brushes/splat.png +share/tuxpaint/brushes/spray.dat share/tuxpaint/brushes/spray.png share/tuxpaint/brushes/square_06.png share/tuxpaint/brushes/square_12.png @@ -368,7 +500,14 @@ share/tuxpaint/brushes/square_24.png share/tuxpaint/brushes/square_36.png share/tuxpaint/brushes/square_fuzz.png share/tuxpaint/brushes/square_seethru.png +share/tuxpaint/brushes/squirrel.dat +share/tuxpaint/brushes/squirrel.png +share/tuxpaint/brushes/star.png share/tuxpaint/brushes/tiny.png +share/tuxpaint/brushes/triangle_down.png +share/tuxpaint/brushes/triangle_up.png +share/tuxpaint/brushes/vine.dat +share/tuxpaint/brushes/vine.png share/tuxpaint/brushes/x.png share/tuxpaint/fonts/FreeMono.ttf share/tuxpaint/fonts/FreeMonoBold.ttf @@ -383,6 +522,49 @@ share/tuxpaint/fonts/FreeSerifBold.ttf share/tuxpaint/fonts/FreeSerifBoldItalic.ttf share/tuxpaint/fonts/FreeSerifItalic.ttf share/tuxpaint/fonts/default_font.ttf +share/tuxpaint/fonts/locale/ar.ttf +share/tuxpaint/fonts/locale/ar_docs/COPYING.txt +share/tuxpaint/fonts/locale/ar_docs/README.txt +share/tuxpaint/fonts/locale/bo.ttf +share/tuxpaint/fonts/locale/bo_docs/COPYING.txt +share/tuxpaint/fonts/locale/bo_docs/README.txt +share/tuxpaint/fonts/locale/el.ttf +share/tuxpaint/fonts/locale/el_docs/COPYING.txt +share/tuxpaint/fonts/locale/el_docs/README.txt +share/tuxpaint/fonts/locale/gu.ttf +share/tuxpaint/fonts/locale/gu_docs/COPYING.txt +share/tuxpaint/fonts/locale/gu_docs/README.txt +share/tuxpaint/fonts/locale/he.ttf +share/tuxpaint/fonts/locale/he_docs/COPYING.txt +share/tuxpaint/fonts/locale/he_docs/README.txt +share/tuxpaint/fonts/locale/hi.ttf +share/tuxpaint/fonts/locale/hi_docs/COPYING.txt +share/tuxpaint/fonts/locale/hi_docs/README.txt +share/tuxpaint/fonts/locale/ja.ttf +share/tuxpaint/fonts/locale/ja_docs/COPYING.txt +share/tuxpaint/fonts/locale/ja_docs/README.txt +share/tuxpaint/fonts/locale/ka.ttf +share/tuxpaint/fonts/locale/ka_docs/COPYING.txt +share/tuxpaint/fonts/locale/ka_docs/README.txt +share/tuxpaint/fonts/locale/ta.ttf +share/tuxpaint/fonts/locale/ta_docs/COPYING.txt +share/tuxpaint/fonts/locale/ta_docs/README.txt +share/tuxpaint/fonts/locale/te.ttf +share/tuxpaint/fonts/locale/te_docs/COPYING.txt +share/tuxpaint/fonts/locale/te_docs/README.txt +share/tuxpaint/fonts/locale/th.ttf +share/tuxpaint/fonts/locale/th_docs/COPYING.txt +share/tuxpaint/fonts/locale/th_docs/README.txt +share/tuxpaint/fonts/locale/vi.ttf +share/tuxpaint/fonts/locale/vi_docs/COPYING.txt +share/tuxpaint/fonts/locale/vi_docs/README.txt +share/tuxpaint/fonts/locale/zh_tw.ttf +share/tuxpaint/fonts/locale/zh_tw_docs/COPYING.txt +share/tuxpaint/fonts/locale/zh_tw_docs/README.txt +share/tuxpaint/fonts/locale/zh_tw_docs/maketuxfont.py +share/tuxpaint/fonts/locale/zh_tw_docs/tuxpaintsubset.pe +share/tuxpaint/im/ja.im +share/tuxpaint/im/ko.im share/tuxpaint/images/icon-win32.ico share/tuxpaint/images/icon.png share/tuxpaint/images/icon128x128.png @@ -396,17 +578,24 @@ share/tuxpaint/images/icon64x64.png share/tuxpaint/images/icon96x96.png share/tuxpaint/images/magic/blocks.png share/tuxpaint/images/magic/blur.png +share/tuxpaint/images/magic/cartoon.png share/tuxpaint/images/magic/chalk.png +share/tuxpaint/images/magic/darken.png share/tuxpaint/images/magic/drip.png share/tuxpaint/images/magic/fade.png share/tuxpaint/images/magic/fill.png share/tuxpaint/images/magic/flip.png +share/tuxpaint/images/magic/grass.png +share/tuxpaint/images/magic/largebrick.png share/tuxpaint/images/magic/mirror.png share/tuxpaint/images/magic/negative.png share/tuxpaint/images/magic/rainbow.png +share/tuxpaint/images/magic/smallbrick.png +share/tuxpaint/images/magic/smudge.png share/tuxpaint/images/magic/sparkles.png share/tuxpaint/images/magic/thick.png share/tuxpaint/images/magic/thin.png +share/tuxpaint/images/magic/tint.png share/tuxpaint/images/shapes/circle.png share/tuxpaint/images/shapes/circle_f.png share/tuxpaint/images/shapes/diamond.png @@ -421,6 +610,8 @@ share/tuxpaint/images/shapes/square.png share/tuxpaint/images/shapes/square_f.png share/tuxpaint/images/shapes/triangle.png share/tuxpaint/images/shapes/triangle_f.png +share/tuxpaint/images/title-credits.png +share/tuxpaint/images/title-tuxpaint.png share/tuxpaint/images/title.png share/tuxpaint/images/tools/brush.png share/tuxpaint/images/tools/eraser.png @@ -432,7 +623,9 @@ share/tuxpaint/images/tools/print.png share/tuxpaint/images/tools/quit.png share/tuxpaint/images/tools/redo.png share/tuxpaint/images/tools/save.png +share/tuxpaint/images/tools/sfx.png share/tuxpaint/images/tools/shapes.png +share/tuxpaint/images/tools/speak.png share/tuxpaint/images/tools/stamp.png share/tuxpaint/images/tools/text.png share/tuxpaint/images/tools/undo.png @@ -444,11 +637,16 @@ share/tuxpaint/images/tux/oops.png share/tuxpaint/images/tux/wait.png share/tuxpaint/images/tuxpaint-icon.svg share/tuxpaint/images/tuxpaint-installer-icon-32x32.png +share/tuxpaint/images/tuxpaint-installer-icon-48x48.png +share/tuxpaint/images/tuxpaint-installer-icon-64x64.png 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_off.png share/tuxpaint/images/ui/btn_up.png +share/tuxpaint/images/ui/btnsm_off.png +share/tuxpaint/images/ui/btnsm_up.png share/tuxpaint/images/ui/color_btn_down.png share/tuxpaint/images/ui/color_btn_up.png share/tuxpaint/images/ui/cursor_down.png @@ -457,38 +655,61 @@ share/tuxpaint/images/ui/cursor_starter_down.png share/tuxpaint/images/ui/cursor_starter_up.png share/tuxpaint/images/ui/cursor_up.png share/tuxpaint/images/ui/cursor_up_large.png +share/tuxpaint/images/ui/dead40x40.png share/tuxpaint/images/ui/erase.png +share/tuxpaint/images/ui/grass.png share/tuxpaint/images/ui/grow.png +share/tuxpaint/images/ui/italic.png +share/tuxpaint/images/ui/mouse.png +share/tuxpaint/images/ui/mouse_click.png +share/tuxpaint/images/ui/next.png 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/paintcan.png +share/tuxpaint/images/ui/paintwell.png +share/tuxpaint/images/ui/play.png +share/tuxpaint/images/ui/popup_arrow.png +share/tuxpaint/images/ui/prev.png +share/tuxpaint/images/ui/printer.png +share/tuxpaint/images/ui/printer_wait.png share/tuxpaint/images/ui/progress.png +share/tuxpaint/images/ui/save_over.png share/tuxpaint/images/ui/scroll_down.png share/tuxpaint/images/ui/scroll_down_off.png share/tuxpaint/images/ui/scroll_up.png share/tuxpaint/images/ui/scroll_up_off.png +share/tuxpaint/images/ui/select_digits.png share/tuxpaint/images/ui/shrink.png +share/tuxpaint/images/ui/slideshow.png share/tuxpaint/images/ui/sparkles-old.png share/tuxpaint/images/ui/sparkles.png 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/sounds/areyousure.wav share/tuxpaint/sounds/bleep.wav share/tuxpaint/sounds/blocks.wav share/tuxpaint/sounds/blur.wav +share/tuxpaint/sounds/brick.wav share/tuxpaint/sounds/bubble.wav +share/tuxpaint/sounds/cartoon.wav share/tuxpaint/sounds/chalk.wav share/tuxpaint/sounds/click.wav +share/tuxpaint/sounds/darken.wav share/tuxpaint/sounds/drip.wav share/tuxpaint/sounds/eraser1.wav share/tuxpaint/sounds/eraser2.wav share/tuxpaint/sounds/fade.wav share/tuxpaint/sounds/flip.wav share/tuxpaint/sounds/giggle.wav +share/tuxpaint/sounds/grass.wav share/tuxpaint/sounds/grow.wav share/tuxpaint/sounds/harp.wav +share/tuxpaint/sounds/italic_off.wav +share/tuxpaint/sounds/italic_on.wav share/tuxpaint/sounds/keyclick.wav share/tuxpaint/sounds/line_end.wav share/tuxpaint/sounds/line_start.wav @@ -504,11 +725,16 @@ share/tuxpaint/sounds/return.wav share/tuxpaint/sounds/save.wav share/tuxpaint/sounds/scroll.wav share/tuxpaint/sounds/shrink.wav +share/tuxpaint/sounds/smudge.wav share/tuxpaint/sounds/sparkles1.wav share/tuxpaint/sounds/sparkles2.wav share/tuxpaint/sounds/stamp.wav share/tuxpaint/sounds/thick.wav share/tuxpaint/sounds/thin.wav +share/tuxpaint/sounds/tint.wav +share/tuxpaint/sounds/tuxok.wav +share/tuxpaint/sounds/typewriterbell.wav +share/tuxpaint/sounds/youcannot.wav share/tuxpaint/stamps/cartoon/tux/tux-drat.dat share/tuxpaint/stamps/cartoon/tux/tux-drat.png share/tuxpaint/stamps/cartoon/tux/tux-kiss1.dat @@ -521,14 +747,35 @@ share/tuxpaint/stamps/cartoon/tux/tux-yes1.dat share/tuxpaint/stamps/cartoon/tux/tux-yes1.png share/tuxpaint/stamps/cartoon/tux/tux-yes2.dat share/tuxpaint/stamps/cartoon/tux/tux-yes2.png +share/tuxpaint/starters/carcassone.png +share/tuxpaint/starters/chessboard-back.png +share/tuxpaint/starters/chessboard.png share/tuxpaint/starters/chicken.png +share/tuxpaint/starters/grid_10x10.png +share/tuxpaint/starters/grid_20x20.png share/tuxpaint/starters/jetplane.png +share/tuxpaint/starters/nagasaki.png +share/tuxpaint/starters/nagasaki.svg 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/skyline-sf-dusk-back.jpeg share/tuxpaint/starters/skyline-sf-dusk.png share/tuxpaint/starters/skyline-sf-dusk.txt +share/tuxpaint/starters/street.png +share/tuxpaint/starters/tux_farmer.png +share/tuxpaint/starters/worldmap.png +share/tuxpaint/starters/worldmap_africa.png +share/tuxpaint/starters/worldmap_america_north.png +share/tuxpaint/starters/worldmap_america_north_usa-back.png +share/tuxpaint/starters/worldmap_america_north_usa.png +share/tuxpaint/starters/worldmap_america_south.png +share/tuxpaint/starters/worldmap_asia_north.png +share/tuxpaint/starters/worldmap_asia_south.png +share/tuxpaint/starters/worldmap_australasia.png +share/tuxpaint/starters/worldmap_europe.png @dirrm share/tuxpaint/starters @dirrm share/tuxpaint/stamps/cartoon/tux @dirrm share/tuxpaint/stamps/cartoon @@ -540,6 +787,21 @@ share/tuxpaint/starters/skyline-sf-dusk.txt @dirrm share/tuxpaint/images/shapes @dirrm share/tuxpaint/images/magic @dirrm share/tuxpaint/images +@dirrm share/tuxpaint/im +@dirrm share/tuxpaint/fonts/locale/zh_tw_docs +@dirrm share/tuxpaint/fonts/locale/vi_docs +@dirrm share/tuxpaint/fonts/locale/th_docs +@dirrm share/tuxpaint/fonts/locale/te_docs +@dirrm share/tuxpaint/fonts/locale/ta_docs +@dirrm share/tuxpaint/fonts/locale/ka_docs +@dirrm share/tuxpaint/fonts/locale/ja_docs +@dirrm share/tuxpaint/fonts/locale/hi_docs +@dirrm share/tuxpaint/fonts/locale/he_docs +@dirrm share/tuxpaint/fonts/locale/gu_docs +@dirrm share/tuxpaint/fonts/locale/el_docs +@dirrm share/tuxpaint/fonts/locale/bo_docs +@dirrm share/tuxpaint/fonts/locale/ar_docs +@dirrm share/tuxpaint/fonts/locale @dirrm share/tuxpaint/fonts @dirrm share/tuxpaint/brushes @dirrm share/tuxpaint @@ -547,14 +809,13 @@ share/tuxpaint/starters/skyline-sf-dusk.txt @dirrm share/doc/tuxpaint/zh_tw/html @dirrm share/doc/tuxpaint/zh_tw @dirrm share/doc/tuxpaint/zh_cn -@dirrm share/doc/tuxpaint/zh @dirrm share/doc/tuxpaint/wa -@dirrm share/doc/tuxpaint/vi @dirrm share/doc/tuxpaint/tr @dirrm share/doc/tuxpaint/ta @dirrm share/doc/tuxpaint/sv @dirrm share/doc/tuxpaint/sr @dirrm share/doc/tuxpaint/sk +@dirrm share/doc/tuxpaint/ru/html @dirrm share/doc/tuxpaint/ru @dirrm share/doc/tuxpaint/ro @dirrm share/doc/tuxpaint/pt_br @@ -578,6 +839,12 @@ share/tuxpaint/starters/skyline-sf-dusk.txt @dirrm share/doc/tuxpaint/hr @dirrm share/doc/tuxpaint/hi @dirrm share/doc/tuxpaint/he +@dirrm share/doc/tuxpaint/gl/html/images +@dirrm share/doc/tuxpaint/gl/html +@dirrm share/doc/tuxpaint/gl +@dirrm share/doc/tuxpaint/fr/html/images/captures +@dirrm share/doc/tuxpaint/fr/html/images +@dirrm share/doc/tuxpaint/fr/html @dirrm share/doc/tuxpaint/fr @dirrm share/doc/tuxpaint/fi @dirrm share/doc/tuxpaint/eu diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo index 3063ff32513..c89aedd2ed7 100644 --- a/graphics/tuxpaint/distinfo +++ b/graphics/tuxpaint/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.18 2006/01/17 22:48:57 adrianp Exp $ +$NetBSD: distinfo,v 1.19 2007/09/04 21:11:58 drochner Exp $ -SHA1 (tuxpaint-0.9.14.tar.gz) = d899f15ae348413b85e5d0cacf971db2c604b036 -RMD160 (tuxpaint-0.9.14.tar.gz) = b8bbf53eef48d17f8219ae2380e98570f574a326 -Size (tuxpaint-0.9.14.tar.gz) = 3208894 bytes -SHA1 (patch-aa) = e2a238e16ab643a407f55e4275a5632b5cb023b2 -SHA1 (patch-ab) = 03c1aa47c90cc598081a0bf39eb0606309371d0b -SHA1 (patch-ac) = cb75efd7b6eb9c3bb6752b4bf1d56fb5dd0fdc58 +SHA1 (tuxpaint-0.9.17.tar.gz) = 88e42d19339bb1faa03bce45a28d3fe11fbe05b4 +RMD160 (tuxpaint-0.9.17.tar.gz) = c7cf3636875cad87646cda4df978f9adbbf18630 +Size (tuxpaint-0.9.17.tar.gz) = 7570223 bytes +SHA1 (patch-aa) = f08aa3c9096e17a5fed7b893ec04a9c86f6a4bc9 +SHA1 (patch-ab) = 78cba52d776088c5ad8ba3ea77a8584d0f708159 +SHA1 (patch-ad) = ac33e71f3cd7e581d67206a86875492af2836f47 diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa index cce4242692a..020ff3845c0 100644 --- a/graphics/tuxpaint/patches/patch-aa +++ b/graphics/tuxpaint/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.11 2005/12/28 04:58:01 reed Exp $ +$NetBSD: patch-aa,v 1.12 2007/09/04 21:11:58 drochner Exp $ ---- Makefile.orig 2004-10-04 08:32:26.000000000 +1000 +--- Makefile.orig 2007-07-01 17:05:57.000000000 +0200 +++ Makefile -@@ -11,7 +11,7 @@ +@@ -18,7 +18,7 @@ VER_DATE=`date +"%Y-%m-%d"` # Where to install things: @@ -10,40 +10,57 @@ $NetBSD: patch-aa,v 1.11 2005/12/28 04:58:01 reed Exp $ +#PREFIX=/usr/local - # Program: -@@ -27,16 +27,9 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint/ + # Root directory to place files when creating packages. +@@ -40,16 +40,9 @@ DATA_PREFIX=$(PKG_ROOT)$(PREFIX)/share/t # Docs and man page: - DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint/ --MAN_PREFIX=$(PREFIX)/share/man/ -+MAN_PREFIX=$(PREFIX)/$(PKGMANDIR) + DOC_PREFIX=$(PKG_ROOT)$(PREFIX)/share/doc/tuxpaint +-MAN_PREFIX=$(PKG_ROOT)$(PREFIX)/share/man ++MAN_PREFIX=$(PKG_ROOT)$(PREFIX)/$(PKGMANDIR) -# 'System-wide' Config file: - -ifeq ($(PREFIX),/usr) -- CONFDIR=/etc/tuxpaint +- CONFDIR=$(PKG_ROOT)/etc/tuxpaint -else -- CONFDIR=$(PREFIX)/etc/tuxpaint +- CONFDIR=$(PKG_ROOT)$(PREFIX)/etc/tuxpaint -endif # Commands useful to other arch's (e.g., BeOS) -@@ -88,7 +81,7 @@ SDL_CFLAGS=$(shell sdl-config --cflags) +@@ -103,12 +96,8 @@ SDL_MIXER_LIB=-lSDL_mixer + SDL_CFLAGS=$(shell sdl-config --cflags) $(SVG_CFLAGS) + +-SVG_LIB=-lrsvg-2 -lcairo +-SVG_CFLAGS=-I/usr/include/librsvg-2/librsvg \ +- -I/usr/include/gtk-2.0 \ +- -I/usr/include/glib-2.0 \ +- -I/usr/lib/glib-2.0/include \ +- -I/usr/include/cairo ++SVG_LIB=$(shell pkg-config --libs librsvg-2.0) $(shell pkg-config --libs cairo) ++SVG_CFLAGS=$(shell pkg-config --cflags librsvg-2.0) $(shell pkg-config --cflags cairo) + + PAPER_LIB=-lpaper + +@@ -116,8 +105,8 @@ PAPER_LIB=-lpaper # The entire set of CFLAGS: --CFLAGS=-O2 -Wall -Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES -+CFLAGS+=-Wall -Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES - DEFS=-DDATA_PREFIX=\"$(DATA_PREFIX)\" \ - -D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \ - -DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\" -@@ -143,10 +136,9 @@ beos: + #-ffast-math +-OPTFLAGS=-O2 +-CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ ++#OPTFLAGS=-O2 ++CFLAGS+=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ + -Wcast-align -Wredundant-decls \ + -Wbad-function-cast -Wwrite-strings \ + -Waggregate-return \ +@@ -284,10 +273,9 @@ include Makefile-i18n # to do this as superuser ("root")) install: install-bin install-data install-man install-doc \ -- install-icon install-gettext install-importscript \ -+ install-gettext install-importscript \ +- install-icon install-gettext install-im install-importscript \ ++ install-gettext install-im install-importscript \ install-default-config install-example-stamps \ - install-example-starters \ - install-gnome install-kde install-kde-icons @@ -51,7 +68,7 @@ $NetBSD: patch-aa,v 1.11 2005/12/28 04:58:01 reed Exp $ @echo @echo "--------------------------------------------------------------" @echo -@@ -288,9 +280,9 @@ uninstall: +@@ -478,9 +466,9 @@ uninstall: uninstall-i18n install-default-config: @echo @echo "...Installing default config file..." @@ -64,14 +81,19 @@ $NetBSD: patch-aa,v 1.11 2005/12/28 04:58:01 reed Exp $ # Install example stamps -@@ -698,10 +690,10 @@ install-man: - tuxpaint: obj/tuxpaint.o $(HQXX_O) $(ARCH_LIBS) +@@ -715,7 +703,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/ + $(HQXX_O) $(ARCH_LIBS) @echo @echo "...Linking Tux Paint..." -- @$(CC) $(CFLAGS) $(SDL_CFLAGS) $(DEFS) \ -+ @$(CC) $(CFLAGS) $(LDFLAGS) $(SDL_CFLAGS) $(DEFS) \ - -o tuxpaint obj/tuxpaint.o $(HQXX_O) \ - $(ARCH_LIBS) $(SDL_LIBS) \ +- @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PAPER_CFLAGS) \ ++ @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(LDFLAGS) $(SDL_CFLAGS) $(PAPER_CFLAGS) \ + $(DEFS) \ + -o tuxpaint \ + $^ \ +@@ -723,7 +711,7 @@ tuxpaint: obj/tuxpaint.o obj/i18n.o obj/ + $(SDL_LIBS) \ + $(SVG_LIB) \ + $(PAPER_LIB) \ - -lm $(ARCH_LINKS) + -lm $(ARCH_LINKS) $(LIBS) @$(RSRC_CMD) diff --git a/graphics/tuxpaint/patches/patch-ab b/graphics/tuxpaint/patches/patch-ab index b1915f4c799..5f078556c96 100644 --- a/graphics/tuxpaint/patches/patch-ab +++ b/graphics/tuxpaint/patches/patch-ab @@ -1,31 +1,24 @@ -$NetBSD: patch-ab,v 1.3 2005/01/11 10:29:49 wiz Exp $ +$NetBSD: patch-ab,v 1.4 2007/09/04 21:11:58 drochner Exp $ ---- src/tuxpaint.c.orig 2004-10-04 00:32:42.000000000 +0200 +--- src/tuxpaint.c.orig 2007-07-01 03:38:03.000000000 +0200 +++ src/tuxpaint.c -@@ -172,7 +172,7 @@ extern char* g_win32_getlocale(void); - #endif +@@ -170,7 +170,7 @@ static scaleparams scaletable[] = { + likely available; if not using GNU, you can set HAVE_STRCASESTR to + avoid trying to redefine it -bjk 2006.06.02 */ - #include "SDL_image.h" --#ifndef _IMG_h -+#ifndef _SDL_IMAGE_H - #error "---------------------------------------------------" - #error "If you installed SDL_image from a package, be sure" - #error "to get the development package, as well!" -@@ -181,7 +181,7 @@ extern char* g_win32_getlocale(void); - #endif +-#if !defined(__USE_GNU) && !defined(HAVE_STRCASESTR) ++#if !defined(__USE_GNU) && !defined(HAVE_STRCASESTR) && !defined(__NetBSD__) + #warning "Attempting to define strcasestr(); if errors, build with -DHAVE_STRCASESTR" - #include "SDL_ttf.h" --#ifndef _SDLttf_h -+#ifndef _SDL_TTF_H - #error "---------------------------------------------------" - #error "If you installed SDL_ttf from a package, be sure" - #error "to get the development package, as well!" -@@ -191,7 +191,7 @@ extern char* g_win32_getlocale(void); + char *strcasestr(const char *haystack, const char *needle) +@@ -363,8 +363,8 @@ extern WrapperData macosx; + + #else - #ifndef NOSOUND - #include "SDL_mixer.h" --#ifndef _MIXER_H_ -+#ifndef _SDL_MIXER_H +-#include "rsvg.h" +-#include "rsvg-cairo.h" ++#include ++#include + #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H) #error "---------------------------------------------------" - #error "If you installed SDL_mixer from a package, be sure" - #error "to get the development package, as well!" + #error "If you installed libRSVG from packages, be sure" diff --git a/graphics/tuxpaint/patches/patch-ac b/graphics/tuxpaint/patches/patch-ac deleted file mode 100644 index 0d67a50028f..00000000000 --- a/graphics/tuxpaint/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2006/01/17 22:48:57 adrianp Exp $ - ---- src/tuxpaint-import.sh.orig 2003-06-17 10:10:59.000000000 +0100 -+++ src/tuxpaint-import.sh -@@ -12,8 +12,8 @@ - # September 21, 2002 - June 17, 2003 - - --TMPDIR=/tmp - SAVEDIR=$HOME/.tuxpaint/saved -+TMPDIR=$SAVEDIR - - - if [ $# -eq 0 ]; then diff --git a/graphics/tuxpaint/patches/patch-ad b/graphics/tuxpaint/patches/patch-ad new file mode 100644 index 00000000000..585a9787533 --- /dev/null +++ b/graphics/tuxpaint/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 2007/09/04 21:11:58 drochner Exp $ + +--- src/i18n.c.orig 2007-09-04 19:24:41.000000000 +0200 ++++ src/i18n.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include "i18n.h" + #include "debug.h" + -- cgit v1.2.3