From owner-svn-ports-head@freebsd.org Sat Apr 23 19:01:19 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 DD601B1A045; Sat, 23 Apr 2016 19:01:19 +0000 (UTC) (envelope-from swills@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 9B6C41836; Sat, 23 Apr 2016 19:01:19 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3NJ1I1X082571; Sat, 23 Apr 2016 19:01:18 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3NJ1Ini082568; Sat, 23 Apr 2016 19:01:18 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201604231901.u3NJ1Ini082568@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 23 Apr 2016 19:01:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413902 - in head/www/tdiary: . files 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.21 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: Sat, 23 Apr 2016 19:01:20 -0000 Author: swills Date: Sat Apr 23 19:01:18 2016 New Revision: 413902 URL: https://svnweb.freebsd.org/changeset/ports/413902 Log: www/tdiary: convert to USES=shebangfiles Added: head/www/tdiary/files/patch-misc_convert2.rb (contents, props changed) head/www/tdiary/files/patch-misc_migrate.rb (contents, props changed) Modified: head/www/tdiary/Makefile Modified: head/www/tdiary/Makefile ============================================================================== --- head/www/tdiary/Makefile Sat Apr 23 18:51:53 2016 (r413901) +++ head/www/tdiary/Makefile Sat Apr 23 19:01:18 2016 (r413902) @@ -3,6 +3,7 @@ PORTNAME= tdiary PORTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES?= www ruby MASTER_SITES= http://www.tdiary.org/download/ DISTNAME= ${PORTNAME}-full-v${PORTVERSION} @@ -22,17 +23,16 @@ RUN_DEPENDS= rubygem-emot>=0.0.4:textpro NO_ARCH= yes NO_BUILD= yes USE_RUBY= yes +USES= shebangfix -RUBY_SHEBANG_FILES= index.fcgi \ - index.rb \ - update.fcgi \ - update.rb \ - bin/tdiary \ - misc/convert2.rb \ - misc/migrate.rb \ - misc/plugin/amazon/amazonimg.rb \ - misc/plugin/squeeze.rb \ - misc/plugin/xmlrpc/xmlrpc.rb +SHEBANG_FILES= index.fcgi \ + index.rb \ + update.fcgi \ + update.rb \ + bin/tdiary \ + misc/plugin/amazon/amazonimg.rb \ + misc/plugin/squeeze.rb \ + misc/plugin/xmlrpc/xmlrpc.rb DOCFILES= HOWTO-authenticate-in-rack HOWTO-make-io \ HOWTO-make-plugin HOWTO-make-theme \ @@ -88,8 +88,9 @@ pre-patch: pre-install: @${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \ ${WRKDIR}/tdiaryinst.rb > ${WRKDIR}/${TDIARY_SCRIPT} - @${REINPLACE_CMD} '/#!\/usr\/bin\/env ruby/d' ${WRKSRC}/misc/convert2.rb - @${REINPLACE_CMD} '/#!\/usr\/bin\/env ruby/d' ${WRKSRC}/misc/migrate.rb + @${REINPLACE_CMD} 's!%%LOCALBASE%%!${LOCALBASE}!g' \ + ${WRKSRC}/misc/convert2.rb \ + ${WRKSRC}/misc/migrate.rb @${FIND} ${WRKSRC} -name "*.orig" -delete do-install: Added: head/www/tdiary/files/patch-misc_convert2.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/tdiary/files/patch-misc_convert2.rb Sat Apr 23 19:01:18 2016 (r413902) @@ -0,0 +1,10 @@ +--- misc/convert2.rb.orig 2016-04-23 13:50:46 UTC ++++ misc/convert2.rb +@@ -1,5 +1,6 @@ ++#!%%LOCALBASE%%/bin/ruby ++# + # -*- coding: utf-8; -*- +-#!/usr/bin/env ruby + # + # convert2: convert diary data file format tDiary1 to tDiary2. + # Added: head/www/tdiary/files/patch-misc_migrate.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/tdiary/files/patch-misc_migrate.rb Sat Apr 23 19:01:18 2016 (r413902) @@ -0,0 +1,10 @@ +--- misc/migrate.rb.orig 2016-04-23 13:50:46 UTC ++++ misc/migrate.rb +@@ -1,5 +1,6 @@ ++#!%%LOCALBASE%%/bin/ruby ++# + # -*- coding: utf-8; -*- +-#!/usr/bin/env ruby + # + # migrate.rb $Revision: 1.2 $ + #