Date: Wed, 14 Sep 2016 19:50:47 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422160 - in head: chinese/fortune french/fortune-mod-zarathoustra misc/fortune-mod-bible misc/fortune-mod-bofh misc/fortune-mod-culmea-culmilor misc/fortune-mod-epictetus misc/fortune-... Message-ID: <201609141950.u8EJolO7085386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Sep 14 19:50:46 2016 New Revision: 422160 URL: https://svnweb.freebsd.org/changeset/ports/422160 Log: Revert recent strfile changes, strfile is already in base With hat: portmgr Modified: head/chinese/fortune/Makefile head/french/fortune-mod-zarathoustra/Makefile head/misc/fortune-mod-bible/Makefile head/misc/fortune-mod-bofh/Makefile head/misc/fortune-mod-culmea-culmilor/Makefile.fortune head/misc/fortune-mod-epictetus/Makefile head/misc/fortune-mod-futurama/Makefile head/misc/fortuneit/Makefile head/polish/fortunepl/Makefile head/russian/fortuneru/Makefile Modified: head/chinese/fortune/Makefile ============================================================================== --- head/chinese/fortune/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/chinese/fortune/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -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}|" \ Modified: head/french/fortune-mod-zarathoustra/Makefile ============================================================================== --- head/french/fortune-mod-zarathoustra/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/french/fortune-mod-zarathoustra/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -11,15 +11,19 @@ COMMENT= Compilation of quotes from Niet 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> Modified: head/misc/fortune-mod-bible/Makefile ============================================================================== --- head/misc/fortune-mod-bible/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/misc/fortune-mod-bible/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -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> Modified: head/misc/fortune-mod-bofh/Makefile ============================================================================== --- head/misc/fortune-mod-bofh/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/misc/fortune-mod-bofh/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -12,20 +12,24 @@ DISTFILES= bofh-fortune-mod${PORTVERSION 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> Modified: head/misc/fortune-mod-culmea-culmilor/Makefile.fortune ============================================================================== --- head/misc/fortune-mod-culmea-culmilor/Makefile.fortune Wed Sep 14 19:47:43 2016 (r422159) +++ head/misc/fortune-mod-culmea-culmilor/Makefile.fortune Wed Sep 14 19:50:46 2016 (r422160) @@ -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 Modified: head/misc/fortune-mod-epictetus/Makefile ============================================================================== --- head/misc/fortune-mod-epictetus/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/misc/fortune-mod-epictetus/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -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> Modified: head/misc/fortune-mod-futurama/Makefile ============================================================================== --- head/misc/fortune-mod-futurama/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/misc/fortune-mod-futurama/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -11,20 +11,24 @@ MASTER_SITES= http://www.netmeister.org/ 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> Modified: head/misc/fortuneit/Makefile ============================================================================== --- head/misc/fortuneit/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/misc/fortuneit/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -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 \ Modified: head/polish/fortunepl/Makefile ============================================================================== --- head/polish/fortunepl/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/polish/fortunepl/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -14,11 +14,13 @@ PATCHFILES= fortunes-pl_${PORTVERSION}.f 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 argant 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: Modified: head/russian/fortuneru/Makefile ============================================================================== --- head/russian/fortuneru/Makefile Wed Sep 14 19:47:43 2016 (r422159) +++ head/russian/fortuneru/Makefile Wed Sep 14 19:50:46 2016 (r422160) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609141950.u8EJolO7085386>