3 files changed, 547 insertions, 20 deletions

diff --git a/misc/metromap/Makefile b/misc/metromap/Makefile
index 85fa8c5bb9be..3e43c27cc70f 100644
--- a/misc/metromap/Makefile
+++ b/misc/metromap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	metromap
-PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTVERSION=	0.1.2
 CATEGORIES=	misc
 MASTER_SITES=	http://metromap.antex.ru/ \
 		http://www.amdmi3.ru/distfiles/
@@ -18,10 +17,12 @@ COMMENT=	A simple application for finding paths in different subways maps
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2
 USE_BZIP2=	yes
-NO_BUILD=	yes
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's,make,${GMAKE},' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/bin/python,${SETENV} python,' ${WRKSRC}/metromap.py
 
 .include <bsd.port.mk>
diff --git a/misc/metromap/distinfo b/misc/metromap/distinfo
index 01300ea9dc00..97fd35a9cb9f 100644
--- a/misc/metromap/distinfo
+++ b/misc/metromap/distinfo
@@ -1,3 +1,3 @@
-MD5 (metromap-0.1.1.tar.bz2) = 6c05ac5bfe81353dfcefcaff38170614
-SHA256 (metromap-0.1.1.tar.bz2) = c1cb29cd4dd775bad6882e22191c15ed790289d29da6ed50930239e8fae0ee0e
-SIZE (metromap-0.1.1.tar.bz2) = 86328
+MD5 (metromap-0.1.2.tar.bz2) = f3a92b70f7a282ad7b0ff52bec645ab2
+SHA256 (metromap-0.1.2.tar.bz2) = ec1ed9250ff1ed529a555eee8682b9204402ffd402b550fb212fc5cfe6c776db
+SIZE (metromap-0.1.2.tar.bz2) = 857979
diff --git a/misc/metromap/pkg-plist b/misc/metromap/pkg-plist
index 95a77b71bd0c..0905151bd3b4 100644
--- a/misc/metromap/pkg-plist
+++ b/misc/metromap/pkg-plist
@@ -1,23 +1,549 @@
 bin/metromap
 share/locale/ru/LC_MESSAGES/metromap.mo
