- Update to 20070808 [1]

- Extract messages from post-install into pkg-message [2]
- Use EXAMPLESDIR [2]

PR:		ports/115295 [1]
Submitted by:	Denis Barov <dindin at dindin.ru> (maintainer) [1]
Approved by:	Denis Barov <dindin at dindin.ru> (maintainer) [2]

5 files changed, 23 insertions, 15 deletions

diff --git a/russian/fortune-bashorgru/Makefile b/russian/fortune-bashorgru/Makefile
index e79e47d0886d..8b274bf427b6 100644
--- a/russian/fortune-bashorgru/Makefile
+++ b/russian/fortune-bashorgru/Makefile
@@ -6,28 +6,25 @@
 #
 
 PORTNAME=	fortune-bashorgru
-PORTVERSION=	20070723
+PORTVERSION=	20070808
 CATEGORIES=	russian
 MASTER_SITES=	http://www.dindin.ru/download/
 
 MAINTAINER=	dindin@dindin.ru
-COMMENT=	Fortunes from bash.org.ru
+COMMENT=	Fortunes from bash.org.ru and freebsd.rusnet.org.ru/bash
 
 NO_BUILD=	yes
 
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTNAME=${PORTNAME}
+
 do-install:
-	@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}/
+	@${MKDIR} ${EXAMPLESDIR}
 	@${MKDIR} ${PREFIX}/share/games/fortune/rus
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/* ${PREFIX}/share/games/fortune/rus
-	${INSTALL_DATA} ${WRKSRC}/fortune-update.sh ${PREFIX}/share/examples/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/fortune-update.sh ${EXAMPLESDIR}/
 
 post-install:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Usage:"
-	@${ECHO_MSG} "/usr/games/fortune ${PREFIX}/share/games/fortune/rus/${PORTNAME}"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Example script to keep your fortune up to date placed in"
-	@${ECHO_MSG} "${PREFIX}/share/examples/${PORTNAME}/"
-	@${ECHO_MSG} ""
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/russian/fortune-bashorgru/distinfo b/russian/fortune-bashorgru/distinfo
index dc0e8e682819..76e0160b625a 100644
--- a/russian/fortune-bashorgru/distinfo
+++ b/russian/fortune-bashorgru/distinfo
@@ -1,3 +1,3 @@
-MD5 (fortune-bashorgru-20070723.tar.gz) = 093634a8432bb87abc35167a60aadfb6
-SHA256 (fortune-bashorgru-20070723.tar.gz) = aef2ec353b80a3ca532106897e205e86bc711d6ac3dbff258c9f12cb90577364
-SIZE (fortune-bashorgru-20070723.tar.gz) = 1156029
+MD5 (fortune-bashorgru-20070808.tar.gz) = f4c90f6e5854c33ac924ab16bf0d3137
+SHA256 (fortune-bashorgru-20070808.tar.gz) = 782efd2bc538d80e35fe71146b07052764c326d903cf27fcd3d80954f15f1199
+SIZE (fortune-bashorgru-20070808.tar.gz) = 1214657
diff --git a/russian/fortune-bashorgru/files/pkg-message.in b/russian/fortune-bashorgru/files/pkg-message.in
new file mode 100644
index 000000000000..829c23acfa19
--- /dev/null
+++ b/russian/fortune-bashorgru/files/pkg-message.in
@@ -0,0 +1,8 @@
+
+Usage:
+/usr/games/fortune %%PREFIX%%/share/games/fortune/rus/%%PORTNAME%%
+or
+/usr/games/fortune %%PREFIX%%/share/games/fortune/rus/%%PORTNAME%%-freebsd
+
+Example script to keep your fortune up to date placed in
+%%EXAMPLESDIR%%/
diff --git a/russian/fortune-bashorgru/pkg-descr b/russian/fortune-bashorgru/pkg-descr
index 42a4864bf193..4f00ab02da8d 100644
--- a/russian/fortune-bashorgru/pkg-descr
+++ b/russian/fortune-bashorgru/pkg-descr
@@ -1,4 +1,5 @@
-This package contains fortune files maked from popular russian site bash.org.ru.
+This package contains fortune files made from popular russian site bash.org.ru
+and from another site, http://freebsd.rusnet.org.ru/bash.
 Also it contains example script to keep your bash.org.ru fortunes up to date.
 
 WWW:	http://bash.org.ru
diff --git a/russian/fortune-bashorgru/pkg-plist b/russian/fortune-bashorgru/pkg-plist
index 98470e94a6e6..c23e6855761d 100644
--- a/russian/fortune-bashorgru/pkg-plist
+++ b/russian/fortune-bashorgru/pkg-plist
@@ -1,5 +1,7 @@
 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
 @dirrmtry share/examples/fortune-bashorgru