2 files changed, 11 insertions, 15 deletions

diff --git a/russian/fortune-bashorgru/Makefile b/russian/fortune-bashorgru/Makefile
index 451f0919c35e..1911ea10029a 100644
--- a/russian/fortune-bashorgru/Makefile
+++ b/russian/fortune-bashorgru/Makefile
@@ -14,16 +14,12 @@ NO_BUILD=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME}
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${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/* ${PREFIX}/share/games/fortune/ru_RU.UTF-8/
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/koi8-r/* ${PREFIX}/share/games/fortune/ru_RU.KOI8-R/
-	${INSTALL_DATA} ${WRKSRC}/fortune-update.py ${EXAMPLESDIR}/
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune/ru_RU.UTF-8
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune/ru_RU.KOI8-R
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/utf-8/* ${STAGEDIR}${PREFIX}/share/games/fortune/ru_RU.UTF-8/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/koi8-r/* ${STAGEDIR}${PREFIX}/share/games/fortune/ru_RU.KOI8-R/
+	${INSTALL_DATA} ${WRKSRC}/fortune-update.py ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/russian/fortune-bashorgru/pkg-plist b/russian/fortune-bashorgru/pkg-plist
index e846335c7776..e44db875de12 100644
--- a/russian/fortune-bashorgru/pkg-plist
+++ b/russian/fortune-bashorgru/pkg-plist
@@ -1,14 +1,14 @@
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fortune-update.py
 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.KOI8-R/fortune-bashorgru.dat
+share/games/fortune/ru_RU.UTF-8/fortune-bashorgru
 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
+share/games/fortune/ru_RU.UTF-8/fortune-bashorgru.dat
 @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
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%