13 files changed, 87 insertions, 102 deletions

diff --git a/chinese/fortune/Makefile b/chinese/fortune/Makefile
index 958a7fe99db8..da735034a38b 100644
--- a/chinese/fortune/Makefile
+++ b/chinese/fortune/Makefile
@@ -18,13 +18,17 @@ NO_BUILD=	yes
 USES=		tar:bzip2 gmake
 SUB_FILES=	pkg-message
 
-.if !exists(/usr/games/fortune) || !exists(/usr/games/strfile)
-IGNORE=		needs the FreeBSD games distribution
+.if exists(/usr/games/strfile)
+STRFILE=	/usr/games/strfile
+.elif exists(/usr/bin/strfile)
+STRFILE=	/usr/bin/strfile
+.else
+IGNORE=		needs strfile command. Please install games distribution of base system
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/|${PREFIX}/|" \
-		-e "s|strfile|/usr/games/strfile|" \
+		-e "s|strfile|${STRFILE}|" \
 		${WRKSRC}/src/Makefile
 
 .include <bsd.port.mk>
diff --git a/french/fortune-mod-zarathoustra/Makefile b/french/fortune-mod-zarathoustra/Makefile
index 94ff9a0c9406..2b7b231880d0 100644
--- a/french/fortune-mod-zarathoustra/Makefile
+++ b/french/fortune-mod-zarathoustra/Makefile
@@ -4,20 +4,19 @@
 PORTNAME=	fortune-mod-zarathoustra
 PORTVERSION=	20100905
 CATEGORIES=	french
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	culot
+MASTER_SITES=	LOCAL/culot
 
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Compilation of quotes from Nietzsche's Thus spoke Zarathustra
 
 SUB_FILES=	pkg-message
 
+.if exists(/usr/games/strfile)
 STRCMD=		/usr/games/strfile
-
-pre-build:
-.if !exists(${STRCMD})
-	@${ECHO_MSG} "Please install the games distribution"
-	@exit 1
+.elif exists(/usr/bin/strfile)
+STRCMD=		/usr/bin/strfile
+.else
+IGNORE=		needs strfile command. Please install games distribution of base system
 .endif
 
 do-build:
@@ -25,9 +24,6 @@ do-build:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/zarathoustra* ${STAGEDIR}${PREFIX}/share/games/fortune
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKSRC}/zarathoustra* ${STAGEDIR}${PREFIX}/share/games/fortune
 
 .include <bsd.port.mk>
diff --git a/misc/fortune-mod-bible/Makefile b/misc/fortune-mod-bible/Makefile
index 90fdc4d39b0c..570654e4f431 100644
--- a/misc/fortune-mod-bible/Makefile
+++ b/misc/fortune-mod-bible/Makefile
@@ -14,17 +14,25 @@ COMMENT=	King James V Bible in fortune file format
 DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-USES=	tar:bzip2
+USES=		tar:bzip2
 SUB_FILES+=	pkg-message
+.if exists(/usr/games/strfile)
 _STRFILE=	/usr/games/strfile
+.elif exists(/usr/bin/strfile)
+_STRFILE=	/usr/bin/strfile
+.else
+IGNORE=		needs strfile command. Please install games distribution of base system
+.endif
+
+post-extract:
+	${RM} ${WRKSRC}/bible.dat
 
 do-build:
 	@cd ${WRKSRC} && ${_STRFILE} -C bible
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/bible* ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/bible* ${STAGEDIR}${PREFIX}/share/games/fortune
 
 
 .include <bsd.port.mk>
diff --git a/misc/fortune-mod-bofh/Makefile b/misc/fortune-mod-bofh/Makefile
index 9936a9786ac4..c3100d6f20f0 100644
--- a/misc/fortune-mod-bofh/Makefile
+++ b/misc/fortune-mod-bofh/Makefile
@@ -13,17 +13,24 @@ DISTFILES=	bofh-fortune-mod${PORTVERSION}${EXTRACT_SUFX}:original,freebsd
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Compilation of excuses from the "Bastard Operator From Hell"
 
-NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/bofh-fortune-mod2.0
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
+.if exists(/usr/games/strfile)
 STRFILE=	/usr/games/strfile
+.elif exists(/usr/bin/strfile)
+STRFILE=	/usr/bin/strfile
+.else
+IGNORE=		needs strfile command. Please install games distribution of base system
+.endif
+
+do-build:
+	@${STRFILE} ${WRKSRC}/bofh
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/bofh ${STAGEDIR}${PREFIX}/share/games/fortune
-	@${STRFILE} ${STAGEDIR}${PREFIX}/share/games/fortune/bofh
+	${INSTALL_DATA} ${WRKSRC}/bofh* ${STAGEDIR}${PREFIX}/share/games/fortune
 
 .include <bsd.port.mk>
diff --git a/misc/fortune-mod-culmea-culmilor/Makefile.fortune b/misc/fortune-mod-culmea-culmilor/Makefile.fortune
index ab526cabae7b..99ea4224b809 100644
--- a/misc/fortune-mod-culmea-culmilor/Makefile.fortune
+++ b/misc/fortune-mod-culmea-culmilor/Makefile.fortune
@@ -2,7 +2,13 @@
 
 NO_WRKSUBDIR=	yes
 
+.if exists(/usr/games/strfile)
 _STRFILE=		/usr/games/strfile
+.elif exists(/usr/bin/strfile)
+_STRFILE=		/usr/bin/strfile
+.else
+IGNORE=			needs strfile command. Please install games distribution of base system
+.endif
 _STRFILE_ARGS?=		-C
 _FORTUNE_DIR=		share/games/fortune
 FORTUNE_DIR=		${PREFIX}/${_FORTUNE_DIR}
