4 files changed, 98 insertions, 25 deletions
diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile
index 32fa4708e82..effc54d62b4 100644
--- a/graphics/tuxpaint-config/Makefile
+++ b/graphics/tuxpaint-config/Makefile
@@ -1,26 +1,25 @@
-# $NetBSD: Makefile,v 1.17 2013/02/16 11:22:32 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.18 2014/08/23 21:40:46 wiz Exp $
 
-DISTNAME=		tuxpaint-config-0.0.8
-PKGREVISION=		6
+DISTNAME=		tuxpaint-config-0.0.13
 CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.billsgames.com/unix/x/tuxpaint/config/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		ftp://ftp.billsgames.com/unix/x/tuxpaint/config/
+HOMEPAGE=		http://www.tuxpaint.org/
 COMMENT=		Configuration program for tuxpaint
+LICENSE=		gnu-gpl-v2
 
 USE_LANGUAGES=		c++
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake msgfmt
 
 INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
 post-install:
-	-${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null
-	-${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name .xvpics -exec ${RM} -r {} \; 2>/dev/null
+	${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name CVS -exec ${RM} -r {} \; 2>/dev/null || ${TRUE}
+	${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint-config -name .xvpics -exec ${RM} -r {} \; 2>/dev/null || ${TRUE}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/fltk13/buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
+.include "../../x11/fltk13/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tuxpaint-config/PLIST b/graphics/tuxpaint-config/PLIST
index fa1e523349b..b0d27d18e8a 100644
--- a/graphics/tuxpaint-config/PLIST
+++ b/graphics/tuxpaint-config/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:59:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/08/23 21:40:46 wiz Exp $
 bin/tuxpaint-config
 man/man1/tuxpaint-config.1
 share/doc/tuxpaint-config/AUTHORS.txt
@@ -7,6 +7,55 @@ share/doc/tuxpaint-config/COPYING.txt
 share/doc/tuxpaint-config/README.txt
 share/doc/tuxpaint-config/TODO.txt
 share/doc/tuxpaint-config/html/README.html
+share/locale/ach/LC_MESSAGES/tuxpaint-config.mo
+share/locale/an/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ar/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ast/LC_MESSAGES/tuxpaint-config.mo
+share/locale/bg/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ca/LC_MESSAGES/tuxpaint-config.mo
+share/locale/cgg/LC_MESSAGES/tuxpaint-config.mo
+share/locale/cs/LC_MESSAGES/tuxpaint-config.mo
+share/locale/da/LC_MESSAGES/tuxpaint-config.mo
+share/locale/de/LC_MESSAGES/tuxpaint-config.mo
+share/locale/el/LC_MESSAGES/tuxpaint-config.mo
+share/locale/en_GB/LC_MESSAGES/tuxpaint-config.mo
+share/locale/eo/LC_MESSAGES/tuxpaint-config.mo
+share/locale/es/LC_MESSAGES/tuxpaint-config.mo
+share/locale/eu/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ff/LC_MESSAGES/tuxpaint-config.mo
+share/locale/fi/LC_MESSAGES/tuxpaint-config.mo
+share/locale/fr/LC_MESSAGES/tuxpaint-config.mo
+share/locale/gd/LC_MESSAGES/tuxpaint-config.mo
+share/locale/hi/LC_MESSAGES/tuxpaint-config.mo
+share/locale/hy/LC_MESSAGES/tuxpaint-config.mo
+share/locale/id/LC_MESSAGES/tuxpaint-config.mo
+share/locale/it/LC_MESSAGES/tuxpaint-config.mo
+share/locale/iu/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ja/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ka/LC_MESSAGES/tuxpaint-config.mo
+share/locale/lv/LC_MESSAGES/tuxpaint-config.mo
+share/locale/mn/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ms/LC_MESSAGES/tuxpaint-config.mo
+share/locale/nl/LC_MESSAGES/tuxpaint-config.mo
+share/locale/nn/LC_MESSAGES/tuxpaint-config.mo
+share/locale/pl/LC_MESSAGES/tuxpaint-config.mo
+share/locale/pt/LC_MESSAGES/tuxpaint-config.mo
+share/locale/pt_BR/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ro/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ru/LC_MESSAGES/tuxpaint-config.mo
+share/locale/sat/LC_MESSAGES/tuxpaint-config.mo
+share/locale/sk/LC_MESSAGES/tuxpaint-config.mo
+share/locale/sl/LC_MESSAGES/tuxpaint-config.mo
+share/locale/son/LC_MESSAGES/tuxpaint-config.mo
+share/locale/sr/LC_MESSAGES/tuxpaint-config.mo
+share/locale/sr@latin/LC_MESSAGES/tuxpaint-config.mo
+share/locale/sv/LC_MESSAGES/tuxpaint-config.mo
+share/locale/tr/LC_MESSAGES/tuxpaint-config.mo
+share/locale/uk/LC_MESSAGES/tuxpaint-config.mo
+share/locale/vec/LC_MESSAGES/tuxpaint-config.mo
+share/locale/vi/LC_MESSAGES/tuxpaint-config.mo
+share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo
+share/locale/zu/LC_MESSAGES/tuxpaint-config.mo
 share/tuxpaint-config/images/icon-win32.ico
 share/tuxpaint-config/images/icon.png
 share/tuxpaint-config/images/icon16x16.png
diff --git a/graphics/tuxpaint-config/distinfo b/graphics/tuxpaint-config/distinfo
index 375c48b1d32..87044f7fc59 100644
--- a/graphics/tuxpaint-config/distinfo
+++ b/graphics/tuxpaint-config/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2010/02/03 22:13:09 joerg Exp $
+$NetBSD: distinfo,v 1.6 2014/08/23 21:40:46 wiz Exp $
 
-SHA1 (tuxpaint-config-0.0.8.tar.gz) = fadfc473f4b9ecce4584d4ca6ad6387e52eda1aa
-RMD160 (tuxpaint-config-0.0.8.tar.gz) = bce690059ff1a740e1c94779b305b2cdfd1761ea
-Size (tuxpaint-config-0.0.8.tar.gz) = 90683 bytes
-SHA1 (patch-aa) = 408e97bd24332eeb3ed87d03ee914019e1e29c42
+SHA1 (tuxpaint-config-0.0.13.tar.gz) = 8b31ddf91eb130824351c652da87cfd6275304bb
+RMD160 (tuxpaint-config-0.0.13.tar.gz) = 991f5b14a6e1f7082eba1f8eb34c4e5aaf45926d
+Size (tuxpaint-config-0.0.13.tar.gz) = 451667 bytes
+SHA1 (patch-aa) = 7e6e6611ed2b39a7639ed0ab607dd24ffb60407b
diff --git a/graphics/tuxpaint-config/patches/patch-aa b/graphics/tuxpaint-config/patches/patch-aa
index 494a2adb920..8fafc4d6b58 100644
--- a/graphics/tuxpaint-config/patches/patch-aa
+++ b/graphics/tuxpaint-config/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2010/02/03 22:13:09 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2014/08/23 21:40:47 wiz Exp $
 
---- Makefile.orig	2007-07-01 17:06:18.000000000 +0200
+--- Makefile.orig	2011-02-22 18:57:26.000000000 +0000
 +++ Makefile
 @@ -20,7 +20,7 @@ VER_DATE=`date +"%Y-%m-%d"`
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/03 22:13:09 joerg Exp $
  
  
  # Tux Paint's 'System-wide' Config file:
-@@ -77,7 +77,7 @@ FLTK_LIBS=`fltk-config --ldflags`
+@@ -84,7 +84,7 @@ FLTK_LIBS=`fltk-config --ldflags`
  PAPER_LIB=-lpaper
  
  # Default CFLAGS:
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/03 22:13:09 joerg Exp $
  
  # The entire set of CFLAGS:
  ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-@@ -147,8 +147,7 @@ install-win32:
+@@ -154,8 +154,7 @@ install-win32:
  # to do this as superuser ("root"))
  
  install:	install-bin install-data install-man install-doc \
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/03 22:13:09 joerg Exp $
  	@echo
  	@echo "All done! Now (preferably NOT as 'root' superuser),"
  	@echo "you can type the command 'tuxpaint-config' to run the"
-@@ -248,8 +247,7 @@ install-icon:
+@@ -255,8 +254,7 @@ install-icon:
  install-bin:
  	@echo
  	@echo "...Installing program itself..."
@@ -49,7 +49,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/03 22:13:09 joerg Exp $
  
  
  # Install the data (sound, graphics, fonts):
-@@ -257,7 +255,7 @@ install-bin:
+@@ -264,7 +262,7 @@ install-bin:
  install-data:
  	@echo
  	@echo "...Installing data files..."
@@ -58,7 +58,7 @@ $NetBSD: patch-aa,v 1.4 2010/02/03 22:13:09 joerg Exp $
  	@cp -R data/* $(DATA_PREFIX)
  	@chmod -R a+rX,g-w,o-w $(DATA_PREFIX)
  
-@@ -276,28 +274,22 @@ install-doc:
+@@ -275,28 +273,22 @@ install-doc:
  	@echo
  	@echo "...Installing documentation..."
  	@echo "(English)"
@@ -96,12 +96,37 @@ $NetBSD: patch-aa,v 1.4 2010/02/03 22:13:09 joerg Exp $
  
  
  # Build the program!
-@@ -307,7 +299,7 @@ tuxpaint-config:	obj/tuxpaint-config.o o
+@@ -306,7 +298,7 @@ tuxpaint-config:	obj/tuxpaint-config.o o
  	@echo Linking
- 	@$(CXX) $(ALL_CFLAGS) -o tuxpaint-config obj/tuxpaint-config.o 	\
+ 	$(CXX) $(ALL_CFLAGS) -o tuxpaint-config obj/tuxpaint-config.o 	\
  			obj/tuxpaint-config2.o obj/defaults.o $(ARCH_LIBS) \
 -			$(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB)
 +			$(FLTK_LIBS) $(ARCH_LINKS) $(PAPER_LIB) -lintl
  
  
  # Build the object for the program!
+@@ -338,9 +330,13 @@ obj/resource.o:	visualc/resource.rc visu
+ POFILES:=$(wildcard src/po/*.po)
+ MOFILES:=$(patsubst src/po/%.po,trans/%.mo,$(POFILES))
+ INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.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-config.mo: trans/%.mo
+-	install -D -m 644 $< $@
++	install -m 644 $< $@
++
+ 
+ .PHONY: uninstall-i18n
+ uninstall-i18n:
+@@ -364,7 +360,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
+ 
+