[pkgsrc/trunk]: pkgsrc/games/wesnoth/patches Use installation fix as it will ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/120826e499cb
branches:  trunk
changeset: 497300:120826e499cb
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jul 24 14:31:55 2005 +0000

description:
Use installation fix as it will be in next release.

diffstat:

 games/wesnoth/patches/patch-aa |  31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diffs (37 lines):

diff -r 90f9d48cc10e -r 120826e499cb games/wesnoth/patches/patch-aa
--- a/games/wesnoth/patches/patch-aa    Sun Jul 24 14:31:37 2005 +0000
+++ b/games/wesnoth/patches/patch-aa    Sun Jul 24 14:31:55 2005 +0000
@@ -1,15 +1,20 @@
-$NetBSD: patch-aa,v 1.3 2005/07/14 21:47:57 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2005/07/24 14:31:55 wiz Exp $
 
---- Makefile.in.orig   2005-06-06 00:03:23.000000000 +0200
+--- Makefile.in.orig   2005-06-29 22:32:22.000000000 +0200
 +++ Makefile.in
-@@ -762,8 +762,8 @@ install-data-local:
- @INSTALLDATA_TRUE@    srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- @INSTALLDATA_TRUE@    ( $(finddata) ) | while read p; do \
- @INSTALLDATA_TRUE@      $(w_preparefileinstall) \
--@INSTALLDATA_TRUE@      echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
--@INSTALLDATA_TRUE@      $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
-+@INSTALLDATA_TRUE@      echo $(install_sh_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
-+@INSTALLDATA_TRUE@      $(install_sh_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
- @INSTALLDATA_TRUE@    done
- @DUMMYLOCALES_TRUE@@INSTALLDATA_TRUE@ $(mkdir_p) "$(DESTDIR)$(pkgdatadir)/locales"
- @DUMMYLOCALES_TRUE@@INSTALLDATA_TRUE@ if test -d "$(DESTDIR)$(pkgdatadir)/locales/C" ; then rm -r "$(DESTDIR)$(pkgdatadir)/locales/C" ; fi
+@@ -267,12 +267,12 @@ bin_SCRIPTS = utils/wmlxgettext
+ findfilterflags = -name CVS -prune -o -name ".cvs*" -o -name ".\#*" -o -type d
+ @LITE_FALSE@findmoredata = ;find images music $(findfilterflags) -o -print
+ @LITE_TRUE@findmoredata = ;find images $(findfilterflags) -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" -o -print
+-@LITE_FALSE@findmoredatadirs = find images music -type d -not \( -name CVS -prune \) -print
+-@LITE_TRUE@findmoredatadirs = find images -type d -not \( -name CVS -prune -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" \) -print
++@LITE_FALSE@findmoredatadirs = find images music -type d ! \( -name CVS -prune \) -print
++@LITE_TRUE@findmoredatadirs = find images -type d ! \( -name CVS -prune -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" \) -print
+ finddata = (cd $(top_srcdir) && find data fonts sounds $(findfilterflags) -o -print \
+        $(findmoredata) )
+ 
+-finddatadirs = (cd $(top_srcdir) && find data fonts sounds -type d -not \( -name CVS -prune \) -print; $(findmoredatadirs) )
++finddatadirs = (cd $(top_srcdir) && find data fonts sounds -type d ! \( -name CVS -prune \) -print; $(findmoredatadirs) )
+ findnoinst = (cd $(top_srcdir) && find utils -name CVS -prune -o -name ".cvs*" -o -name ".\#*" -o -type d -o -print && find MANUAL*)
+ w_preparefileinstall = if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         case $$p in \