5 files changed, 49 insertions, 68 deletions
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index 331f2269b068..9cd12b1e9a23 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -6,27 +6,32 @@
 #
 
 PORTNAME=	tuxpaint-config
-PORTVERSION=	0.0.11
-PORTREVISION=	5
+PORTVERSION=	0.0.12
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxpaint/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical tool to change TuxPaint settings
 
-LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
-		paper.2:${PORTSDIR}/print/libpaper
+LIB_DEPENDS=	paper.2:${PORTSDIR}/print/libpaper \
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 RUN_DEPENDS=	tuxpaint:${PORTSDIR}/games/tuxpaint
 
-USE_GMAKE=	yes
 USE_GETTEXT=	yes
+USE_GMAKE=	yes
+MAKE_ARGS=	PREFIX="${PREFIX}" \
+		MAN_PREFIX="${MANPREFIX}/man" \
+		X11_ICON_PREFIX="${PREFIX}/share/pixmaps/" \
+		CFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+		ARCH_LINKS="-L${LOCALBASE}/lib -lintl"
 
-MAN1=		tuxpaint-config.1
 MANCOMPRESSED=	yes
+MAN1=		tuxpaint-config.1
 
-post-patch:
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|install-doc\([^:]\)|\1|' ${WRKSRC}/${MAKEFILE}
+INSTALL_TARGET=	install-bin install-data install-man install-gettext
+.else
+INSTALL_TARGET=	install-bin install-data install-man install-gettext install-doc
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/tuxpaint-config/distinfo b/games/tuxpaint-config/distinfo
index 9b0cde100b66..e22a1e023a8b 100644
--- a/games/tuxpaint-config/distinfo
+++ b/games/tuxpaint-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tuxpaint-config-0.0.11.tar.gz) = 87bf7a758faac0d4eeab84ba925e01b6869973bcf70d4d668529bf53a852e7d8
-SIZE (tuxpaint-config-0.0.11.tar.gz) = 192193
+SHA256 (tuxpaint-config-0.0.12.tar.gz) = 9395a1c92e52c3420cabaa0c781b607e6832b5d9b6180902615f102216e1c8fd
+SIZE (tuxpaint-config-0.0.12.tar.gz) = 260444
diff --git a/games/tuxpaint-config/files/patch-Makefile b/games/tuxpaint-config/files/patch-Makefile
index 84fdf180e4d3..42838a87c80b 100644
--- a/games/tuxpaint-config/files/patch-Makefile
+++ b/games/tuxpaint-config/files/patch-Makefile
@@ -1,57 +1,12 @@
---- ./Makefile.orig	2008-02-27 21:06:33.000000000 -0200
-+++ ./Makefile	2008-08-10 13:41:54.000000000 -0300
-@@ -20,7 +20,7 @@
- 
- # Where to install things:
- 
--PREFIX=/usr/local
-+PREFIX?=/usr/local
- 
- 
- # Program:
-@@ -37,7 +37,7 @@
- # Docs and man page:
- 
- DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint-config/
--MAN_PREFIX=$(PREFIX)/share/man/
-+MAN_PREFIX=$(PREFIX)/man/
- 
- 
- # Tux Paint's 'System-wide' Config file:
-@@ -52,7 +52,7 @@
- # Icons and launchers:
- 
- ICON_PREFIX=$(PREFIX)/share/pixmaps/
--X11_ICON_PREFIX=$(PREFIX)/X11R6/include/X11/pixmaps/
-+X11_ICON_PREFIX=$(PREFIX)/share/pixmaps/
- GNOME_PREFIX=`gnome-config --prefix`
- KDE_PREFIX=`kde-config --install apps --expandvars`
- KDE_ICON_PREFIX=`kde-config --install icon --expandvars`
-@@ -77,7 +77,7 @@
- PAPER_LIB=-lpaper
- 
- # Default CFLAGS:
--CFLAGS=-O2 -Wall
-+CFLAGS+=-O2 -Wall
- 
- # The entire set of CFLAGS:
- ALL_CFLAGS=$(CFLAGS) $(FLTK_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \
-@@ -147,8 +147,7 @@
- # 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-gettext
- 	@echo
- 	@echo "All done! Now (preferably NOT as 'root' superuser),"
- 	@echo "you can type the command 'tuxpaint-config' to run the"
-@@ -307,7 +306,7 @@
- 	@echo Linking
- 	@$(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!
+--- Makefile.orig	2009-05-29 07:08:08.000000000 +0900
++++ Makefile	2010-10-19 01:39:29.000000000 +0900
+@@ -340,7 +340,8 @@
+ INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo,$(MOFILES))
+ 
+ $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint-config.mo: trans/%.mo
+-	install -D -m 644 $< $@
++	test -d `dirname $@` || mkdir -p `dirname $@`
++	$(BSD_INSTALL_DATA) $< $@
+ 
+ .PHONY: uninstall-i18n
+ uninstall-i18n:
diff --git a/games/tuxpaint-config/pkg-descr b/games/tuxpaint-config/pkg-descr
index 3bdcdbe781bd..b58e8904f6f7 100644
--- a/games/tuxpaint-config/pkg-descr
+++ b/games/tuxpaint-config/pkg-descr
@@ -4,4 +4,4 @@ encouraging cartoon mascot who helps guide children as they use the program.
 It provides a blank canvas and a variety of drawing tools to help your child
 be creative.
 
-WWW: http://www.newbreedsoftware.com/tuxpaint/
+WWW: http://www.tuxpaint.org/
diff --git a/games/tuxpaint-config/pkg-plist b/games/tuxpaint-config/pkg-plist
index 6dfac5f8bce7..941f3f9ae36b 100644
--- a/games/tuxpaint-config/pkg-plist
+++ b/games/tuxpaint-config/pkg-plist
@@ -5,6 +5,25 @@ bin/tuxpaint-config
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/README.html
+share/locale/ca/LC_MESSAGES/tuxpaint-config.mo
+share/locale/da/LC_MESSAGES/tuxpaint-config.mo
+share/locale/el/LC_MESSAGES/tuxpaint-config.mo
+share/locale/en_GB/LC_MESSAGES/tuxpaint-config.mo
+share/locale/es/LC_MESSAGES/tuxpaint-config.mo
+share/locale/fr/LC_MESSAGES/tuxpaint-config.mo
+share/locale/it/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ja/LC_MESSAGES/tuxpaint-config.mo
+share/locale/nl/LC_MESSAGES/tuxpaint-config.mo
+share/locale/nn/LC_MESSAGES/tuxpaint-config.mo
+share/locale/pt_BR/LC_MESSAGES/tuxpaint-config.mo
+share/locale/pt_PT/LC_MESSAGES/tuxpaint-config.mo
+share/locale/ru/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/sv/LC_MESSAGES/tuxpaint-config.mo
+share/locale/uk/LC_MESSAGES/tuxpaint-config.mo
+share/locale/zh_TW/LC_MESSAGES/tuxpaint-config.mo
 %%DATADIR%%/images/icon-win32.ico
 %%DATADIR%%/images/icon.png
 %%DATADIR%%/images/icon16x16.png
@@ -18,5 +37,7 @@ bin/tuxpaint-config
 %%DATADIR%%/images/win32-icon48x48x256.png
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
+@dirrmtry share/locale/son/LC_MESSAGES
+@dirrmtry share/locale/son
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%