Moved back from sunrise. See Bug #109695

(Portage version: 2.1.8.3/cvs/Linux x86_64)

2 files changed, 106 insertions, 0 deletions

diff --git a/media-radio/xastir/files/xastir-1.9.8-Destdir.diff b/media-radio/xastir/files/xastir-1.9.8-Destdir.diff
new file mode 100644
index 000000000000..64a08e1ba56c
--- /dev/null
+++ b/media-radio/xastir/files/xastir-1.9.8-Destdir.diff
@@ -0,0 +1,20 @@
+--- config/Makefile.am.orig	2008-06-12 21:30:44.000000000 +0200
++++ config/Makefile.am	2009-06-06 18:03:32.000000000 +0200
+@@ -57,5 +57,5 @@
+ config_DATA = ${EXTRA_DIST}
+ 
+ install-exec-hook:
+-	rm -f \$(configdir)/nwsfz_ddmmyy.dbfawk
++	rm -f $(DESTDIR)$(configdir)/nwsfz_ddmmyy.dbfawk
+ 
+--- Makefile.am.old	2010-05-17 21:49:11.000000000 +0200
++++ Makefile.am	2010-05-17 21:49:45.000000000 +0200
+@@ -63,7 +63,7 @@
+ # documentation is FHS compliant.
+ 
+ install-exec-hook:
+-	-rm -rf ${pkgdatadir}/doc
++	-rm -rf ${DESTDIR}${pkgdatadir}/doc
+  
+ mandir=${prefix}/share/man
+ man_MANS=xastir.1 callpass.1 xastir_udp_client.1 testdbfawk.1
diff --git a/media-radio/xastir/files/xastir-1.9.8-scripts.diff b/media-radio/xastir/files/xastir-1.9.8-scripts.diff
new file mode 100644
index 000000000000..292c0cb14fd9
--- /dev/null
+++ b/media-radio/xastir/files/xastir-1.9.8-scripts.diff
@@ -0,0 +1,86 @@
+diff -ur scripts.orig/Makefile.am scripts/Makefile.am
+--- scripts.orig/Makefile.am	2009-10-15 21:47:20.000000000 +0200
++++ scripts/Makefile.am	2009-10-15 21:47:57.000000000 +0200
+@@ -9,9 +9,7 @@
+     get-fcc-rac.pl \
+     get-gnis \
+     get-pop \
+-    get-maptools.sh \
+     get-NWSdata \
+-    get_shapelib.sh \
+     gpx2shape \
+     icontable.pl \
+     inf2geo.pl \
+@@ -39,8 +37,6 @@
+     values \
+     values.pl \
+     waypoint-get.pl \
+-    xastir-fixcfg.sh \
+-    xastir-migrate.sh \
+     Xastir_tigerpoly.py
+ 
+ EXTRA_DIST = $(pkglib_SCRIPTS)
+diff -u scripts.orig/permutations.pl scripts/permutations.pl
+--- scripts.orig/permutations.pl	2005-03-25 21:53:04.000000000 +0100
++++ scripts/permutations.pl	2008-08-16 07:47:00.000000000 +0200
+@@ -34,7 +34,7 @@
+ #
+ 
+ 
+-use lib "/usr/local/lib";
++use lib "/usr/lib";
+ use Coordinate;         # WE7U's Coordinate.pm module
+ 
+ 
+diff -u scripts.orig/test_coord.pl scripts/test_coord.pl
+--- scripts.orig/test_coord.pl	2003-01-06 23:42:17.000000000 +0100
++++ scripts/test_coord.pl	2008-08-16 07:47:00.000000000 +0200
+@@ -33,7 +33,7 @@
+ 
+ #------------------------------------------------------------------------------------------------
+ 
+-use lib "/usr/local/lib";
++use lib "/usr/lib";
+ use Coordinate;		# Snag WE7U's Coordinate module
+ 
+ 
+diff -u scripts.orig/toporama250k.pl scripts/toporama250k.pl
+--- scripts.orig/toporama250k.pl	2008-08-16 07:42:13.000000000 +0200
++++ scripts/toporama250k.pl	2008-08-16 08:03:08.000000000 +0200
+@@ -28,14 +28,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ #   by becoming root using the "su" command, using "sudo", or
+ #   temporarily changing ownership and/or privileges on the
+ #   "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama250k.pl"
++# - "/usr/lib/xastir/toporama250k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ #   .../maps/toporama/images/
+diff -u scripts.orig/toporama50k.pl scripts/toporama50k.pl
+--- scripts.orig/toporama50k.pl	2008-08-16 07:42:13.000000000 +0200
++++ scripts/toporama50k.pl	2008-08-16 08:02:48.000000000 +0200
+@@ -27,14 +27,14 @@
+ # map files for the whole of Canada!
+ #
+ #
+-# - "cd /usr/local/share/xastir/maps"
++# - "cd /usr/share/xastir/maps"
+ #
+ # - Assure you have write privileges in the directory above either
+ #   by becoming root using the "su" command, using "sudo", or
+ #   temporarily changing ownership and/or privileges on the
+ #   "maps" directory.
+ #
+-# - "/usr/local/lib/xastir/toporama50k.pl"
++# - "/usr/lib/xastir/toporama50k.pl"
+ #
+ # - The script will create/populate this directory heirarchy:
+ #   .../maps/toporama/images/