Unbreak on head

4 files changed, 13 insertions, 46 deletions

diff --git a/russian/fortune-bashorgru/Makefile b/russian/fortune-bashorgru/Makefile
index 1911ea10029a..8e33b1a19e6d 100644
--- a/russian/fortune-bashorgru/Makefile
+++ b/russian/fortune-bashorgru/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fortune-bashorgru
 PORTVERSION=	20080903
+PORTREVISION=	1
 CATEGORIES=	russian
 MASTER_SITES=	http://limbo.xim.bz/distfiles/
 
diff --git a/russian/fortune-bashorgru/pkg-install b/russian/fortune-bashorgru/pkg-install
deleted file mode 100644
index ef0a609588c6..000000000000
--- a/russian/fortune-bashorgru/pkg-install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/russian/fortune-bashorgru/pkg-install,v 1.1 2007-04-20 12:13:55 miwi Exp $
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-if [ ! -x "/usr/games/strfile" ]; then
-    echo ""
-    echo "You must have the ``games'' distribution installed to use this port."
-    echo ""
-    exit 1
-fi
diff --git a/russian/fortuneru/Makefile b/russian/fortuneru/Makefile
index 103ca807f250..57457295217c 100644
--- a/russian/fortuneru/Makefile
+++ b/russian/fortuneru/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fortuneru
 PORTVERSION=	20090524
+PORTREVISION=	1
 CATEGORIES=	russian
 MASTER_SITES=	ftp://bestia.kiev.ua/pub/files/ ftp://hosting.cvu.kiev.ua/pub/files/
 DISTNAME=	fortune.ru-${PORTVERSION}
@@ -10,30 +11,23 @@ DISTNAME=	fortune.ru-${PORTVERSION}
 MAINTAINER=	obezpalko@gmail.com
 COMMENT=	Fortunes in Russian
 
-NO_BUILD=	yes
-
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.if exists(/usr/games/strfile)
 STRCMD=		/usr/games/strfile
+.elif exists(/usr/bin/strfile)
+STRCMD=		/usr/bin/strfile
+.else
+IGNORE=		needs strfile command. Please install games distribution of base system
+.endif
+
+do-build:
+	@for fortune in ${WRKSRC}/* ; do \
+		${STRCMD} $$fortune ; \
+	done
 
 do-install:
-	@${SETENV} STRCMD=${STRCMD} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune/rus
 	${INSTALL_DATA} ${WRKSRC}/* ${STAGEDIR}${PREFIX}/share/games/fortune/rus
 
-pre-install:
-.if !exists(${STRCMD})
-	@${ECHO_MSG}   "Please install the games distribution"
-	@exit 1
-.endif
-
-post-install:
-	@for fortune in ${STAGEDIR}${PREFIX}/share/games/fortune/rus/* ; do \
-		${STRCMD} $$fortune >/dev/null 2>/dev/null ; \
-		done
-	@${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/pkg-install b/russian/fortuneru/pkg-install
deleted file mode 100644
index 806641214364..000000000000
--- a/russian/fortuneru/pkg-install
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-if [ ! -x "/usr/games/strfile" ]; then
-    echo ""
-    echo "You must have the ``games'' distribution installed to use this port."
-    echo ""
-    exit 1
-fi