-%%DATADIR%%/data/Berlin/Metro.ini
-%%DATADIR%%/data/KievUkr/Metro.ini
-%%DATADIR%%/data/London/Metro.ini
-%%DATADIR%%/data/Moscow/Metro.ini
-%%DATADIR%%/data/Peterburg/Metro.ini
+%%DATADIR%%/data/Berlin/Berlin.cty
+%%DATADIR%%/data/Berlin/Berlin.grd
+%%DATADIR%%/data/Berlin/Berlin.vec
+%%DATADIR%%/data/Berlin/Metro.map
+%%DATADIR%%/data/Berlin/Metro.trp
+%%DATADIR%%/data/Kiev/AddInfo.txt
+%%DATADIR%%/data/Kiev/AvtoVokzal.txt
+%%DATADIR%%/data/Kiev/Cinema.bmp
+%%DATADIR%%/data/Kiev/Cinema.txt
+%%DATADIR%%/data/Kiev/Dosug.txt
+%%DATADIR%%/data/Kiev/Hotel.bmp
+%%DATADIR%%/data/Kiev/Hotels.txt
+%%DATADIR%%/data/Kiev/Images.txt
+%%DATADIR%%/data/Kiev/Kiev.cty
+%%DATADIR%%/data/Kiev/Kiev.gif
+%%DATADIR%%/data/Kiev/Kiev.grd
+%%DATADIR%%/data/Kiev/Kiev.vec
+%%DATADIR%%/data/Kiev/Kyr-Kras.map
+%%DATADIR%%/data/Kiev/Kyr-Kras.vec
+%%DATADIR%%/data/Kiev/Metro.map
+%%DATADIR%%/data/Kiev/Metro.trp
+%%DATADIR%%/data/Kiev/Mob_CSeparator.txt
+%%DATADIR%%/data/Kiev/Mob_Coverage_DCC.txt
+%%DATADIR%%/data/Kiev/Mob_Coverage_Golden Telecom.txt
+%%DATADIR%%/data/Kiev/Mob_Coverage_Kievstar.txt
+%%DATADIR%%/data/Kiev/Mob_Coverage_Life.txt
+%%DATADIR%%/data/Kiev/Mob_Coverage_Mts.txt
+%%DATADIR%%/data/Kiev/Mob_Coverage_Railways_All.txt
+%%DATADIR%%/data/Kiev/Mob_Coverage_Wellcom.txt
+%%DATADIR%%/data/Kiev/Mob_Mts_logo.bmp
+%%DATADIR%%/data/Kiev/Mob_Office_Mts.txt
+%%DATADIR%%/data/Kiev/Mob_Separator.txt
+%%DATADIR%%/data/Kiev/Mob_ZOpened.txt
+%%DATADIR%%/data/Kiev/Mostransavto_logo.bmp
+%%DATADIR%%/data/Kiev/Museums.bmp
+%%DATADIR%%/data/Kiev/Museums.txt
+%%DATADIR%%/data/Kiev/Night.txt
+%%DATADIR%%/data/Kiev/RailWay.map
+%%DATADIR%%/data/Kiev/RailWay.vec
+%%DATADIR%%/data/Kiev/Railways_Fastov.map
+%%DATADIR%%/data/Kiev/Railways_Fastov.vec
+%%DATADIR%%/data/Kiev/Railways_Greben.map
+%%DATADIR%%/data/Kiev/Railways_Greben.vec
+%%DATADIR%%/data/Kiev/Railways_Mironov.map
+%%DATADIR%%/data/Kiev/Railways_Mironov.vec
+%%DATADIR%%/data/Kiev/Railways_Nejun.map
+%%DATADIR%%/data/Kiev/Railways_Nejun.vec
+%%DATADIR%%/data/Kiev/Railways_Teterev.map
+%%DATADIR%%/data/Kiev/Railways_Teterev.vec
+%%DATADIR%%/data/Kiev/Stadions.txt
+%%DATADIR%%/data/Kiev/Stations.txt
+%%DATADIR%%/data/Kiev/Sur-Pech.map
+%%DATADIR%%/data/Kiev/Sur-Pech.vec
+%%DATADIR%%/data/Kiev/Sviatoshin.png
+%%DATADIR%%/data/Kiev/Svjat-Brov.map
+%%DATADIR%%/data/Kiev/Svjat-Brov.vec
+%%DATADIR%%/data/Kiev/Theaters.bmp
+%%DATADIR%%/data/Kiev/Theaters.txt
+%%DATADIR%%/data/Kiev/Torgovlia.txt
+%%DATADIR%%/data/Kiev/Vokzals_logo.bmp
+%%DATADIR%%/data/Kiev/beresteyska.png
+%%DATADIR%%/data/Kiev/nivki.png
+%%DATADIR%%/data/London/AddInfo.txt
+%%DATADIR%%/data/London/Airports-Transfer.txt
+%%DATADIR%%/data/London/Airports.txt
+%%DATADIR%%/data/London/Bakerloo.map
+%%DATADIR%%/data/London/Bakerloo.vec
+%%DATADIR%%/data/London/Central.map
+%%DATADIR%%/data/London/Central.vec
+%%DATADIR%%/data/London/Circle.map
+%%DATADIR%%/data/London/Circle.vec
+%%DATADIR%%/data/London/DLR.map
+%%DATADIR%%/data/London/DLR.vec
+%%DATADIR%%/data/London/District.map
+%%DATADIR%%/data/London/District.vec
+%%DATADIR%%/data/London/EastLondon.map
+%%DATADIR%%/data/London/EastLondon.vec
+%%DATADIR%%/data/London/Green Spaces.txt
+%%DATADIR%%/data/London/Jubilee.map
+%%DATADIR%%/data/London/Jubilee.vec
+%%DATADIR%%/data/London/Lifts.txt
+%%DATADIR%%/data/London/London.cty
+%%DATADIR%%/data/London/London.vec
+%%DATADIR%%/data/London/Metro.map
+%%DATADIR%%/data/London/Metro.trp
+%%DATADIR%%/data/London/Metropolitan.map
+%%DATADIR%%/data/London/Metropolitan.vec
+%%DATADIR%%/data/London/Museums.txt
+%%DATADIR%%/data/London/Northern.map
+%%DATADIR%%/data/London/Northern.vec
+%%DATADIR%%/data/London/Piccadilli.map
+%%DATADIR%%/data/London/Piccadilli.vec
+%%DATADIR%%/data/London/SpecialSchedule.txt
+%%DATADIR%%/data/London/Stations.txt
+%%DATADIR%%/data/London/The best.txt
+%%DATADIR%%/data/London/Victoria.map
+%%DATADIR%%/data/London/Victoria.vec
+%%DATADIR%%/data/London/WaterlooAndCity.map
+%%DATADIR%%/data/London/WaterlooAndCity.vec
+%%DATADIR%%/data/Moscow/3d.txt
+%%DATADIR%%/data/Moscow/Absk.bmp
+%%DATADIR%%/data/Moscow/AddInfo.txt
+%%DATADIR%%/data/Moscow/AddTime.txt
+%%DATADIR%%/data/Moscow/Aeroport.vec
+%%DATADIR%%/data/Moscow/AirPorts.txt
+%%DATADIR%%/data/Moscow/AirPorts.vec
+%%DATADIR%%/data/Moscow/Airplane_logo.vec
+%%DATADIR%%/data/Moscow/Akademicheskaya.vec
+%%DATADIR%%/data/Moscow/Alekseevskaya.vec
+%%DATADIR%%/data/Moscow/Altufyevo.vec
+%%DATADIR%%/data/Moscow/Annino.vec
+%%DATADIR%%/data/Moscow/ArbatskayaF.vec
+%%DATADIR%%/data/Moscow/ArbatskoPokrovskayaLine.map
+%%DATADIR%%/data/Moscow/ArbatskoPokrovskayaLine.vec
+%%DATADIR%%/data/Moscow/Aviamotornaya.vec
+%%DATADIR%%/data/Moscow/Avtozavodskaya.vec
+%%DATADIR%%/data/Moscow/Babushkinskaya.vec
+%%DATADIR%%/data/Moscow/Bagrationovskaya.vec
+%%DATADIR%%/data/Moscow/Bank_Moskvy_logo.bmp
+%%DATADIR%%/data/Moscow/Bank_Rosbank_logo.bmp
+%%DATADIR%%/data/Moscow/Bank_SberBank_logo.bmp
+%%DATADIR%%/data/Moscow/Bank_VTB_logo.bmp
+%%DATADIR%%/data/Moscow/Bankomat_Moskvy.txt
+%%DATADIR%%/data/Moscow/Bankomat_Rosbank.txt
+%%DATADIR%%/data/Moscow/Bankomat_SberBank.txt
+%%DATADIR%%/data/Moscow/Bankomat_VTB.txt
+%%DATADIR%%/data/Moscow/Banks.txt
+%%DATADIR%%/data/Moscow/Barrikadnaya.vec
+%%DATADIR%%/data/Moscow/Baumanskaya.vec
+%%DATADIR%%/data/Moscow/Begovaya.vec
+%%DATADIR%%/data/Moscow/BelZ.vec
+%%DATADIR%%/data/Moscow/Belorusskaya.vec
+%%DATADIR%%/data/Moscow/BelorusskayaZhD.map
+%%DATADIR%%/data/Moscow/BelorusskayaZhD.vec
+%%DATADIR%%/data/Moscow/Belyaevo.vec
+%%DATADIR%%/data/Moscow/Beskudnikovo.vec
+%%DATADIR%%/data/Moscow/Bibirevo.vec
+%%DATADIR%%/data/Moscow/BitcevskyPark.vec
+%%DATADIR%%/data/Moscow/Borovitskaya.vec
+%%DATADIR%%/data/Moscow/BotanicheskySad.vec
+%%DATADIR%%/data/Moscow/BoulevardDD.vec
+%%DATADIR%%/data/Moscow/Bratislavskaya.vec
+%%DATADIR%%/data/Moscow/BuladmUshakova.vec
+%%DATADIR%%/data/Moscow/BuninskayaAlleya.vec
+%%DATADIR%%/data/Moscow/ButovskayaLine.map
+%%DATADIR%%/data/Moscow/ButovskayaLine.vec
+%%DATADIR%%/data/Moscow/Chekhov.vec
+%%DATADIR%%/data/Moscow/Cherkizovskaya.vec
+%%DATADIR%%/data/Moscow/Chertanovskaya.vec
+%%DATADIR%%/data/Moscow/Chuhlinka.vec
+%%DATADIR%%/data/Moscow/Cinema.bmp
+%%DATADIR%%/data/Moscow/Cinema.txt
+%%DATADIR%%/data/Moscow/Codes.txt
+%%DATADIR%%/data/Moscow/CvetnoyBulvar.vec
+%%DATADIR%%/data/Moscow/Dates.txt
+%%DATADIR%%/data/Moscow/DelovoyCentr.vec
+%%DATADIR%%/data/Moscow/Depth.txt
+%%DATADIR%%/data/Moscow/Depth1.txt
+%%DATADIR%%/data/Moscow/Dinamo.vec
+%%DATADIR%%/data/Moscow/Dmitrovskaya.vec
+%%DATADIR%%/data/Moscow/DmitrovskayaZhD.vec
+%%DATADIR%%/data/Moscow/Domodedovskaya.vec
+%%DATADIR%%/data/Moscow/Dubna.vec
+%%DATADIR%%/data/Moscow/Dubrovka.vec
+%%DATADIR%%/data/Moscow/ElectroUgli.vec
+%%DATADIR%%/data/Moscow/Electrozavodskaya.vec
+%%DATADIR%%/data/Moscow/ElectrozavodskayaZhD.vec
+%%DATADIR%%/data/Moscow/FilevskayaLine.map
+%%DATADIR%%/data/Moscow/FilevskayaLine.vec
+%%DATADIR%%/data/Moscow/FilevskyPark.vec
+%%DATADIR%%/data/Moscow/Fili.vec
+%%DATADIR%%/data/Moscow/FiliZ.vec
+%%DATADIR%%/data/Moscow/Frunzenskaya.vec
+%%DATADIR%%/data/Moscow/GYandex.txt
+%%DATADIR%%/data/Moscow/Google.txt
+%%DATADIR%%/data/Moscow/GoogleKartaMetro.txt
+%%DATADIR%%/data/Moscow/GorkovskayaZhD.map
+%%DATADIR%%/data/Moscow/GorkovskayaZhD.vec
+%%DATADIR%%/data/Moscow/Hotel.bmp
+%%DATADIR%%/data/Moscow/Hotels.txt
+%%DATADIR%%/data/Moscow/Izmaylovskaya.vec
+%%DATADIR%%/data/Moscow/Kahovskaya.vec
+%%DATADIR%%/data/Moscow/KahovskayaLine.map
+%%DATADIR%%/data/Moscow/KahovskayaLine.vec
+%%DATADIR%%/data/Moscow/KalininskayaLine.map
+%%DATADIR%%/data/Moscow/KalininskayaLine.vec
+%%DATADIR%%/data/Moscow/Kaluzhskaya.vec
+%%DATADIR%%/data/Moscow/KaluzhskoRizhskayaLine.map
+%%DATADIR%%/data/Moscow/KaluzhskoRizhskayaLine.vec
+%%DATADIR%%/data/Moscow/Kantemirovskaya.vec
+%%DATADIR%%/data/Moscow/Kashirskaya.vec
+%%DATADIR%%/data/Moscow/Kievskaya.vec
+%%DATADIR%%/data/Moscow/KievskayaZhD.map
+%%DATADIR%%/data/Moscow/KievskayaZhD.vec
+%%DATADIR%%/data/Moscow/KitayGorod.vec
+%%DATADIR%%/data/Moscow/Kolomenskaya.vec
+%%DATADIR%%/data/Moscow/KoltsevayaLine.map
+%%DATADIR%%/data/Moscow/KoltsevayaLine.vec
+%%DATADIR%%/data/Moscow/Komsomolskaya.vec
+%%DATADIR%%/data/Moscow/Konkovo.vec
+%%DATADIR%%/data/Moscow/Kozhuhovskaya.vec
+%%DATADIR%%/data/Moscow/Krasnogvardeyskaya.vec
+%%DATADIR%%/data/Moscow/Krasnoselskaya.vec
+%%DATADIR%%/data/Moscow/KrasnyeVorota.vec
+%%DATADIR%%/data/Moscow/Kropotkinskaya.vec
+%%DATADIR%%/data/Moscow/Krylatskoe.vec
+%%DATADIR%%/data/Moscow/Kuntsevskaya.vec
+%%DATADIR%%/data/Moscow/Kunz.vec
+%%DATADIR%%/data/Moscow/Kurskaya.vec
+%%DATADIR%%/data/Moscow/KurskayaZhD.map
+%%DATADIR%%/data/Moscow/KurskayaZhD.vec
+%%DATADIR%%/data/Moscow/Kutuzovskaya.vec
+%%DATADIR%%/data/Moscow/Kuzminki.vec
+%%DATADIR%%/data/Moscow/Lening-Bologoe.map
+%%DATADIR%%/data/Moscow/Lening-Bologoe.vec
+%%DATADIR%%/data/Moscow/LeningradskayaZhD.map
+%%DATADIR%%/data/Moscow/LeningradskayaZhD.vec
+%%DATADIR%%/data/Moscow/LeninskyProspekt.vec
+%%DATADIR%%/data/Moscow/Links Mosmetro.txt
+%%DATADIR%%/data/Moscow/Links moscowmap.txt
+%%DATADIR%%/data/Moscow/Links.txt
+%%DATADIR%%/data/Moscow/Lublino.vec
+%%DATADIR%%/data/Moscow/LublinskayaLine.map
+%%DATADIR%%/data/Moscow/LublinskayaLine.vec
+%%DATADIR%%/data/Moscow/Lubyanka.vec
+%%DATADIR%%/data/Moscow/Maryino.vec
+%%DATADIR%%/data/Moscow/Mayakovskaya.vec
+%%DATADIR%%/data/Moscow/Medvedkovo.vec
+%%DATADIR%%/data/Moscow/Metro.map
+%%DATADIR%%/data/Moscow/Metro.trp
+%%DATADIR%%/data/Moscow/MetroTickets.txt
+%%DATADIR%%/data/Moscow/Mezhd.vec
+%%DATADIR%%/data/Moscow/Mob_Beeline_logo.bmp
+%%DATADIR%%/data/Moscow/Mob_CSeparator.txt
+%%DATADIR%%/data/Moscow/Mob_Coverage_Beeline.txt
+%%DATADIR%%/data/Moscow/Mob_Coverage_MegaFon.txt
+%%DATADIR%%/data/Moscow/Mob_Coverage_Mts.txt
+%%DATADIR%%/data/Moscow/Mob_Coverage_WiFi.txt
+%%DATADIR%%/data/Moscow/Mob_MegaFon_logo.bmp
+%%DATADIR%%/data/Moscow/Mob_Mts_logo.bmp
+%%DATADIR%%/data/Moscow/Mob_Office_BeeLine.txt
+%%DATADIR%%/data/Moscow/Mob_Office_Megafon.txt
+%%DATADIR%%/data/Moscow/Mob_Office_Mts.txt
+%%DATADIR%%/data/Moscow/Mob_Separator.txt
+%%DATADIR%%/data/Moscow/Mob_WiFi_logo.bmp
+%%DATADIR%%/data/Moscow/Mob_ZOpened.txt
+%%DATADIR%%/data/Moscow/Molodezhnaya.vec
+%%DATADIR%%/data/Moscow/MonorelsLine.map
+%%DATADIR%%/data/Moscow/MonorelsLine.vec
+%%DATADIR%%/data/Moscow/Moscow.cty
+%%DATADIR%%/data/Moscow/Moscow.grd
+%%DATADIR%%/data/Moscow/Moscow.vec
+%%DATADIR%%/data/Moscow/Mostransavto.txt
+%%DATADIR%%/data/Moscow/Mostransavto_logo.bmp
+%%DATADIR%%/data/Moscow/Museums.bmp
+%%DATADIR%%/data/Moscow/Museums.txt
+%%DATADIR%%/data/Moscow/Nagatinskaya.vec
+%%DATADIR%%/data/Moscow/Nagornaya.vec
+%%DATADIR%%/data/Moscow/NahimovskyProspekt.vec
+%%DATADIR%%/data/Moscow/Novaya.vec
+%%DATADIR%%/data/Moscow/Novogireevo.vec
+%%DATADIR%%/data/Moscow/NovogireevoZhD.vec
+%%DATADIR%%/data/Moscow/Novoslobodskaya.vec
+%%DATADIR%%/data/Moscow/NovyeCheremushki.vec
+%%DATADIR%%/data/Moscow/Octyabrskaya.vec
+%%DATADIR%%/data/Moscow/OktyabrskoePole.vec
+%%DATADIR%%/data/Moscow/Orehovo.vec
+%%DATADIR%%/data/Moscow/Otradnoe.vec
+%%DATADIR%%/data/Moscow/ParkKultury.vec
+%%DATADIR%%/data/Moscow/ParkPobedy.vec
+%%DATADIR%%/data/Moscow/Parks.bmp
+%%DATADIR%%/data/Moscow/Parks.txt
+%%DATADIR%%/data/Moscow/Partizanskaya.vec
+%%DATADIR%%/data/Moscow/Pavelec.vec
+%%DATADIR%%/data/Moscow/PaveleckayaZhd.map
+%%DATADIR%%/data/Moscow/PaveleckayaZhd.vec
+%%DATADIR%%/data/Moscow/Pechatniki.vec
+%%DATADIR%%/data/Moscow/Perovo.vec
+%%DATADIR%%/data/Moscow/Pervomayskaya.vec
+%%DATADIR%%/data/Moscow/PetrovskoRazumovskaya.vec
+%%DATADIR%%/data/Moscow/Photo.txt
+%%DATADIR%%/data/Moscow/Pionerskaya.vec
+%%DATADIR%%/data/Moscow/Planernaya.vec
+%%DATADIR%%/data/Moscow/Podbelskogo.vec
+%%DATADIR%%/data/Moscow/Pods.vec
+%%DATADIR%%/data/Moscow/Polezhaevskaya.vec
+%%DATADIR%%/data/Moscow/Polyanka.vec
+%%DATADIR%%/data/Moscow/Posol.bmp
+%%DATADIR%%/data/Moscow/Posol.txt
+%%DATADIR%%/data/Moscow/Prazhskaya.vec
+%%DATADIR%%/data/Moscow/Preobrazhenskaya.vec
+%%DATADIR%%/data/Moscow/Profsoyuznaya.vec
+%%DATADIR%%/data/Moscow/Proletarskaya.vec
+%%DATADIR%%/data/Moscow/ProspektMira.vec
+%%DATADIR%%/data/Moscow/Pushkinskaya.vec
+%%DATADIR%%/data/Moscow/RabochiyPoselok.vec
+%%DATADIR%%/data/Moscow/RailWay.map
+%%DATADIR%%/data/Moscow/RailWay.vec
+%%DATADIR%%/data/Moscow/Rastorguevo.vec
+%%DATADIR%%/data/Moscow/Razdory.vec
+%%DATADIR%%/data/Moscow/RechnoyTram.txt
+%%DATADIR%%/data/Moscow/RechnoyTram.vec
+%%DATADIR%%/data/Moscow/RechnoyTramvay.map
+%%DATADIR%%/data/Moscow/RechnoyTramvay.vec
+%%DATADIR%%/data/Moscow/RechnoyVokzal.vec
+%%DATADIR%%/data/Moscow/Rechnoy_logo.vec
+%%DATADIR%%/data/Moscow/Reutovo.vec
+%%DATADIR%%/data/Moscow/Rimskaya.vec
+%%DATADIR%%/data/Moscow/Rizhskaya.vec
+%%DATADIR%%/data/Moscow/RizhskayaZhD.map
+%%DATADIR%%/data/Moscow/RizhskayaZhD.vec
+%%DATADIR%%/data/Moscow/RyazanskayaZhD.map
+%%DATADIR%%/data/Moscow/RyazanskayaZhD.vec
+%%DATADIR%%/data/Moscow/RyazanskiyProspekt.vec
+%%DATADIR%%/data/Moscow/SHCHukinskaya.vec
+%%DATADIR%%/data/Moscow/Savelovskaya.vec
+%%DATADIR%%/data/Moscow/SavelovskayaZhD.map
+%%DATADIR%%/data/Moscow/SavelovskayaZhD.vec
+%%DATADIR%%/data/Moscow/Schelkovskaya.vec
+%%DATADIR%%/data/Moscow/Semenovskaya.vec
+%%DATADIR%%/data/Moscow/Serpuhovskaya.vec
+%%DATADIR%%/data/Moscow/SerpuhovskoTimiryazevskayaLine.map
+%%DATADIR%%/data/Moscow/SerpuhovskoTimiryazevskayaLine.vec
+%%DATADIR%%/data/Moscow/Setun.vec
+%%DATADIR%%/data/Moscow/Shabolovskaya.vec
+%%DATADIR%%/data/Moscow/Shodnenskaya.vec
+%%DATADIR%%/data/Moscow/Shops.txt
+%%DATADIR%%/data/Moscow/ShosseEnt.vec
+%%DATADIR%%/data/Moscow/SlavyanskiyBulvar.vec
+%%DATADIR%%/data/Moscow/SmolenskayaAPL.vec
+%%DATADIR%%/data/Moscow/SmolenskayaFL.vec
+%%DATADIR%%/data/Moscow/Sokol.vec
+%%DATADIR%%/data/Moscow/SokolnicheskayaLine.map
+%%DATADIR%%/data/Moscow/SokolnicheskayaLine.vec
+%%DATADIR%%/data/Moscow/Sokolniki.vec
+%%DATADIR%%/data/Moscow/SolncevskayaLine.map
+%%DATADIR%%/data/Moscow/SolncevskayaLine.vec
+%%DATADIR%%/data/Moscow/Sportivnaya.vec
+%%DATADIR%%/data/Moscow/Strogino.vec
+%%DATADIR%%/data/Moscow/Studencheskaya.vec
+%%DATADIR%%/data/Moscow/Suharevskaya.vec
+%%DATADIR%%/data/Moscow/Sviblovo.vec
+%%DATADIR%%/data/Moscow/TSaritsyno.vec
+%%DATADIR%%/data/Moscow/Taganskaya.vec
+%%DATADIR%%/data/Moscow/TaganskoKrasnopresnenskayaLine.map
+%%DATADIR%%/data/Moscow/TaganskoKrasnopresnenskayaLine.vec
+%%DATADIR%%/data/Moscow/Teatralnaya.vec
+%%DATADIR%%/data/Moscow/Tekstilshchiki.vec
+%%DATADIR%%/data/Moscow/TeleCentr.vec
+%%DATADIR%%/data/Moscow/TeplyStan.vec
+%%DATADIR%%/data/Moscow/Test.vec
+%%DATADIR%%/data/Moscow/Testovskaya.vec
+%%DATADIR%%/data/Moscow/Theaters.bmp
+%%DATADIR%%/data/Moscow/Theaters.txt
+%%DATADIR%%/data/Moscow/Timiryazevskaya.vec
+%%DATADIR%%/data/Moscow/TimiryazevskayaMonorels.vec
+%%DATADIR%%/data/Moscow/Tramways.map
+%%DATADIR%%/data/Moscow/Tramways.vec
+%%DATADIR%%/data/Moscow/TramwaysS.map
+%%DATADIR%%/data/Moscow/Tretyakovskaya.vec
+%%DATADIR%%/data/Moscow/Tserkvi.bmp
+%%DATADIR%%/data/Moscow/Tserkvi.txt
+%%DATADIR%%/data/Moscow/Tulskaya.vec
+%%DATADIR%%/data/Moscow/Turgenevskaya.vec
+%%DATADIR%%/data/Moscow/Turnikets.txt
+%%DATADIR%%/data/Moscow/Tushinskaya.vec
+%%DATADIR%%/data/Moscow/Tutu.txt
+%%DATADIR%%/data/Moscow/UlSkobelevskaya.vec
+%%DATADIR%%/data/Moscow/UlitcaGorchakova.vec
+%%DATADIR%%/data/Moscow/Ulitsa1905goda.vec
+%%DATADIR%%/data/Moscow/UlitsaAkademikaKoroleva.vec
+%%DATADIR%%/data/Moscow/UlitsaMilashenkova.vec
+%%DATADIR%%/data/Moscow/UlitsaSergeyaEizenshteina.vec
+%%DATADIR%%/data/Moscow/UlitsaYangela.vec
+%%DATADIR%%/data/Moscow/Universitet.vec
+%%DATADIR%%/data/Moscow/Uzhnaya.vec
+%%DATADIR%%/data/Moscow/VDNH-VystavochnyCentr.vec
+%%DATADIR%%/data/Moscow/VDNH.vec
+%%DATADIR%%/data/Moscow/Vagons.txt
+%%DATADIR%%/data/Moscow/Varshavskaya.vec
+%%DATADIR%%/data/Moscow/Vectors.txt
+%%DATADIR%%/data/Moscow/Vectors2.txt
+%%DATADIR%%/data/Moscow/Vernadskogo.vec
+%%DATADIR%%/data/Moscow/Vladykino.vec
+%%DATADIR%%/data/Moscow/VodnyStadion.vec
+%%DATADIR%%/data/Moscow/Vokzals.txt
+%%DATADIR%%/data/Moscow/Vokzals.vec
+%%DATADIR%%/data/Moscow/Vokzals_logo.bmp
+%%DATADIR%%/data/Moscow/Vokzals_logo.vec
+%%DATADIR%%/data/Moscow/VolgogradskiyProspekt.vec
+%%DATADIR%%/data/Moscow/Volokolamskaya.vec
+%%DATADIR%%/data/Moscow/Volzhskaya.vec
+%%DATADIR%%/data/Moscow/VorobevyGory.vec
+%%DATADIR%%/data/Moscow/Voykovskaya.vec
+%%DATADIR%%/data/Moscow/Vuz.bmp
+%%DATADIR%%/data/Moscow/Vuz.txt
+%%DATADIR%%/data/Moscow/Vyhino.vec
+%%DATADIR%%/data/Moscow/VystavochnyCentr.vec
+%%DATADIR%%/data/Moscow/YaroslavskayaZhD.map
+%%DATADIR%%/data/Moscow/YaroslavskayaZhD.vec
+%%DATADIR%%/data/Moscow/Yasenevo.vec
+%%DATADIR%%/data/Moscow/YugoZapadnaya.vec
+%%DATADIR%%/data/Moscow/ZamoskvoreckayaLine.map
+%%DATADIR%%/data/Moscow/ZamoskvoreckayaLine.vec
+%%DATADIR%%/data/Moscow/tramwaysNW.map
+%%DATADIR%%/data/Moscow/tramwaysNW.vec
+%%DATADIR%%/data/Moscow/tramwaysS.vec
+%%DATADIR%%/data/Peterburg/1.map
+%%DATADIR%%/data/Peterburg/1.vec
+%%DATADIR%%/data/Peterburg/2.map
+%%DATADIR%%/data/Peterburg/2.vec
+%%DATADIR%%/data/Peterburg/3.map
+%%DATADIR%%/data/Peterburg/3.vec
+%%DATADIR%%/data/Peterburg/4.map
+%%DATADIR%%/data/Peterburg/4.vec
+%%DATADIR%%/data/Peterburg/AddTime.txt
+%%DATADIR%%/data/Peterburg/Addinfo.txt
+%%DATADIR%%/data/Peterburg/AirPort.txt
+%%DATADIR%%/data/Peterburg/Airplane_logo.vec
+%%DATADIR%%/data/Peterburg/Akademicheskaya.vec
+%%DATADIR%%/data/Peterburg/AleksandraNevskogo.vec
+%%DATADIR%%/data/Peterburg/Avtovo.vec
+%%DATADIR%%/data/Peterburg/Baltiyskaya.vec
+%%DATADIR%%/data/Peterburg/Bank_SberBank_logo.bmp
+%%DATADIR%%/data/Peterburg/Bank_VTB_logo.bmp
+%%DATADIR%%/data/Peterburg/Bankomat_SberBank.txt
+%%DATADIR%%/data/Peterburg/Bankomat_VTB_metro.txt
+%%DATADIR%%/data/Peterburg/ChernayaRechka.vec
+%%DATADIR%%/data/Peterburg/Chernyshevskaya.vec
+%%DATADIR%%/data/Peterburg/Chkalovskaya.vec
+%%DATADIR%%/data/Peterburg/Cinema.bmp
+%%DATADIR%%/data/Peterburg/Cinema.txt
+%%DATADIR%%/data/Peterburg/Devyatkino.vec
+%%DATADIR%%/data/Peterburg/Electrosila.vec
+%%DATADIR%%/data/Peterburg/Elizarovskaya.vec
+%%DATADIR%%/data/Peterburg/Frunzenskaya.vec
+%%DATADIR%%/data/Peterburg/Gorkovskaya.vec
+%%DATADIR%%/data/Peterburg/GrazhdanskyPr.vec
+%%DATADIR%%/data/Peterburg/Hotel.bmp
+%%DATADIR%%/data/Peterburg/Hotels.txt
+%%DATADIR%%/data/Peterburg/KirovskyZavod.vec
+%%DATADIR%%/data/Peterburg/KomendantskyPr.vec
+%%DATADIR%%/data/Peterburg/KrestovskiyOstrov.vec
+%%DATADIR%%/data/Peterburg/Kupchino.vec
+%%DATADIR%%/data/Peterburg/Ladozhskaya.vec
+%%DATADIR%%/data/Peterburg/LeninskyPr.vec
+%%DATADIR%%/data/Peterburg/Lesnaya.vec
+%%DATADIR%%/data/Peterburg/LigovskiyPr.vec
+%%DATADIR%%/data/Peterburg/Links.txt
+%%DATADIR%%/data/Peterburg/Lomonosovskaya.vec
+%%DATADIR%%/data/Peterburg/Maps.txt
+%%DATADIR%%/data/Peterburg/Metro.map
+%%DATADIR%%/data/Peterburg/Metro.trp
+%%DATADIR%%/data/Peterburg/Mob_Beeline_logo.bmp
+%%DATADIR%%/data/Peterburg/Mob_CSeparator.txt
+%%DATADIR%%/data/Peterburg/Mob_Coverage_Beeline.txt
+%%DATADIR%%/data/Peterburg/Mob_Coverage_MegaFon.txt
+%%DATADIR%%/data/Peterburg/Mob_Coverage_Mts.txt
+%%DATADIR%%/data/Peterburg/Mob_Coverage_Railways_All.txt
+%%DATADIR%%/data/Peterburg/Mob_Coverage_SkyLink.txt
+%%DATADIR%%/data/Peterburg/Mob_Coverage_Tele2.txt
+%%DATADIR%%/data/Peterburg/Mob_Coverage_WiFi.txt
+%%DATADIR%%/data/Peterburg/Mob_MegaFon_logo.bmp
+%%DATADIR%%/data/Peterburg/Mob_Mts_logo.bmp
+%%DATADIR%%/data/Peterburg/Mob_Office_BeeLine.txt
+%%DATADIR%%/data/Peterburg/Mob_Office_Megafon.txt
+%%DATADIR%%/data/Peterburg/Mob_Office_Mts.txt
+%%DATADIR%%/data/Peterburg/Mob_Office_SkyLink.txt
+%%DATADIR%%/data/Peterburg/Mob_Office_Tele2.txt
+%%DATADIR%%/data/Peterburg/Mob_Separator.txt
+%%DATADIR%%/data/Peterburg/Mob_SkyLink_logo.bmp
+%%DATADIR%%/data/Peterburg/Mob_Tele2_logo.bmp
+%%DATADIR%%/data/Peterburg/Mob_WiFi_logo.bmp
+%%DATADIR%%/data/Peterburg/Mob_ZOpened.txt
+%%DATADIR%%/data/Peterburg/MoskVorota.vec
+%%DATADIR%%/data/Peterburg/Moskovskaya.vec
+%%DATADIR%%/data/Peterburg/Museums.bmp
+%%DATADIR%%/data/Peterburg/Museums.txt
+%%DATADIR%%/data/Peterburg/Narvskaya.vec
+%%DATADIR%%/data/Peterburg/NevskiPr-GostinyDvor.vec
+%%DATADIR%%/data/Peterburg/Novocherkasskaya.vec
+%%DATADIR%%/data/Peterburg/Obukhovo.vec
+%%DATADIR%%/data/Peterburg/Ozerki.vec
+%%DATADIR%%/data/Peterburg/ParkPobedy.vec
+%%DATADIR%%/data/Peterburg/Parnas.vec
+%%DATADIR%%/data/Peterburg/Peterburg.cty
+%%DATADIR%%/data/Peterburg/Peterburg.grd
+%%DATADIR%%/data/Peterburg/Peterburg.vec
+%%DATADIR%%/data/Peterburg/Petrogradskaya.vec
+%%DATADIR%%/data/Peterburg/Photo.txt
+%%DATADIR%%/data/Peterburg/Pionerskaya.vec
+%%DATADIR%%/data/Peterburg/PlLenina.vec
+%%DATADIR%%/data/Peterburg/PlMuzhestva.vec
+%%DATADIR%%/data/Peterburg/PlVosstania-Mayakovskaya.vec
+%%DATADIR%%/data/Peterburg/Polytech.vec
+%%DATADIR%%/data/Peterburg/PrBolshevikov.vec
+%%DATADIR%%/data/Peterburg/PrProsvescheniya.vec
+%%DATADIR%%/data/Peterburg/PrVeteranov.vec
+%%DATADIR%%/data/Peterburg/Primorskaya.vec
+%%DATADIR%%/data/Peterburg/Proletarskaya.vec
+%%DATADIR%%/data/Peterburg/Pushkinskaya.vec
+%%DATADIR%%/data/Peterburg/Railways_Baltic.map
+%%DATADIR%%/data/Peterburg/Railways_Baltic.vec
+%%DATADIR%%/data/Peterburg/Railways_Bologoe.map
+%%DATADIR%%/data/Peterburg/Railways_Bologoe.vec
+%%DATADIR%%/data/Peterburg/Railways_Finland.map
+%%DATADIR%%/data/Peterburg/Railways_Finland.vec
+%%DATADIR%%/data/Peterburg/Railways_Moscow.map
+%%DATADIR%%/data/Peterburg/Railways_Moscow.vec
+%%DATADIR%%/data/Peterburg/Railways_Novgorod_Pskov.map
+%%DATADIR%%/data/Peterburg/Railways_Novgorod_Pskov.vec
+%%DATADIR%%/data/Peterburg/Railways_Vitebsk.map
+%%DATADIR%%/data/Peterburg/Railways_Vitebsk.vec
+%%DATADIR%%/data/Peterburg/Rybatskoe.vec
+%%DATADIR%%/data/Peterburg/Sadovaya-SennayaPl.vec
+%%DATADIR%%/data/Peterburg/Shops.txt
+%%DATADIR%%/data/Peterburg/Sportivnaya.vec
+%%DATADIR%%/data/Peterburg/StarayaDerevnya.vec
+%%DATADIR%%/data/Peterburg/Stations.txt
+%%DATADIR%%/data/Peterburg/TechInstitut.vec
+%%DATADIR%%/data/Peterburg/Tutu.txt
+%%DATADIR%%/data/Peterburg/Udelnaya.vec
+%%DATADIR%%/data/Peterburg/UlDybenko.vec
+%%DATADIR%%/data/Peterburg/Vagons.txt
+%%DATADIR%%/data/Peterburg/Vasileostrovskaya.vec
+%%DATADIR%%/data/Peterburg/Vectors.txt
+%%DATADIR%%/data/Peterburg/Vladimirskaya-Dostoevskaya.vec
+%%DATADIR%%/data/Peterburg/Vokzal.txt
+%%DATADIR%%/data/Peterburg/Vokzals_logo.bmp
+%%DATADIR%%/data/Peterburg/Vuz.bmp
+%%DATADIR%%/data/Peterburg/Vuz.txt
+%%DATADIR%%/data/Peterburg/Vyborgskaya.vec
+%%DATADIR%%/data/Peterburg/Zvezdnaya.vec
 %%DATADIR%%/modules/FindPath.py
-%%DATADIR%%/modules/FindPath.pyc
 %%DATADIR%%/modules/Interface.py
-%%DATADIR%%/modules/Interface.pyc
 %%DATADIR%%/modules/MapDisplay.py
-%%DATADIR%%/modules/MapDisplay.pyc
 %%DATADIR%%/modules/ReadMap.py
-%%DATADIR%%/modules/ReadMap.pyc
-@dirrm %%DATADIR%%/data/Berlin
-@dirrm %%DATADIR%%/data/KievUkr
-@dirrm %%DATADIR%%/data/London
-@dirrm %%DATADIR%%/data/Moscow
+@dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%/data/Peterburg
+@dirrm %%DATADIR%%/data/Moscow
+@dirrm %%DATADIR%%/data/London
+@dirrm %%DATADIR%%/data/Kiev
+@dirrm %%DATADIR%%/data/Berlin
 @dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/modules
 @dirrm %%DATADIR%%
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry share/locale/ru