Index: head/www/tdiary/Makefile =================================================================== --- head/www/tdiary/Makefile (revision 491016) +++ head/www/tdiary/Makefile (revision 491017) @@ -1,119 +1,120 @@ # Created by: Fumihiko Kimura # $FreeBSD$ PORTNAME= tdiary -PORTVERSION= 5.0.10 +PORTVERSION= 5.0.11 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>=1.16.5:sysutils/rubygem-bundler \ rubygem-emot>=0.0.4:textproc/rubygem-emot \ - rubygem-fastimage>=2.1.4:graphics/rubygem-fastimage \ + rubygem-fastimage>=2.1.5:graphics/rubygem-fastimage \ rubygem-hikidoc>=0.1.0:textproc/rubygem-hikidoc \ - rubygem-mail>=2.7.0:mail/rubygem-mail \ - rubygem-rack>=2.0.5:www/rubygem-rack \ - rubygem-rake>=12.3.1:devel/rubygem-rake + rubygem-mail>=2.7.1:mail/rubygem-mail \ + rubygem-rack>=2.0.6,3:www/rubygem-rack \ + rubygem-rake>=12.3.2:devel/rubygem-rake USES= shebangfix USE_RUBY= yes 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} +WRKSRC= ${WRKDIR}/${PORTNAME}-v.${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} WWWDIR= ${PREFIX}/www/${PKGBASE} TDIARY_SCRIPT= ${PKGBASE}-inst.rb #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 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}/.vscode - @${RM} -r ${WRKSRC}/misc/lib/bundler-1.16.5 + @${RM} -r ${WRKSRC}/misc/lib/bundler-1.17.3 @${RM} -r ${WRKSRC}/public @${RM} -r ${WRKSRC}/spec + @${RM} -r ${WRKSRC}/tdiary-core @${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 Index: head/www/tdiary/distinfo =================================================================== --- head/www/tdiary/distinfo (revision 491016) +++ head/www/tdiary/distinfo (revision 491017) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538268183 -SHA256 (tdiary-full-v5.0.10.tar.gz) = a05ee96d6ac8c0dd5a8a9176ca3788d79be54ebdcf2ac5bc9a38b54edd03bf73 -SIZE (tdiary-full-v5.0.10.tar.gz) = 7300429 +TIMESTAMP = 1548120388 +SHA256 (tdiary-full-v5.0.11.tar.gz) = c827bd5690e68704ca5b05c6f270b0cdca165f02c702d06487397de9402a9eb3 +SIZE (tdiary-full-v5.0.11.tar.gz) = 10992857 Index: head/www/tdiary/files/patch-Gemfile =================================================================== --- head/www/tdiary/files/patch-Gemfile (revision 491016) +++ head/www/tdiary/files/patch-Gemfile (revision 491017) @@ -1,43 +1,44 @@ ---- Gemfile.orig 2018-06-29 08:57:36 UTC +--- Gemfile.orig 2018-12-29 14:18:31 UTC +++ Gemfile -@@ -6,40 +6,3 @@ gem 'fastimage' +@@ -6,41 +6,3 @@ gem 'fastimage' gem 'emot' gem 'mail' gem 'rake' - -group :rack do - gem 'sprockets' -end - -group :development do - gem 'pit', require: false - gem 'racksh', require: false - gem 'redcarpet' - gem 'octokit' +- gem 'mime-types' - - platforms :ruby_23, :ruby_24 do - gem 'ruby-debug-ide' - gem 'debase' - end - - group :test do - gem 'pry-byebug', platforms: [:ruby_23, :ruby_24] - gem 'test-unit' - gem 'rspec' - gem 'capybara', require: 'capybara/rspec' - gem 'selenium-webdriver' - gem 'launchy' - gem 'sequel' - gem 'sqlite3' - gem 'jasmine', '< 3' - gem 'simplecov', require: false - gem 'coveralls', require: false - 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