>Number:         29941
>Category:       pkg
>Synopsis:       Please update package games/qnetwalk
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Apr 11 07:18:00 +0000 2005
>Originator:     Ian Zagorskih
>Release:        NetBSD-current
>Organization:
NGEDC
>Environment:
NetBSD NBSD1 3.99.3 NetBSD 3.99.3 (GENERIC-$Revision: 1.628 $) #3: Mon Apr 11 12:01:43 NOVST 2005  toor@NBSD1:/usr/src/sys/arch/i386/compile/NBSD1 i386

>Description:
Package games/qnetwalk is now v1.2:

http://qt.osdn.org.ua/qnetwalk.html

---cut---
2005-04-10 QNetWalk 1.2 released.
    * Added German translation by Thomas Loeber.
    * Added Spanish translation by Ismael Asensio.
    * Added Polish translation by Aleksander Wojdyga.
    * Added Brazilian Portuguese translation by Paulo Vitor.
    * Added the desktop file. 
---cut---

As a maintainer of this package i'v made an update patch. Please review it and if all is fine commit into pkgsrc. Thanks.

ps: Please note that package patches have been changed a bit.

>How-To-Repeat:

>Fix:
---cut---
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/games/qnetwalk/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile	7 Jan 2005 11:14:10 -0000	1.1.1.1
+++ Makefile	11 Apr 2005 07:10:46 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1.1.1 2005/01/07 11:14:10 wiz Exp $
 #
 
-DISTNAME=	qnetwalk-1.1
+DISTNAME=	qnetwalk-1.2
 CATEGORIES=	x11 games
 MASTER_SITES=	http://qt.osdn.org.ua/
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/games/qnetwalk/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST	7 Jan 2005 11:14:10 -0000	1.1.1.1
+++ PLIST	11 Apr 2005 07:10:46 -0000
@@ -3,8 +3,12 @@
 man/man6/qnetwalk.6
 share/games/qnetwalk/click.wav
 share/games/qnetwalk/connect.wav
+share/games/qnetwalk/qnetwalk_de.qm
+share/games/qnetwalk/qnetwalk_es.qm
 share/games/qnetwalk/qnetwalk_fr.qm
 share/games/qnetwalk/qnetwalk_nl.qm
+share/games/qnetwalk/qnetwalk_pl.qm
+share/games/qnetwalk/qnetwalk_pt_BR.qm
 share/games/qnetwalk/qnetwalk_ru.qm
 share/games/qnetwalk/start.wav
 share/games/qnetwalk/turn.wav
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/games/qnetwalk/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	23 Feb 2005 23:12:01 -0000	1.2
+++ distinfo	11 Apr 2005 07:10:46 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.2 2005/02/23 23:12:01 agc Exp $
 
-SHA1 (qnetwalk-1.1.tar.gz) = 7a245fa4243de7425c47d32f7c9a9a8603aabb59
-RMD160 (qnetwalk-1.1.tar.gz) = 49dfed6e96e0c779131c43e4e5203279b1ab2ab6
-Size (qnetwalk-1.1.tar.gz) = 129450 bytes
-SHA1 (patch-aa) = 7b2a3c5c1806405956454769f4beed26f25f2318
-SHA1 (patch-ab) = 4421ffa6d763ca1b26da671524445318de8ea6cd
-SHA1 (patch-ac) = 4f193fc7c7347dc2e470418468b6d5a5a16431fe
+SHA1 (qnetwalk-1.2.tar.gz) = d88cd1de4c8bae5e8884df6c499a389096c162c2
+RMD160 (qnetwalk-1.2.tar.gz) = 0529cb6f4d9cbe6e84b6181c447ae931b4b37eca
+Size (qnetwalk-1.2.tar.gz) = 135517 bytes
+SHA1 (patch-aa) = 838904bfb74c1054efae9755c55d135469ede92f
+SHA1 (patch-ab) = 8085199e2b187f6676c55f643f84120bcba9c63c
+SHA1 (patch-ac) = 53fa5ba20d405f012c4b505c2271925cbe14064b
---cut---

---patch-aa---
$NetBSD: patch-aa,v 1.1.1.1 2005/01/07 11:14:10 wiz Exp $

--- qnetwalk.pro.orig	2005-04-11 01:31:16.000000000 +0700
+++ qnetwalk.pro
@@ -51,18 +51,18 @@ TRANSLATIONS    = translations/qnetwalk_
 	          translations/qnetwalk_ru.ts
 
 TARGET		= qnetwalk
-target.path	= /usr/local/bin
+target.path	= @QNETWALK_BIN@
 INSTALLS       += target
 
-man.path	= /usr/local/man/man6
+man.path	= @QNETWALK_MAN@
 man.files	= qnetwalk.6
 INSTALLS       += man
 
-tr.path		= /usr/local/share/qnetwalk/translations
+tr.path		= @QNETWALK_TR@
 tr.files	= translations/*.qm
 INSTALLS       += tr
 
-sounds.path	= /usr/local/share/qnetwalk/sounds
+sounds.path	= @QNETWALK_DATA@
 sounds.files	= sounds/*.wav
 INSTALLS       += sounds
---patch-aa---

---patch-ab---
$NetBSD$

--- main.cpp.orig	2004-12-10 03:32:00.000000000 +0600
+++ main.cpp
@@ -30,11 +30,12 @@ int main(int argc, char ** argv)
 		     qInstallPathTranslations());
     app.installTranslator(&qtranslator);
 
-    QString appdir   = app.applicationDirPath();
+    //QString appdir   = app.applicationDirPath();
     QString filename = QString("qnetwalk_") + QTextCodec::locale();
     QTranslator translator(&app);
-    if(!translator.load(filename, appdir + "/translations/"))
-	translator.load(filename, appdir + "/../share/qnetwalk/translations/");
+    //if(!translator.load(filename, appdir + "/translations/"))
+	//translator.load(filename, appdir + "/../share/qnetwalk/translations/");
+	translator.load(filename, "@QNETWALK_TR@");
     app.installTranslator(&translator);
 
     MainWindow window;
---patch-ab---

---patch-ac---
$NetBSD$

--- mainwindow.cpp.orig	2005-04-11 01:13:54.000000000 +0700
+++ mainwindow.cpp
@@ -36,10 +36,11 @@ MainWindow::MainWindow() : QMainWindow(0
     contrdirs[Cell::D] = Cell::U;
     contrdirs[Cell::L] = Cell::R;
 
-    QString appdir = qApp->applicationDirPath();
-    soundpath = appdir + "/sounds/";
-    if(!QFile::exists(soundpath))
-	soundpath = appdir + "/../share/qnetwalk/sounds/";
+    //QString appdir = qApp->applicationDirPath();
+    //soundpath = appdir + "/sounds/";
+    //if(!QFile::exists(soundpath))
+	//soundpath = appdir + "/../share/qnetwalk/sounds/";
+	soundpath = "@QNETWALK_DATA@";
 
     winsound     = new QSound(soundpath + "win.wav");
     turnsound    = new QSound(soundpath + "turn.wav");
---patch-ac---