From owner-svn-ports-head@freebsd.org Wed Sep 14 04:49:44 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82A34BD8A4B; Wed, 14 Sep 2016 04:49:44 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6094BC4B; Wed, 14 Sep 2016 04:49:44 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8E4nh2Z035366; Wed, 14 Sep 2016 04:49:43 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8E4nhE0035364; Wed, 14 Sep 2016 04:49:43 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609140449.u8E4nhE0035364@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Wed, 14 Sep 2016 04:49:43 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Sep 2016 04:49:44 -0000 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 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