diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile index 9dcde239a35d..e245ac84b39a 100644 --- a/www/tdiary/Makefile +++ b/www/tdiary/Makefile @@ -1,120 +1,112 @@ # Created by: Fumihiko Kimura PORTNAME= tdiary -PORTVERSION= 5.1.5 +PORTVERSION= 5.1.6 CATEGORIES?= www ruby MASTER_SITES= https://github.com/tdiary/tdiary-core/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}-full-v${PORTVERSION} MAINTAINER= yasu@utahime.org COMMENT= Web-based diary system (like weblog) written in Ruby LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-bundler>=2.0.2:sysutils/rubygem-bundler \ rubygem-emot>=0.0.4:textproc/rubygem-emot \ rubygem-fastimage>=2.1.7:graphics/rubygem-fastimage \ rubygem-hikidoc>=0.1.0:textproc/rubygem-hikidoc \ rubygem-mail>=2.7.1:mail/rubygem-mail \ rubygem-rack>=2.2.3,3:www/rubygem-rack \ rubygem-rake>=12.3.3:devel/rubygem-rake USES= shebangfix USE_RUBY= yes +SHEBANG_FILES= bin/tdiary index.fcgi index.rb misc/convert2.rb misc/migrate.rb \ + misc/plugin/xmlrpc/xmlrpc.rb update.fcgi update.rb + +DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} +WWWDIR= ${PREFIX}/www/${PKGBASE} +REINPLACE_ARGS= -i '' NO_ARCH= yes NO_BUILD= yes - -SHEBANG_FILES= bin/tdiary \ - index.fcgi \ - index.rb \ - misc/convert2.rb \ - misc/migrate.rb \ - misc/plugin/xmlrpc/xmlrpc.rb \ - update.fcgi \ - update.rb - -DOCFILES= HOWTO-authenticate-in-rack HOWTO-make-io \ - HOWTO-make-plugin HOWTO-make-theme \ - HOWTO-testing-tDiary HOWTO-use-plugin \ - HOWTO-write-tDiary.en HOWTO-write-tDiary \ - INSTALL-paas INSTALL README.en \ - README UPGRADE -HTML= ${DOCFILES:S/$/.html/} -MD= ${DOCFILES:S/$/.md/} -PORTDOCS= ChangeLog doc.css ${HTML} ${MD} - -PLIST_SUB= TDIARY_SCRIPT=${TDIARY_SCRIPT} \ - WWWOWN=${WWWOWN} \ - WWWGRP=${WWWGRP} SUB_FILES= pkg-message tdiaryinst.rb SUB_LIST+= TDIARY_LANG=${TDIARY_LANG} \ TDIARY_SCRIPT=${TDIARY_SCRIPT} + WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION} -DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} -WWWDIR= ${PREFIX}/www/${PKGBASE} +PLIST_SUB= TDIARY_SCRIPT=${TDIARY_SCRIPT} \ + WWWGRP=${WWWGRP} \ + WWWOWN=${WWWOWN} -TDIARY_SCRIPT= ${PKGBASE}-inst.rb +PORTDOCS= ${HTML} ${MD} ChangeLog doc.css + +OPTIONS_DEFINE= DOCS + +DOCFILES= HOWTO-authenticate-in-rack HOWTO-make-io HOWTO-make-plugin \ + HOWTO-make-theme HOWTO-testing-tDiary HOWTO-use-plugin \ + HOWTO-write-tDiary.en HOWTO-write-tDiary INSTALL-paas INSTALL \ + README.en README UPGRADE +HTML= ${DOCFILES:S/$/.html/} +MD= ${DOCFILES:S/$/.md/} #TDIARY_LANG ja:Japanese en:English .if !defined(TDIARY_LANG) || ( defined(TDIARY_LANG) && ${TDIARY_LANG} != ja ) TDIARY_LANG= en .endif -REINPLACE_ARGS= -i '' - -OPTIONS_DEFINE= DOCS +TDIARY_SCRIPT= ${PKGBASE}-inst.rb pre-patch: @${RM} ${WRKSRC}/.coveralls.yml @${RM} ${WRKSRC}/.dockerignore @${RM} ${WRKSRC}/.editorconfig @${RM} ${WRKSRC}/.gitignore @${RM} ${WRKSRC}/.travis.yml @${RM} ${WRKSRC}/Dockerfile @${RM} ${WRKSRC}/Gemfile.lock @${RM} ${WRKSRC}/Procfile @${RM} ${WRKSRC}/Rakefile @${RM} ${WRKSRC}/config.ru @${RM} ${WRKSRC}/tdiary.gemspec @${RM} ${WRKSRC}/tmp/.gitkeep @${RM} -r ${WRKSRC}/.bundle @${RM} -r ${WRKSRC}/.devcontainer @${RM} -r ${WRKSRC}/.github @${RM} -r ${WRKSRC}/.vscode - @${RM} -r ${WRKSRC}/misc/lib/bundler-2.2.11 + @${RM} -r ${WRKSRC}/misc/lib/bundler-2.2.18 @${RM} -r ${WRKSRC}/public @${RM} -r ${WRKSRC}/spec @${RM} -r ${WRKSRC}/test @${RM} -r ${WRKSRC}/vendor @${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc @${MV} ${WRKSRC}/README.md ${WRKSRC}/doc pre-install: @${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \ ${WRKDIR}/tdiaryinst.rb > ${WRKDIR}/${TDIARY_SCRIPT} @${REINPLACE_CMD} 's!%%LOCALBASE%%!${LOCALBASE}!g' \ ${WRKSRC}/misc/convert2.rb \ ${WRKSRC}/misc/migrate.rb @${FIND} ${WRKSRC} -name "*.orig" -delete do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${TDIARY_SCRIPT} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${WWWDIR} ${TAR} --exclude doc --exclude LICENSE -C ${WRKSRC} -cf - . | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf - do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} x-generate-plist: stage ${ECHO_CMD} bin/%%TDIARY_SCRIPT%% > pkg-plist.new ${ECHO_CMD} @owner %%WWWOWN%% >> pkg-plist.new ${ECHO_CMD} @group %%WWWGRP%% >> pkg-plist.new ${FIND} ${STAGEDIR}${WWWDIR} -type f -o -type l | ${SORT} | ${SED} -e 's,${STAGEDIR}${WWWDIR},%%WWWDIR%%,g' >> pkg-plist.new ${FIND} ${STAGEDIR}${WWWDIR} -type d -depth | ${SORT} -r | ${SED} -e 's,${STAGEDIR}${WWWDIR},@dir %%WWWDIR%%,g' >> pkg-plist.new ${ECHO_CMD} @owner >> pkg-plist.new ${ECHO_CMD} @group >> pkg-plist.new .include diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo index 5117537a24ee..08a2805755d1 100644 --- a/www/tdiary/distinfo +++ b/www/tdiary/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614537369 -SHA256 (tdiary-full-v5.1.5.tar.gz) = 549e672ecaa79c4e3066a6d2535df490a0d2bbf367993bbd39cd6daa83a7dfe5 -SIZE (tdiary-full-v5.1.5.tar.gz) = 7315961 +TIMESTAMP = 1622314920 +SHA256 (tdiary-full-v5.1.6.tar.gz) = b72589868a84ea6099e37309e71b48b1f9176b8e2d3a01099b5b5d77cfd3c73e +SIZE (tdiary-full-v5.1.6.tar.gz) = 7323498 diff --git a/www/tdiary/files/patch-Gemfile b/www/tdiary/files/patch-Gemfile index 7419150d78c0..8778ca17174b 100644 --- a/www/tdiary/files/patch-Gemfile +++ b/www/tdiary/files/patch-Gemfile @@ -1,38 +1,39 @@ ---- Gemfile.orig 2021-02-28 14:12:14 UTC +--- Gemfile.orig 2021-05-29 15:12:39 UTC +++ Gemfile -@@ -6,35 +6,3 @@ gem 'fastimage' +@@ -6,36 +6,3 @@ gem 'fastimage' gem 'emot' gem 'mail' gem 'rake' - -group :development do - gem 'pit', require: false - gem 'racksh', require: false - gem 'redcarpet' - gem 'octokit' - gem 'mime-types' - gem "ruby-debug-ide" - gem "debase" - - group :test do - gem 'test-unit' - gem 'rspec' - gem 'capybara', require: 'capybara/rspec' +- gem 'date', '>= 3.1.1' # for compatibility of capybara - gem 'selenium-webdriver' - gem 'launchy' - gem 'sequel' - gem 'sqlite3' - gem 'jasmine', '< 3' - gem 'simplecov', require: false - gem 'coveralls', '~> 0.8', require: false - gem "rexml" - gem "webrick" - end -end - -# https://github.com/redmine/redmine/blob/master/Gemfile#L89 -local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") -if File.exist?(local_gemfile) - puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v` - instance_eval File.read(local_gemfile) -end