Date: Wed, 14 Sep 2016 04:49:43 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422104 - head/misc/fortune-mod-culmea-culmilor Message-ID: <201609140449.u8E4nhE0035364@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Sep 14 04:49:43 2016 New Revision: 422104 URL: https://svnweb.freebsd.org/changeset/ports/422104 Log: misc/fortune-mod-culmea-culmilor: Use fortune_strfile instead of strfile(8) This removes the dependency on the games distribution. While here, unsuppress build and installation commands for all ports that pull in generic makefile fragment. Unfortunately the tecnik93.com server is down. I don't know if its transient or if its been down a long time, but mark the port BROKEN (unfetchable) as a result. Approved by: general blanket Modified: head/misc/fortune-mod-culmea-culmilor/Makefile head/misc/fortune-mod-culmea-culmilor/Makefile.fortune Modified: head/misc/fortune-mod-culmea-culmilor/Makefile ============================================================================== --- head/misc/fortune-mod-culmea-culmilor/Makefile Wed Sep 14 04:29:13 2016 (r422103) +++ head/misc/fortune-mod-culmea-culmilor/Makefile Wed Sep 14 04:49:43 2016 (r422104) @@ -9,5 +9,7 @@ MASTER_SITES= http://T32.TecNik93.com/Fr MAINTAINER= itetcu@FreeBSD.org COMMENT= Romanian "Culmea culmilor" jokes (in Romanian) +BROKEN= unfetchable (tecnik93.com is down) + .include "${.CURDIR}/../../misc/fortune-mod-culmea-culmilor/Makefile.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 04:29:13 2016 (r422103) +++ head/misc/fortune-mod-culmea-culmilor/Makefile.fortune Wed Sep 14 04:49:43 2016 (r422104) @@ -2,13 +2,9 @@ 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= ${LOCALBASE}/bin/fortune_strfile +BUILD_DEPENDS= fortune_strfile:misc/fortune_strfile + _STRFILE_ARGS?= -C _FORTUNE_DIR= share/games/fortune FORTUNE_DIR= ${PREFIX}/${_FORTUNE_DIR} @@ -29,19 +25,22 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609140449.u8E4nhE0035364>