svn commit: r413902 - in head/www/tdiary: . files

[Steve Wills]

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 $
+ #