Revert recent strfile changes, strfile is already in base

With hat:	portmgr

10 files changed, 98 insertions, 64 deletions

diff --git a/chinese/fortune/Makefile b/chinese/fortune/Makefile
index a353ced37c02..ec898def5cb7 100644
--- a/chinese/fortune/Makefile
+++ b/chinese/fortune/Makefile
@@ -14,14 +14,20 @@ COMMENT=	Classic fortune file in Chinese
 BROKEN=		Unfetchable (google code has gone away)
 
 RUN_DEPENDS=	autob5:chinese/autoconvert
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-STRFILE=	${LOCALBASE}/bin/fortune_strfile
 
 PROJECTHOST=	chinese-fortune
 NO_BUILD=	yes
 USES=		tar:bzip2 gmake
 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-patch:
 	@${REINPLACE_CMD} -e "s|/usr/|${PREFIX}/|" \
 		-e "s|strfile|${STRFILE}|" \
diff --git a/french/fortune-mod-zarathoustra/Makefile b/french/fortune-mod-zarathoustra/Makefile
index 2d5d717cd2e8..2b7b231880d0 100644
--- a/french/fortune-mod-zarathoustra/Makefile
+++ b/french/fortune-mod-zarathoustra/Makefile
@@ -11,15 +11,19 @@ COMMENT=	Compilation of quotes from Nietzsche's Thus spoke Zarathustra
 
 SUB_FILES=	pkg-message
 
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-STRCMD=		${LOCALBASE}/bin/fortune_strfile
+.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:
-	(cd ${WRKSRC} && ${STRCMD} zarathoustra)
+	@cd ${WRKSRC} && ${STRCMD} zarathoustra
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
-	${INSTALL_DATA} ${WRKSRC}/zarathoustra* \
-		${STAGEDIR}${PREFIX}/share/games/fortune
+	${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 b0af294e6080..570654e4f431 100644
--- a/misc/fortune-mod-bible/Makefile
+++ b/misc/fortune-mod-bible/Makefile
@@ -7,28 +7,32 @@ PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	SF/fortunebible/fortunebible/Genesis
 DISTNAME=	bible
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	doug@polands.org
 COMMENT=	King James V Bible in fortune file format
 
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-
+DIST_SUBDIR=	${PORTNAME}
 NO_WRKSUBDIR=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USES=		tar:bzip2
 SUB_FILES+=	pkg-message
-_STRFILE=	${LOCALBASE}/bin/fortune_strfile
+.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)
+	@cd ${WRKSRC} && ${_STRFILE} -C bible
 
 do-install:
 	@${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 772f20e671e4..76d642870d10 100644
--- a/misc/fortune-mod-bofh/Makefile
+++ b/misc/fortune-mod-bofh/Makefile
@@ -12,20 +12,24 @@ DISTFILES=	bofh-fortune-mod${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Compilation of excuses from the "Bastard Operator From Hell"
 
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-STRFILE=	${LOCALBASE}/bin/fortune_strfile
-
 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
+	@${STRFILE} ${WRKSRC}/bofh
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
-	${INSTALL_DATA} ${WRKSRC}/bofh* \
-		${STAGEDIR}${PREFIX}/share/games/fortune
+	${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 682b3b5aa958..99ea4224b809 100644
--- a/misc/fortune-mod-culmea-culmilor/Makefile.fortune
+++ b/misc/fortune-mod-culmea-culmilor/Makefile.fortune
@@ -2,9 +2,13 @@
 
 NO_WRKSUBDIR=	yes
 
-_STRFILE=	${LOCALBASE}/bin/fortune_strfile
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-
+.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}
@@ -25,22 +29,19 @@ post-extract:
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 do-build:
-	(cd ${WRKSRC} && ${_STRFILE} ${_STRFILE_ARGS} ${PORTNAME})
-	if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
+	@cd ${WRKSRC} && ${_STRFILE} ${_STRFILE_ARGS} ${PORTNAME}
+	@if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
 		cd ${WRKSRC} && ${_STRFILE} ${_STRFILE_ARGS} ${PORTNAME}-o; \
 	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
+	${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
-	if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
+	@if [ -f ${WRKSRC}/${PORTNAME}-o ]; then \
 		${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O} >> ${TMPPLIST}; \
 		${ECHO_CMD} ${_FORTUNE_DIR}/${FORTUNE_FILE_O}.dat >> ${TMPPLIST}; \
 	fi
diff --git a/misc/fortune-mod-epictetus/Makefile b/misc/fortune-mod-epictetus/Makefile
index 1be7264212b1..34d9371121ef 100644
--- a/misc/fortune-mod-epictetus/Makefile
+++ b/misc/fortune-mod-epictetus/Makefile
@@ -12,21 +12,25 @@ COMMENT=	Quotes from Epictetus
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-STRFILE=	${LOCALBASE}/bin/fortune_strfile
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	akosela
 
 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)
+	@(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 7fc515e49acf..ef26cfd4d026 100644
--- a/misc/fortune-mod-futurama/Makefile
+++ b/misc/fortune-mod-futurama/Makefile
@@ -11,20 +11,24 @@ MASTER_SITES=	http://www.netmeister.org/apps/ \
 MAINTAINER=	freebsd@skysmurf.nl
 COMMENT=	Compilation of quotes from the TV series "Futurama"
 
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-
 USES=		tar:bzip2
 SUB_FILES=	pkg-message
-STRFILE=	${LOCALBASE}/bin/fortune_strfile
 
 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:
-	${STRFILE} ${WRKSRC}/futurama
+	@${STRFILE} ${WRKSRC}/futurama
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune
-	${INSTALL_DATA} ${WRKSRC}/futurama* \
-		${STAGEDIR}${PREFIX}/share/games/fortune
+	${INSTALL_DATA} ${WRKSRC}/futurama* ${STAGEDIR}${PREFIX}/share/games/fortune
 
 .include <bsd.port.mk>
diff --git a/misc/fortuneit/Makefile b/misc/fortuneit/Makefile
index a12b8c8c3d69..4e6ee5c3dff8 100644
--- a/misc/fortuneit/Makefile
+++ b/misc/fortuneit/Makefile
@@ -10,8 +10,13 @@ DISTNAME=	fortune-it-${PORTVERSION}
 MAINTAINER=	gmarco@gufi.org
 COMMENT=	Funny fortune file in Italian
 
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-STRCMD=		${LOCALBASE}/bin/fortune_strfile
+.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 \
diff --git a/polish/fortunepl/Makefile b/polish/fortunepl/Makefile
index d3c50c551abd..0798bd66c878 100644
--- a/polish/fortunepl/Makefile
+++ b/polish/fortunepl/Makefile
@@ -14,11 +14,13 @@ PATCHFILES=	fortunes-pl_${PORTVERSION}.freebsd.pl \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lot of funny Polish fortune files
 
-BROKEN=		unfetchable
-
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-STRCMD=		${LOCALBASE}/bin/fortune_strfile
-
+.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 \
@@ -33,14 +35,12 @@ FORTUNES=	7thguard advocacy apcoh argante bajki bok cnp cows \
 		znaki_zodiaku
 
 do-patch:
-	${CP} ${DISTDIR}/fortunes-pl_${PORTVERSION}.freebsd.pl \
-		${WRKSRC}/freebsd.pl
-	${CP} ${DISTDIR}/fortunes-pl_${PORTVERSION}.filozofia \
-		${WRKSRC}/filozofia
+	${CP} ${DISTDIR}/fortunes-pl_${PORTVERSION}.freebsd.pl ${WRKSRC}/freebsd.pl
+	${CP} ${DISTDIR}/fortunes-pl_${PORTVERSION}.filozofia ${WRKSRC}/filozofia
 
 do-build:
 .for FILE in ${FORTUNES}
-	${STRCMD} ${WRKSRC}/${FILE}
+	@${STRCMD} ${WRKSRC}/${FILE}
 .endfor
 
 do-install:
diff --git a/russian/fortuneru/Makefile b/russian/fortuneru/Makefile
index 76e656391ff1..57457295217c 100644
--- a/russian/fortuneru/Makefile
+++ b/russian/fortuneru/Makefile
@@ -5,27 +5,29 @@ PORTNAME=	fortuneru
 PORTVERSION=	20090524
 PORTREVISION=	1
 CATEGORIES=	russian
-MASTER_SITES=	ftp://bestia.kiev.ua/pub/files/ \
-		ftp://hosting.cvu.kiev.ua/pub/files/
+MASTER_SITES=	ftp://bestia.kiev.ua/pub/files/ ftp://hosting.cvu.kiev.ua/pub/files/
 DISTNAME=	fortune.ru-${PORTVERSION}
 
 MAINTAINER=	obezpalko@gmail.com
 COMMENT=	Fortunes in Russian
 
-BROKEN=		unfetchable
-
-BUILD_DEPENDS=	fortune_strfile:misc/fortune_strfile
-STRCMD=		${LOCALBASE}/bin/fortune_strfile
 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 \
+	@for fortune in ${WRKSRC}/* ; do \
 		${STRCMD} $$fortune ; \
 	done
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune/rus
-	${INSTALL_DATA} ${WRKSRC}/* \
-		${STAGEDIR}${PREFIX}/share/games/fortune/rus
+	${INSTALL_DATA} ${WRKSRC}/* ${STAGEDIR}${PREFIX}/share/games/fortune/rus
 
 .include <bsd.port.mk>