Upgrade to 0.3.

PR:		48236
Submitted by:	Oleksandr Bezpalko <bestia@de22.kiev.ua>

5 files changed, 27 insertions, 16 deletions

diff --git a/russian/fortuneru/Makefile b/russian/fortuneru/Makefile
index 4b06e6bf7f40..a4a48bf095db 100644
--- a/russian/fortuneru/Makefile
+++ b/russian/fortuneru/Makefile
@@ -6,34 +6,45 @@
 #
 
 PORTNAME=	fortuneru
-PORTVERSION=	0.2
+PORTVERSION=	0.3
 CATEGORIES=	russian
-MASTER_SITES=	ftp://de22.kiev.ua/pub/files/
+MASTER_SITES=	ftp://de22.kiev.ua/pub/files/ \
+		ftp://hosting.cvu.kiev.ua/pub/files/ \
+		ftp://viva-solutions.com.ua/pub/files/
 DISTNAME=	fortune.ru-${PORTVERSION}
 
-MAINTAINER=	bestia@iptcom.net
+MAINTAINER=	bestia@de22.kiev.ua
+COMMENT=	Fortunes in russian
 
 NO_BUILD=	yes
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 STRCMD=		/usr/games/strfile
-FORTUNES=	4hf aphorizms beer-murphy enciklopedy fomenko fortune_rus \
-		guberman marazm maxim_and_fedor murphy police speed-info \
-		strug usenet verse windows_errors
+FORTUNES=	4hf beer-murphy enciklopedy fortune_rus \
+		guberman marazm maxim_and_fedor murphy police \
+		strug usenet verse windows_errors pavlenka fomenko speed-info
 
 do-install:
 	@${SETENV} STRCMD=${STRCMD} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	${SED} -e "s,%%PREFIX%%,${PREFIX}," < ${FILESDIR}/pkg-message.in > \
-		${PKGMESSAGE}
 	@${MKDIR} ${PREFIX}/share/games/fortune/rus
 .for fortune in ${FORTUNES}
 	${INSTALL_DATA} ${WRKSRC}/${fortune} ${PREFIX}/share/games/fortune/rus
 .endfor
+
+pre-install:
+.if !exists(${STRCMD})
+	@${ECHO_MSG}   "Please install the games distribution"
+	@exit 1
+.endif
+
+post-install:
 .for fortune in ${FORTUNES}
-	${STRCMD} ${PREFIX}/share/games/fortune/rus/${fortune} \
-		>/dev/null 2>/dev/null
+	${STRCMD} ${PREFIX}/share/games/fortune/rus/${fortune} >/dev/null 2>/dev/null
 .endfor
-	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Usage:"
+	@${ECHO_MSG} "/usr/games/fortune ${PREFIX}/share/games/fortune/rus"
+	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/russian/fortuneru/distinfo b/russian/fortuneru/distinfo
index 8d5d08aae92f..8f280490abc2 100644
--- a/russian/fortuneru/distinfo
+++ b/russian/fortuneru/distinfo
@@ -1 +1 @@
-MD5 (fortune.ru-0.2.tar.gz) = f374f6368545d1d4d6505be24bf96fb4
+MD5 (fortune.ru-0.3.tar.gz) = 11cd4b517e15254979934b2099a62c22
diff --git a/russian/fortuneru/pkg-comment b/russian/fortuneru/pkg-comment
deleted file mode 100644
index 87d00de0be04..000000000000
--- a/russian/fortuneru/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fortune file in Russian
diff --git a/russian/fortuneru/pkg-descr b/russian/fortuneru/pkg-descr
index 84dc16393092..1780c1505c8c 100644
--- a/russian/fortuneru/pkg-descr
+++ b/russian/fortuneru/pkg-descr
@@ -1,3 +1,3 @@
 This package contains fortune files in Russian.
 
-- ported to FreeBSD by bestia (bestia@iptcom.net)
+- ported to FreeBSD by bestia (bestia@de22.kiev.ua)
diff --git a/russian/fortuneru/pkg-plist b/russian/fortuneru/pkg-plist
index 7c00bc005aaa..dc988e50c80f 100644
--- a/russian/fortuneru/pkg-plist
+++ b/russian/fortuneru/pkg-plist
@@ -1,7 +1,6 @@
+@comment $FreeBSD$
 share/games/fortune/rus/4hf
 share/games/fortune/rus/4hf.dat
-share/games/fortune/rus/aphorizms
-share/games/fortune/rus/aphorizms.dat
 share/games/fortune/rus/beer-murphy
 share/games/fortune/rus/beer-murphy.dat
 share/games/fortune/rus/enciklopedy
@@ -30,6 +29,8 @@ share/games/fortune/rus/verse
 share/games/fortune/rus/verse.dat
 share/games/fortune/rus/windows_errors
 share/games/fortune/rus/windows_errors.dat
+share/games/fortune/rus/pavlenka
+share/games/fortune/rus/pavlenka.dat
 @dirrm share/games/fortune/rus
 @unexec rmdir %D/share/games/fortune 2>/dev/null || true
 @unexec rmdir %D/share/games 2>/dev/null || true