media-radio/xastir: Version bump

svn path=/sunrise/; revision=9373

5 files changed, 96 insertions, 199 deletions

diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index 5cd234300..72057e27f 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Oct 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  -xastir-1.9.4.ebuild, -files/xastir-1.9.4-scripts.diff,
+  +xastir-1.9.6.ebuild, +files/xastir-1.9.6-scripts.diff:
+  Version bump
+
   06 Sep 2009; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
   xastir-1.9.4.ebuild:
   tested on amd64
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index f879fc5bd..5ec633df1 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,6 +1,6 @@
 AUX xastir-1.9.4-config.diff 287 RMD160 50b590732822280ad554748a1f9bafbcf5a5b82e SHA1 4745988df30d4413bbcdf1f80f9d96eb7c4297c4 SHA256 fab8e3ee4af50ef7279d927d71f07cf3a1346ef702fe86acbdd94b42427763fa
-AUX xastir-1.9.4-scripts.diff 6814 RMD160 64d8546349948810401b6f0eed7d63daa29d0073 SHA1 ab1174799c7bbed1c77d17b9eab94fa272dce816 SHA256 2d49b9d476364f45132fa118b40340fa976dee30e1dbafe47f07677c85f894c8
-DIST xastir-1.9.4.tar.gz 2348880 RMD160 44019501e7118d274046839b6d302dce57f34e19 SHA1 c29f736991d7866bda7e611f328a7a0a17f5e08e SHA256 b960449bc755e702013cdd62587262bd2be22cbfd5656e4bfe1dd12d62e4c174
-EBUILD xastir-1.9.4.ebuild 1806 RMD160 672d0017d866506dfd31c02686af573b029c7308 SHA1 c1080fddac4789b35d8aab687e4e08441795c0b8 SHA256 c9833e0a05bf8ed101986a9825b516cdb0fab3eabc016eb2f7fe50329ffd06eb
-MISC ChangeLog 1965 RMD160 31d586bf995ab8430871785b85df73d866fa60d4 SHA1 61fef81a41d899f38592621c27253fb5068b6f5e SHA256 bf4c66e4cbc06cea2576c9323ae71bd18d1e54d641f6c02a661db2d22a45cc6c
+AUX xastir-1.9.6-scripts.diff 2741 RMD160 68f6b2c5a663b23f83002f3f2b381f7e2470d622 SHA1 e47b3db778066d0fbf5511d2f3b14246b442480a SHA256 44276ac01a0a8da7908444c3d46502fb9a38cea9a73cabbb248b7b68829de517
+DIST xastir-1.9.6.tar.gz 2464221 RMD160 f87a7cf1df0391795bf6b02475843dd0ded30412 SHA1 6266d7a3f9f042589cc437dc317a6d95c314dd7f SHA256 e0c3efc41c79252d8ced7cebcd101051a873a73d4c0085c1f31452aee822c07e
+EBUILD xastir-1.9.6.ebuild 1810 RMD160 1d143a55818915db02b4e16642c43b8bc7d1c3de SHA1 c4dd0b219375a58bc708dc66c4b4c1436251c0f8 SHA256 5a3a43aa32f58aac1f6472f6aa1f06b0938295264cbe9044831451faf9ad6caf
+MISC ChangeLog 2155 RMD160 60f6f2fa399c831ba3d2a9d7ee0995f8abf85caa SHA1 22c7fb60458cecfb4326c95bb4ee504865b8a1c8 SHA256 9340bbdfa76871a845af0998abb9551173bc622ee42b48cedd456648008ee708
 MISC metadata.xml 444 RMD160 74708af55f56eff4ba3ff00558c1aa13ce4ba827 SHA1 15512a6140ff551628eacd5c24a62829275ac92d SHA256 3a5aa907f6bed212f02b76a75e97fc08dce2fdc921ad9a957c1f11d87b9ca334
