4 files changed, 30 insertions, 17 deletions

diff --git a/russian/fortune-bashorgru/Makefile b/russian/fortune-bashorgru/Makefile
index 8b274bf427b6..e9e55814bc86 100644
--- a/russian/fortune-bashorgru/Makefile
+++ b/russian/fortune-bashorgru/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fortune-bashorgru
-PORTVERSION=	20070808
+PORTVERSION=	20080903
 CATEGORIES=	russian
 MASTER_SITES=	http://www.dindin.ru/download/
 
@@ -20,9 +20,17 @@ SUB_LIST=	PORTNAME=${PORTNAME}
 
 do-install:
 	@${MKDIR} ${EXAMPLESDIR}
-	@${MKDIR} ${PREFIX}/share/games/fortune/rus
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/* ${PREFIX}/share/games/fortune/rus
-	${INSTALL_DATA} ${WRKSRC}/fortune-update.sh ${EXAMPLESDIR}/
+	@${MKDIR} ${PREFIX}/share/games/fortune/ru_RU.UTF-8
+	@${MKDIR} ${PREFIX}/share/games/fortune/ru_RU.KOI8-R
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/utf-8/fortune-bashorgru ${PREFIX}/share/games/fortune/ru_RU.UTF-8/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/utf-8/fortune-bashorgru.dat ${PREFIX}/share/games/fortune/ru_RU.UTF-8/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/utf-8/fortune-bashorgru-freebsd ${PREFIX}/share/games/fortune/ru_RU.UTF-8/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/utf-8/fortune-bashorgru-freebsd.dat ${PREFIX}/share/games/fortune/ru_RU.UTF-8/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/koi8-r/fortune-bashorgru ${PREFIX}/share/games/fortune/ru_RU.KOI8-R/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/koi8-r/fortune-bashorgru.dat ${PREFIX}/share/games/fortune/ru_RU.KOI8-R/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/koi8-r/fortune-bashorgru-freebsd ${PREFIX}/share/games/fortune/ru_RU.KOI8-R/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/koi8-r/fortune-bashorgru-freebsd.dat ${PREFIX}/share/games/fortune/ru_RU.KOI8-R/
+	${INSTALL_DATA} ${WRKSRC}/fortune-update.py ${EXAMPLESDIR}/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/russian/fortune-bashorgru/distinfo b/russian/fortune-bashorgru/distinfo
index 76e0160b625a..4defb7178c11 100644
--- a/russian/fortune-bashorgru/distinfo
+++ b/russian/fortune-bashorgru/distinfo
@@ -1,3 +1,3 @@
-MD5 (fortune-bashorgru-20070808.tar.gz) = f4c90f6e5854c33ac924ab16bf0d3137
-SHA256 (fortune-bashorgru-20070808.tar.gz) = 782efd2bc538d80e35fe71146b07052764c326d903cf27fcd3d80954f15f1199
-SIZE (fortune-bashorgru-20070808.tar.gz) = 1214657
+MD5 (fortune-bashorgru-20080903.tar.gz) = 49ae6ce702723f0ffdec427f3f65102f
+SHA256 (fortune-bashorgru-20080903.tar.gz) = e732fdfc905f0fbf44fbcc80e7b9901dfaa5aac3c231007c14627f8bf8b3bb23
+SIZE (fortune-bashorgru-20080903.tar.gz) = 4713455
diff --git a/russian/fortune-bashorgru/files/pkg-message.in b/russian/fortune-bashorgru/files/pkg-message.in
index 829c23acfa19..79f5bc4e030a 100644
--- a/russian/fortune-bashorgru/files/pkg-message.in
+++ b/russian/fortune-bashorgru/files/pkg-message.in
@@ -1,8 +1,8 @@
 
-Usage:
-/usr/games/fortune %%PREFIX%%/share/games/fortune/rus/%%PORTNAME%%
-or
-/usr/games/fortune %%PREFIX%%/share/games/fortune/rus/%%PORTNAME%%-freebsd
+Usage (if you are using utf-8):
+/usr/games/fortune %%PREFIX%%/share/games/fortune/ru_RU.UTF-8
+or (if you are using koi8-r)
+/usr/games/fortune %%PREFIX%%/share/games/fortune/ru_RU.KOI8-R
 
 Example script to keep your fortune up to date placed in
 %%EXAMPLESDIR%%/
diff --git a/russian/fortune-bashorgru/pkg-plist b/russian/fortune-bashorgru/pkg-plist
index c23e6855761d..e846335c7776 100644
--- a/russian/fortune-bashorgru/pkg-plist
+++ b/russian/fortune-bashorgru/pkg-plist
@@ -1,9 +1,14 @@
-share/games/fortune/rus/fortune-bashorgru
-share/games/fortune/rus/fortune-bashorgru.dat
-share/games/fortune/rus/fortune-bashorgru-freebsd
-share/games/fortune/rus/fortune-bashorgru-freebsd.dat
-share/examples/fortune-bashorgru/fortune-update.sh
-@dirrmtry share/games/fortune/rus
+share/games/fortune/ru_RU.KOI8-R/fortune-bashorgru
+share/games/fortune/ru_RU.KOI8-R/fortune-bashorgru.dat
+share/games/fortune/ru_RU.UTF-8/fortune-bashorgru
+share/games/fortune/ru_RU.UTF-8/fortune-bashorgru.dat
+share/games/fortune/ru_RU.KOI8-R/fortune-bashorgru-freebsd
+share/games/fortune/ru_RU.KOI8-R/fortune-bashorgru-freebsd.dat
+share/games/fortune/ru_RU.UTF-8/fortune-bashorgru-freebsd
+share/games/fortune/ru_RU.UTF-8/fortune-bashorgru-freebsd.dat
+share/examples/fortune-bashorgru/fortune-update.py
+@dirrmtry share/games/fortune/ru_RU.UTF-8
+@dirrmtry share/games/fortune/ru_RU.KOI8-R
 @dirrmtry share/examples/fortune-bashorgru
 @dirrmtry share/games/fortune
 @dirrmtry share/games