Update to 2002.09.28, for Cyrus.

Changes:
  * Translated to Brazilian Portuguese ('pt_BR').
  * Fixed 'get_fname()' so that it won't return a directory name with
    a trailing slash (if no filename was given).  Some 'mkdir()'s don't
    like trailing slashes.
  * "lang=" setting is now recognized in configuration files.
  * Default configuration file now exists (Unix/Linux).
    Installed as /etc/tuxpaint/tuxpaint.conf.
    Read before "~/.tuxpaintrc".
    Reading it can be disabled with "--nosysconfig" on command-line.
  * Added support for "OPTION=no" in config file, as well as
    "UNOPTION=yes" (like command-line args. use), so that "~/.tuxpaintrc"
    can override any settings in new system config.
    (e.g., "noprint=no" or "print=yes" will override a "noprint=yes")
  * Updated Spanish documentation.
  * Added warnings about untranslated strings ("NOTRANS: ...") to
    debugging output.  ("#define DEBUG")  (Useful for translators.)
  * Added option to disable 'fancy' mouse pointers:  --nofancycursors
    (since fullscreen under Windows and non-X-Window targets under Linux
    currently have problems due to an SDL library bug)
  * Changed 'tuxpaint-import's usage message to reflect that it can import
    multiple files at a time, and that it has a "--help" option.
  * Updated 'tuxpaint-import's help message to describe what the program does.

5 files changed, 19 insertions, 39 deletions

diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 6b060b90120..9ba1e9a85a6 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/27 11:07:23 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/29 20:58:18 wiz Exp $
 #
 
-DISTNAME=	tuxpaint-2002.09.25
+DISTNAME=	tuxpaint-2002.09.28
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/
 
diff --git a/graphics/tuxpaint/PLIST b/graphics/tuxpaint/PLIST
index d295af4130c..1670aa9bba8 100644
--- a/graphics/tuxpaint/PLIST
+++ b/graphics/tuxpaint/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/27 11:07:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/09/29 20:58:18 wiz Exp $
 bin/tuxpaint
 bin/tuxpaint-import
+etc/tuxpaint/tuxpaint.conf
 share/doc/tuxpaint/AUTHORS.txt
 share/doc/tuxpaint/CHANGES.txt
 share/doc/tuxpaint/COPYING.txt
@@ -66,6 +67,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/tuxpaint.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/tuxpaint.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/tuxpaint.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/tuxpaint.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/tuxpaint.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/tuxpaint.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/tuxpaint.mo
 share/tuxpaint/brushes/round_06.png
@@ -222,3 +224,4 @@ share/tuxpaint/sounds/thin.wav
 @dirrm share/doc/tuxpaint/de
 @dirrm share/doc/tuxpaint/da
 @dirrm share/doc/tuxpaint
+@dirrm etc/tuxpaint
diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index 4a7a2c9ea99..b793b97ff64 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/27 11:07:23 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/09/29 20:58:18 wiz Exp $
 
-SHA1 (tuxpaint-2002.09.25.tar.gz) = 41360e635a0b2eb8628edd0675433f8a9907f6a7
-Size (tuxpaint-2002.09.25.tar.gz) = 876510 bytes
-SHA1 (patch-aa) = 157dda6f920ed2ace184add1092be4a04d33a334
-SHA1 (patch-ab) = 1a444f6ff01e1ff7f407ada47c0436de1297effc
+SHA1 (tuxpaint-2002.09.28.tar.gz) = 52b1628bcf7f686280351b54bced849ef0ab0584
+Size (tuxpaint-2002.09.28.tar.gz) = 896439 bytes
+SHA1 (patch-aa) = 402dc6f3b45ae95e470db08b618165aeb29ca766
diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa
index 48ff9fec0f8..e81cbef2c81 100644
--- a/graphics/tuxpaint/patches/patch-aa
+++ b/graphics/tuxpaint/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/27 11:07:23 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/29 20:58:19 wiz Exp $
 
---- Makefile.orig	Wed Sep 25 20:32:04 2002
+--- Makefile.orig	Sat Sep 28 10:58:15 2002
 +++ Makefile
 @@ -11,7 +11,7 @@
  
@@ -19,23 +19,23 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/09/27 11:07:23 wiz Exp $
 +MAN_PREFIX=$(PREFIX)/man/
  
  
- # Icons and launchers:
-@@ -59,7 +59,7 @@ SDL_CFLAGS=$(shell sdl-config --cflags)
+ # 'System-wide' Config file:
+@@ -68,7 +68,7 @@ SDL_CFLAGS=$(shell sdl-config --cflags)
  
  # The entire set of CFLAGS:
  
 -CFLAGS=-O2 -Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
 +CFLAGS+=-Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
  	-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
- 	-DLOCALEDIR=\"$(LOCALE_PREFIX)\"
+ 	-DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\"
  
-@@ -91,8 +91,7 @@ nosound:
+@@ -100,8 +100,7 @@ nosound:
  # to do this as superuser ("root"))
  
  install:	install-bin install-data install-man install-doc \
 -		install-gnome install-kde install-kde-icons \
--		install-icon install-gettext install-importscript
-+		install-gettext install-importscript
+-		install-icon install-gettext install-importscript \
++		install-gettext install-importscript \
+ 		install-default-config
  	@echo
  	@echo "All done! Now (preferably NOT as 'root' superuser),"
- 	@echo "you can type the command 'tuxpaint' to run the program!!!"
diff --git a/graphics/tuxpaint/patches/patch-ab b/graphics/tuxpaint/patches/patch-ab
deleted file mode 100644
index 7f49eb62a8c..00000000000
--- a/graphics/tuxpaint/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/27 11:07:23 wiz Exp $
-
---- src/tuxpaint.c.orig	Wed Sep 25 22:29:34 2002
-+++ src/tuxpaint.c
-@@ -6162,8 +6162,15 @@ char * get_fname(char * name)
- #else
-   if (getenv("HOME") != NULL)
-   {
--    snprintf(f, sizeof(f), "%s/.tuxpaint/%s",
--	     getenv("HOME"), name);
-+    if (*name == '\0') {
-+      snprintf(f, sizeof(f), "%s/.tuxpaint",
-+	       getenv("HOME"));
-+    }
-+    else
-+    {
-+      snprintf(f, sizeof(f), "%s/.tuxpaint/%s",
-+	       getenv("HOME"), name);
-+    }
-   }
-   else
-   {