From owner-svn-ports-head@freebsd.org Wed Sep 14 04:20:55 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 AC150BD8391; Wed, 14 Sep 2016 04:20:55 +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 77F5DE64; Wed, 14 Sep 2016 04:20:55 +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 u8E4KsUs024264; Wed, 14 Sep 2016 04:20:54 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8E4KsOV024263; Wed, 14 Sep 2016 04:20:54 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609140420.u8E4KsOV024263@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:20:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422101 - head/misc/fortune-mod-bible 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:20:55 -0000 Author: marino Date: Wed Sep 14 04:20:54 2016 New Revision: 422101 URL: https://svnweb.freebsd.org/changeset/ports/422101 Log: misc/fortune-mod-bible: Use fortune_strfile instead of strfile(8) This removes the dependency on the games distribution. While here, unsuppress build and installation commands and pet portlint. Approved by: general blanket Modified: head/misc/fortune-mod-bible/Makefile Modified: head/misc/fortune-mod-bible/Makefile ============================================================================== --- head/misc/fortune-mod-bible/Makefile Wed Sep 14 04:06:59 2016 (r422100) +++ head/misc/fortune-mod-bible/Makefile Wed Sep 14 04:20:54 2016 (r422101) @@ -7,32 +7,28 @@ 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 -DIST_SUBDIR= ${PORTNAME} +BUILD_DEPENDS= fortune_strfile:misc/fortune_strfile + NO_WRKSUBDIR= yes PKGMESSAGE= ${WRKDIR}/pkg-message 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 +_STRFILE= ${LOCALBASE}/bin/fortune_strfile 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