diff --git a/media-radio/xastir/files/xastir-1.9.4-scripts.diff b/media-radio/xastir/files/xastir-1.9.4-scripts.diff
deleted file mode 100644
index 8165dbd5c..000000000
--- a/media-radio/xastir/files/xastir-1.9.4-scripts.diff
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -u scripts.orig/Makefile.am scripts/Makefile.am
---- scripts.orig/Makefile.am	2008-06-24 17:48:59.000000000 +0200
-+++ scripts/Makefile.am	2008-08-16 07:47:00.000000000 +0200
-@@ -8,9 +8,7 @@
-     coord-convert.pl \
-     get-fcc-rac.pl \
-     get-gnis \
--    get-maptools.sh \
-     get-NWSdata \
--    get_shapelib.sh \
-     gpx2shape \
-     icontable.pl \
-     inf2geo.pl \
-@@ -29,8 +27,6 @@
-     track-get.pl \
-     update_langfile.pl \
-     waypoint-get.pl \
--    xastir-fixcfg.sh \
--    xastir-migrate.sh \
-     Xastir_tigerpoly.py
- 
- 
-diff -u scripts.orig/coord-convert.pl scripts/coord-convert.pl
---- scripts.orig/coord-convert.pl	2002-08-26 23:52:03.000000000 +0200
-+++ scripts/coord-convert.pl	2008-08-16 07:47:00.000000000 +0200
-@@ -26,7 +26,7 @@
- #
- 
- 
--use lib "/usr/local/lib";
-+use lib "/usr/lib";
- use Coordinate;         # WE7U's Coordinate.pm module
- 
- 
-diff -u scripts.orig/get-NWSdata scripts/get-NWSdata
---- scripts.orig/get-NWSdata	2008-07-18 17:26:39.000000000 +0200
-+++ scripts/get-NWSdata	2008-08-16 07:47:00.000000000 +0200
-@@ -40,7 +40,7 @@
- FILE6="fz25jn08"  # NWSM Libraries: Fire Weather Zone Boundaries
- FILE7="c_11mr07"  # County Libraries: AWIPS Counties
- 
--cd /usr/local/share/xastir/Counties
-+cd /usr/share/xastir/Counties
- 
- 
- # Remove any old zip files hanging around in this directory
-diff -u scripts.orig/get-fcc-rac.pl scripts/get-fcc-rac.pl
---- scripts.orig/get-fcc-rac.pl	2008-06-24 17:48:59.000000000 +0200
-+++ scripts/get-fcc-rac.pl	2008-08-16 08:07:57.000000000 +0200
-@@ -9,7 +9,7 @@
- #
- # Note: Run this script as root in order to write the files into the
- # destination directory listed below, or change directory write access.
--my $XASTIR_BASE="/usr/local/share/xastir";
-+my $XASTIR_BASE="/usr/share/xastir";
- 
- 
- # This script uses temporary storage space in /var/tmp to do its work.
-diff -u scripts.orig/get-gnis scripts/get-gnis
---- scripts.orig/get-gnis	2008-07-01 03:47:48.000000000 +0200
-+++ scripts/get-gnis	2008-08-16 08:07:12.000000000 +0200
-@@ -55,8 +55,8 @@
- 
-     if ( [ -f ${MYSTATE}_DECI.txt ] )
-     then 
--        printf "File successfully downloaded. Moving to /usr/local/share/xastir/GNIS\n" 
--        sudo mv ${MYSTATE}_DECI.txt /usr/local/share/xastir/GNIS/${MYSTATE}.gnis
-+        printf "File successfully downloaded. Moving to /usr/share/xastir/GNIS\n" 
-+        sudo mv ${MYSTATE}_DECI.txt /usr/share/xastir/GNIS/${MYSTATE}.gnis
-     else 
-         printf "File for %s not successfully downloaded.\n" ${MYSTATE}
-     fi 
-diff -u scripts.orig/get-maptools.sh scripts/get-maptools.sh
---- scripts.orig/get-maptools.sh	2008-01-16 20:33:59.000000000 +0100
-+++ scripts/get-maptools.sh	2008-08-16 07:47:00.000000000 +0200
-@@ -135,11 +135,11 @@
- 	fi 
-     fi
- 
--    if touch -a /usr/local/lib 
-+    if touch -a /usr/lib 
-     then
--        printf "We can modify /usr/local/lib\n"
-+        printf "We can modify /usr/lib\n"
-     else
--        printf "ERROR: We cannot modify /usr/local/lib - aborting\n"
-+        printf "ERROR: We cannot modify /usr/lib - aborting\n"
-         exit
-     fi 
- fi 
-@@ -163,22 +163,22 @@
- 	sudo touch $LDCONF_FILE
-     fi
- 
--    if (! grep /usr/local/lib $LDCONF_FILE 2>&1 > /dev/null) 
-+    if (! grep /usr/lib $LDCONF_FILE 2>&1 > /dev/null) 
-     then
--        printf "Warning: /usr/local/lib not in %s - adding it\n" $LDCONF_FILE
-+        printf "Warning: /usr/lib not in %s - adding it\n" $LDCONF_FILE
- 	if [ -f $LDCONF_FILE ]
- 	then
- 	        cp $LDCONF_FILE /tmp/ldconfig.tmp
- 	        $SUDO cp $LDCONF_FILE $LDCONF_FILE.orig.$$
- 	fi
--        printf "/usr/local/lib\n" >> /tmp/ldconf.tmp
-+        printf "/usr/lib\n" >> /tmp/ldconf.tmp
-         $SUDO cp /tmp/ldconf.tmp $LDCONF_FILE
- 
-     fi
- 
--    if (! grep /usr/local/lib $LDCONF_FILE 2>&1 > /dev/null) 
-+    if (! grep /usr/lib $LDCONF_FILE 2>&1 > /dev/null) 
-     then
--        printf "ERROR: could not add /usr/local/lib to %s - aborting\n " $LDCONFIG_FILE
-+        printf "ERROR: could not add /usr/lib to %s - aborting\n " $LDCONFIG_FILE
-         exit
-     fi
- 
-diff -u scripts.orig/icontable.pl scripts/icontable.pl
---- scripts.orig/icontable.pl	2003-07-07 19:17:54.000000000 +0200
-+++ scripts/icontable.pl	2008-08-16 07:47:00.000000000 +0200
-@@ -29,7 +29,7 @@
- #--------------------------------------------------------------------------
-                                             
- # symbols file from XASTIR V2.1, change the path for your environment
--$SYMBFILE = "/usr/local/share/xastir/symbols/symbols.dat";
-+$SYMBFILE = "/usr/share/xastir/symbols/symbols.dat";
- 
- #--------------------------------------------------------------------------
- %sympix = ();
-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/
diff --git a/media-radio/xastir/files/xastir-1.9.6-scripts.diff b/media-radio/xastir/files/xastir-1.9.6-scripts.diff
new file mode 100644
index 000000000..292c0cb14
--- /dev/null
+++ b/media-radio/xastir/files/xastir-1.9.6-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/
diff --git a/media-radio/xastir/xastir-1.9.4.ebuild b/media-radio/xastir/xastir-1.9.6.ebuild
index bd31ba1fa..828dea056 100644
--- a/media-radio/xastir/xastir-1.9.4.ebuild
+++ b/media-radio/xastir/xastir-1.9.6.ebuild
@@ -35,7 +35,7 @@ src_unpack() {
 	edos2unix scripts/toporama*
 	# fix for different install directory in scripts
 	epatch "${FILESDIR}/${P}-scripts.diff" \
-	    "${FILESDIR}/${P}-config.diff"
+		"${FILESDIR}"/${PN}-1.9.4-config.diff
 	eautoreconf
 }