[pkgsrc/pkgsrc-2004Q1]: pkgsrc/games/dopewars Pullup build fix to the pkgsrc-...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a5967f3c7a6f
branches:  pkgsrc-2004Q1
changeset: 471392:a5967f3c7a6f
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Apr 27 07:39:27 2004 +0000

description:
Pullup build fix to the pkgsrc-2004Q1 branch.

Requested by jmmv in ticket pkgsrc-8.

"Include libiconv's buildlink3.mk, as this package uses iconv.  Should fix
a build problem if the pkgsrc iconv is beeing used, instead of the native
one.  Addresses PR pkg/20922."

and

"Do not install the .desktop file, which does not work anyway with the program
compiled w/o GTK support.  This avoids a dependancy on gnome*-dirs (which is
not actually here by a previous), so it can be installed correctly w/o X11.
Closes PR pkg/20922."

diffstat:

 games/dopewars/Makefile         |   5 +++--
 games/dopewars/PLIST            |   4 ++--
 games/dopewars/distinfo         |   4 ++--
 games/dopewars/patches/patch-aa |  13 +++++++++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diffs (85 lines):

diff -r 8ad02698954c -r a5967f3c7a6f games/dopewars/Makefile
--- a/games/dopewars/Makefile   Tue Apr 27 07:34:35 2004 +0000
+++ b/games/dopewars/Makefile   Tue Apr 27 07:39:27 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/03/26 20:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2004/04/27 07:39:27 agc Exp $
 
 DISTNAME=              dopewars-1.5.9
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            games
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=dopewars/}
 
@@ -28,6 +28,7 @@
 INCOMPAT_CURSES=       NetBSD-1.5* NetBSD-1.6[-_.]*
 INCOMPAT_CURSES+=      NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff -r 8ad02698954c -r a5967f3c7a6f games/dopewars/PLIST
--- a/games/dopewars/PLIST      Tue Apr 27 07:34:35 2004 +0000
+++ b/games/dopewars/PLIST      Tue Apr 27 07:39:27 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/08 19:40:38 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6.2.1 2004/04/27 07:39:27 agc Exp $
 bin/dopewars
 man/man6/dopewars.6
 share/doc/${PKGNAME}/help/cops.html
@@ -37,7 +37,6 @@
 share/dopewars/run.wav
 share/dopewars/shotdown.wav
 share/dopewars/train.wav
-share/gnome/apps/Games/dopewars.desktop
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dopewars.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dopewars.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dopewars.mo
@@ -47,6 +46,7 @@
 share/pixmaps/dopewars-pill.png
 share/pixmaps/dopewars-shot.png
 share/pixmaps/dopewars-weed.png
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/dopewars
 @dirrm share/doc/${PKGNAME}/help
 @dirrm share/doc/${PKGNAME}
diff -r 8ad02698954c -r a5967f3c7a6f games/dopewars/distinfo
--- a/games/dopewars/distinfo   Tue Apr 27 07:34:35 2004 +0000
+++ b/games/dopewars/distinfo   Tue Apr 27 07:39:27 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2004/02/13 23:44:12 snj Exp $
+$NetBSD: distinfo,v 1.10.2.1 2004/04/27 07:39:27 agc Exp $
 
 SHA1 (dopewars-1.5.9.tar.gz) = e62b03d8341e75fd332169df34a8b1200a775c7e
 Size (dopewars-1.5.9.tar.gz) = 1181836 bytes
-SHA1 (patch-aa) = 3441d372757119a0cb8292638ec1e4a3ac22cb62
+SHA1 (patch-aa) = 73ccc4bdb012a505a03a737c4aa02b5b6db76615
 SHA1 (patch-ab) = eae9e2a5d448206a687c7d7691f83dc81cb03b93
 SHA1 (patch-ac) = 529cf6e5b9f28a7fa547f81841c5199a1f8f84ae
 SHA1 (patch-ad) = 471c30b8b8e75d687e7891037f2427cb8ee51c14
diff -r 8ad02698954c -r a5967f3c7a6f games/dopewars/patches/patch-aa
--- a/games/dopewars/patches/patch-aa   Tue Apr 27 07:34:35 2004 +0000
+++ b/games/dopewars/patches/patch-aa   Tue Apr 27 07:39:27 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2002/12/06 16:50:03 jmmv Exp $
+$NetBSD: patch-aa,v 1.4.6.1 2004/04/27 07:39:27 agc Exp $
 
---- Makefile.in.orig   Mon Oct 21 13:09:21 2002
+--- Makefile.in.orig   2003-06-06 21:19:21.000000000 +0200
 +++ Makefile.in
 @@ -132,10 +132,10 @@ am__quote = @am__quote@
  install_sh = @install_sh@
@@ -15,3 +15,12 @@
  SCORE = ${SCOREDIR}/dopewars.sco
  EXTRA_DIST = ABOUT-NLS LICENCE dopewars.desktop dopewars.spec.in depcomp \
                   runindent.sh win32/Makefile win32/README win32/contid.h \
+@@ -512,8 +512,6 @@ install-data-local:
+       @chgrp games ${SCORE} || chgrp wheel ${SCORE} || \
+         echo "Unable to change group ownership of the high score file"
+       chmod 0660 ${SCORE}
+-      ${mkinstalldirs} ${DESKTOPDIR}
+-      ${INSTALL} -m 0644 ${srcdir}/${DESKTOP} ${DESKTOPDIR}
+ 
+ uninstall-local:
+       /bin/rm -f ${SCORE} ${DESKTOPDIR}/${DESKTOP}