[pkgsrc/trunk]: pkgsrc/games/qnetwalk Fix installation, update PLIST. Bump PK...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d15ecee4e3b
branches:  trunk
changeset: 501300:7d15ecee4e3b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Oct 20 11:38:20 2005 +0000

description:
Fix installation, update PLIST. Bump PKGREVISION.

diffstat:

 games/qnetwalk/Makefile         |  10 +++++++---
 games/qnetwalk/PLIST            |  12 +++++++++++-
 games/qnetwalk/distinfo         |   4 ++--
 games/qnetwalk/patches/patch-aa |  12 +++++++++---
 4 files changed, 29 insertions(+), 9 deletions(-)

diffs (109 lines):

diff -r ee49bedbd784 -r 7d15ecee4e3b games/qnetwalk/Makefile
--- a/games/qnetwalk/Makefile   Thu Oct 20 10:41:31 2005 +0000
+++ b/games/qnetwalk/Makefile   Thu Oct 20 11:38:20 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/10/13 18:01:27 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/20 11:38:20 wiz Exp $
 #
 
 DISTNAME=      qnetwalk-1.2
+PKGREVISION=   1
 CATEGORIES=    x11 games
 MASTER_SITES=  http://qt.osdn.org.ua/
 
@@ -10,7 +11,7 @@
 COMMENT=       QNetwalk is a Qt-version of the popular NetWalk game
 
 # We need qmake to build package's Makefile
-BUILD_DEPENDS+=        qt3-tools>=3.3:../../x11/qt3-tools
+BUILDLINK_DEPMETHOD.qt3-tools= build
 
 USE_TOOLS+=    gmake
 USE_LANGUAGES= c c++
@@ -20,6 +21,7 @@
 QNETWALK_MAN=  ${PREFIX}/man/man6
 QNETWALK_DATA= ${PREFIX}/share/games/${PKGBASE}
 QNETWALK_TR=   ${QNETWALK_DATA}
+KDEDIR=                ${PREFIX:Q}/share/kde
 
 do-configure:
        (cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile qnetwalk.pro)
@@ -27,12 +29,14 @@
 # Fix hardcoded paths
 SUBST_CLASSES=         path
 SUBST_MESSAGE.path=    "Fixing hardcoded paths."
-SUBST_STAGE.path=      post-patch
+SUBST_STAGE.path=      pre-configure
 SUBST_FILES.path=      qnetwalk.pro main.cpp mainwindow.cpp
 SUBST_SED.path=                -e 's:@QNETWALK_BIN@:${QNETWALK_BIN}:g'
 SUBST_SED.path+=       -e 's:@QNETWALK_MAN@:${QNETWALK_MAN}:g'
 SUBST_SED.path+=       -e 's:@QNETWALK_TR@:${QNETWALK_TR}:g'
 SUBST_SED.path+=       -e 's:@QNETWALK_DATA@:${QNETWALK_DATA}:g'
+SUBST_SED.path+=       -e 's:@KDEDIR@:${KDEDIR}:g'
 
 .include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ee49bedbd784 -r 7d15ecee4e3b games/qnetwalk/PLIST
--- a/games/qnetwalk/PLIST      Thu Oct 20 10:41:31 2005 +0000
+++ b/games/qnetwalk/PLIST      Thu Oct 20 11:38:20 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/10/13 18:01:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/10/20 11:38:20 wiz Exp $
 bin/qnetwalk
 man/man6/qnetwalk.6
 share/games/qnetwalk/click.wav
@@ -13,4 +13,14 @@
 share/games/qnetwalk/start.wav
 share/games/qnetwalk/turn.wav
 share/games/qnetwalk/win.wav
+share/kde/share/applnk/Games/qnetwalk.desktop
+share/kde/share/icons/hicolor/16x16/apps/qnetwalk.png
 @dirrm share/games/qnetwalk
+@unexec ${RMDIR} %D/share/kde/share/icons/hicolor/16x16/apps 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/share/icons/hicolor/16x16 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/share/icons/hicolor 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/share/icons 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/share/applnk/Games 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/share/applnk 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde/share 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/kde 2>/dev/null || ${TRUE}
diff -r ee49bedbd784 -r 7d15ecee4e3b games/qnetwalk/distinfo
--- a/games/qnetwalk/distinfo   Thu Oct 20 10:41:31 2005 +0000
+++ b/games/qnetwalk/distinfo   Thu Oct 20 11:38:20 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/10/13 18:01:27 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/10/20 11:38:20 wiz Exp $
 
 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) = 00c6a54c430cf4b3f7d3c3738d42e0159cf331d3
+SHA1 (patch-aa) = c10ac4b36b202c85509b945a242ca0eaff5f3dc4
 SHA1 (patch-ab) = 8085199e2b187f6676c55f643f84120bcba9c63c
 SHA1 (patch-ac) = 53fa5ba20d405f012c4b505c2271925cbe14064b
diff -r ee49bedbd784 -r 7d15ecee4e3b games/qnetwalk/patches/patch-aa
--- a/games/qnetwalk/patches/patch-aa   Thu Oct 20 10:41:31 2005 +0000
+++ b/games/qnetwalk/patches/patch-aa   Thu Oct 20 11:38:20 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/10/13 18:01:27 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2005/10/20 11:38:20 wiz Exp $
 
---- qnetwalk.pro.orig  2005-04-11 01:31:16.000000000 +0700
+--- qnetwalk.pro.orig  2005-04-10 20:31:16.000000000 +0200
 +++ qnetwalk.pro
-@@ -51,18 +51,18 @@ TRANSLATIONS    = translations/qnetwalk_
+@@ -51,22 +51,22 @@ TRANSLATIONS    = translations/qnetwalk_
                  translations/qnetwalk_ru.ts
  
  TARGET                = qnetwalk
@@ -24,3 +24,9 @@
 +sounds.path   = @QNETWALK_DATA@
  sounds.files  = sounds/*.wav
  INSTALLS       += sounds
+ 
+-KDEROOT = $$(KDEDIR)
++KDEROOT = @KDEDIR@
+ 
+ isEmpty( KDEROOT ) {
+     KDEROOT = /usr