@@ -29,16 +35,13 @@ do-build:
 	fi
 do-install:
 	@${MKDIR} ${STAGEDIR}${FORTUNE_DIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${FORTUNE_DIR}/${FORTUNE_FILE}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.dat ${STAGEDIR}${FORTUNE_DIR}/${FORTUNE_FILE}.dat
-	@if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${FORTUNE_DIR}/${FORTUNE_FILE}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.dat ${STAGEDIR}${FORTUNE_DIR}/${FORTUNE_FILE}.dat
+	if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
 		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-o ${STAGEDIR}${FORTUNE_DIR}/${FORTUNE_FILE_O}; \
 		${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-o.dat ${STAGEDIR}${FORTUNE_DIR}/${FORTUNE_FILE_O}.dat; \
 	fi
-post-install:
 	@if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
 		${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O} >> ${TMPPLIST}; \
 		${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O}.dat >> ${TMPPLIST}; \
 	fi
-	@${ECHO_CMD} "@unexec rmdir %D/${_FORTUNE_DIR} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/share/games 2>/dev/null || true" >> ${TMPPLIST}
diff --git a/misc/fortune-mod-epictetus/Makefile b/misc/fortune-mod-epictetus/Makefile
index 6ceb3b1b3cd4..b028206f379c 100644
--- a/misc/fortune-mod-epictetus/Makefile
+++ b/misc/fortune-mod-epictetus/Makefile
@@ -15,13 +15,19 @@ USES=		tar:bzip2
 PLIST_FILES=	share/games/fortune/epictetus \
 		share/games/fortune/epictetus.dat
 
+.if exists(/usr/games/strfile)
 STRFILE=	/usr/games/strfile
+.elif exists(/usr/bin/strfile)
+STRFILE=	/usr/bin/strfile
+.else
+IGNORE=		needs strfile command. Please install games distribution of base system
+.endif
 
 do-build:
 	@(cd ${WRKSRC} && ${STRFILE} epictetus)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/epictetus* ${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/epictetus* ${STAGEDIR}${PREFIX}/share/games/fortune
 
 .include <bsd.port.mk>
diff --git a/misc/fortune-mod-futurama/Makefile b/misc/fortune-mod-futurama/Makefile
index 1c954e4a0556..ef26cfd4d026 100644
--- a/misc/fortune-mod-futurama/Makefile
+++ b/misc/fortune-mod-futurama/Makefile
@@ -11,13 +11,21 @@ MASTER_SITES=	http://www.netmeister.org/apps/ \
 MAINTAINER=	freebsd@skysmurf.nl
 COMMENT=	Compilation of quotes from the TV series "Futurama"
 
-USES=	tar:bzip2
+USES=		tar:bzip2
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	share/games/fortune/futurama share/games/fortune/futurama.dat
 
+.if exists(/usr/games/strfile)
+STRFILE=	/usr/games/strfile
+.elif exists(/usr/bin/strfile)
+STRFILE=	/usr/bin/strfile
+.else
+IGNORE=		needs strfile command. Please install games distribution of base system
+.endif
+
 do-build:
-	@cd ${WRKSRC} && /usr/games/strfile futurama
+	@${STRFILE} ${WRKSRC}/futurama
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
diff --git a/misc/fortuneit/Makefile b/misc/fortuneit/Makefile
index 355906fe41b1..4e6ee5c3dff8 100644
--- a/misc/fortuneit/Makefile
+++ b/misc/fortuneit/Makefile
@@ -10,38 +10,29 @@ DISTNAME=	fortune-it-${PORTVERSION}
 MAINTAINER=	gmarco@gufi.org
 COMMENT=	Funny fortune file in Italian
 
+.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
 
 FORTUNEFILES=	adams banner computer definizioni formiche italia itatrek \
 		jackfr leggi luke luttazzi norm paolotedeschi zuse \
 		computer-o definizioni-o film-o italia-o jackfr-o leggi-o \
 		luttazzi-o obsc-o zuse-o
 
-pre-build:
-.if !exists(${STRCMD})
-	@${ECHO_MSG} "Please install the games distribution"
-	@exit 1
-.endif
-
 do-build:
 .for f in ${FORTUNEFILES}
 	${STRCMD} ${WRKSRC}/testi/${f}
 .endfor
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
 .for f in ${FORTUNEFILES}
-	@${INSTALL_DATA} ${WRKSRC}/testi/${f}* \
+	${INSTALL_DATA} ${WRKSRC}/testi/${f}* \
 		${STAGEDIR}${PREFIX}/share/games/fortune
 .endfor
 
-post-install:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Usage:"
-	@${ECHO_MSG} "/usr/games/fortune [-aDefilosw] ${PREFIX}/share/games/fortune/"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Please check fortune manual pages for more informations"
-	@${ECHO_MSG} ""
-
 .include <bsd.port.mk>
diff --git a/polish/fortunepl/Makefile b/polish/fortunepl/Makefile
index 73f56dec8170..0798bd66c878 100644
--- a/polish/fortunepl/Makefile
+++ b/polish/fortunepl/Makefile
@@ -14,7 +14,13 @@ PATCHFILES=	fortunes-pl_${PORTVERSION}.freebsd.pl \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lot of funny Polish fortune files
 
+.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
 WRKSRC=		${WRKDIR}/fortunes-pl-${PORTVERSION}.orig
 
 FORTUNES=	7thguard advocacy apcoh argante bajki bok cnp cows \
@@ -28,11 +34,6 @@ FORTUNES=	7thguard advocacy apcoh argante bajki bok cnp cows \
 		teleturnieje testnaosobowosc wierszyki wieza-pilot zen \
 		znaki_zodiaku
 
-pre-everything::
-.if !exists(${STRCMD})
-IGNORE=		need strfile command. Please install games distribution of base system
-.endif
-
 do-patch:
 	${CP} ${DISTDIR}/fortunes-pl_${PORTVERSION}.freebsd.pl ${WRKSRC}/freebsd.pl
 	${CP} ${DISTDIR}/fortunes-pl_${PORTVERSION}.filozofia ${WRKSRC}/filozofia
@@ -51,10 +52,4 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/games/fortune/pl
 .endfor
 
-post-install:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Usage:"
-	@${ECHO_MSG} "/usr/games/fortune ${PREFIX}/share/games/fortune/pl/<category>"
-	@${ECHO_MSG} ""
-
 .include <bsd.port.mk>
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