summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2016-04-23 19:01:18 +0000
committerswills <swills@FreeBSD.org>2016-04-23 19:01:18 +0000
commit4432c92a9d39201ef0284f03c772528d713edea4 (patch)
treee8eb3e340e7a62f96031ddd2261b30094b17cc4f
parent369263ccdd0e522fbaaf143776c678a9e51b0246 (diff)
downloadFreeBSD-ports-4432c92a9d39201ef0284f03c772528d713edea4.zip
FreeBSD-ports-4432c92a9d39201ef0284f03c772528d713edea4.tar.gz
www/tdiary: convert to USES=shebangfiles
-rw-r--r--www/tdiary/Makefile25
-rw-r--r--www/tdiary/files/patch-misc_convert2.rb10
-rw-r--r--www/tdiary/files/patch-misc_migrate.rb10
3 files changed, 33 insertions, 12 deletions
diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 2cdee18..ff476db 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -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:textproc/rubygem-emot \
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:
diff --git a/www/tdiary/files/patch-misc_convert2.rb b/www/tdiary/files/patch-misc_convert2.rb
new file mode 100644
index 0000000..f0f4555
--- /dev/null
+++ b/www/tdiary/files/patch-misc_convert2.rb
@@ -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.
+ #
diff --git a/www/tdiary/files/patch-misc_migrate.rb b/www/tdiary/files/patch-misc_migrate.rb
new file mode 100644
index 0000000..7a2b832
--- /dev/null
+++ b/www/tdiary/files/patch-misc_migrate.rb
@@ -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 $
+ #
OpenPOWER on IntegriCloud