From owner-svn-ports-all@freebsd.org Mon Jul 31 15:19:12 2017 Return-Path: Delivered-To: svn-ports-all@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 C8663DB0614; Mon, 31 Jul 2017 15:19:12 +0000 (UTC) (envelope-from jrm@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 A403B7EAC6; Mon, 31 Jul 2017 15:19:12 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6VFJB12092124; Mon, 31 Jul 2017 15:19:11 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6VFJAOl092119; Mon, 31 Jul 2017 15:19:10 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201707311519.v6VFJAOl092119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Mon, 31 Jul 2017 15:19:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446963 - in head/net-im/mastodon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: in head/net-im/mastodon: . files X-SVN-Commit-Revision: 446963 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Jul 2017 15:19:12 -0000 Author: jrm Date: Mon Jul 31 15:19:10 2017 New Revision: 446963 URL: https://svnweb.freebsd.org/changeset/ports/446963 Log: net-im/mastodon: Update to 1.5.0r3 Upstream changes: https://github.com/tootsuite/mastodon/releases/tag/v1.5.0rc3 Port changes: - remove dependency on www/npm Added: head/net-im/mastodon/files/patch-package.json (contents, props changed) Modified: head/net-im/mastodon/Makefile head/net-im/mastodon/distinfo head/net-im/mastodon/files/nginx-include.conf.in head/net-im/mastodon/pkg-plist Modified: head/net-im/mastodon/Makefile ============================================================================== --- head/net-im/mastodon/Makefile Mon Jul 31 15:09:44 2017 (r446962) +++ head/net-im/mastodon/Makefile Mon Jul 31 15:19:10 2017 (r446963) @@ -2,7 +2,7 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v -DISTVERSION= 1.5.0rc2 +DISTVERSION= 1.5.0rc3 CATEGORIES= net-im www MAINTAINER= jrm@FreeBSD.org @@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libidn2.so:dns/libidn2 RUN_DEPENDS= ffmpeg>0:multimedia/ffmpeg \ - libpqtypes>1.5.0:databases/libpqtypes \ - npm>=0:www/npm + libpqtypes>1.5.0:databases/libpqtypes # Dependencies below match Gemfile layout RUN_DEPENDS+= rubygem-pkg-config>=1.2.0:devel/rubygem-pkg-config Modified: head/net-im/mastodon/distinfo ============================================================================== --- head/net-im/mastodon/distinfo Mon Jul 31 15:09:44 2017 (r446962) +++ head/net-im/mastodon/distinfo Mon Jul 31 15:19:10 2017 (r446963) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501262123 -SHA256 (tootsuite-mastodon-v1.5.0rc2_GH0.tar.gz) = 6801d4f05a6e3de40b1f3bd7daa30d3165d09e256f94f2fbdca74a63cce985f7 -SIZE (tootsuite-mastodon-v1.5.0rc2_GH0.tar.gz) = 9986310 +TIMESTAMP = 1501512775 +SHA256 (tootsuite-mastodon-v1.5.0rc3_GH0.tar.gz) = 5c3f026e39af7c7cedd778c0c2f784acb9640e81879845050b3e79759ca923c3 +SIZE (tootsuite-mastodon-v1.5.0rc3_GH0.tar.gz) = 9987884 Modified: head/net-im/mastodon/files/nginx-include.conf.in ============================================================================== --- head/net-im/mastodon/files/nginx-include.conf.in Mon Jul 31 15:09:44 2017 (r446962) +++ head/net-im/mastodon/files/nginx-include.conf.in Mon Jul 31 15:19:10 2017 (r446963) @@ -37,15 +37,16 @@ server { try_files $uri @proxy; } - location ~ ^/(packs|system/media_attachments/files|system/accounts/avatars) { + location /sw.js { + add_header Cache-Control no-cache; + add_header Pragma "no-cache"; + } + + location ~ ^/(emoji|packs|system/accounts/avatars|system/media_attachments/files) { add_header Cache-Control "public, max-age=31536000, immutable"; try_files $uri @proxy; } - location /sw.js { - add_header Cache-Control no-cache; - } - location @proxy { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; Added: head/net-im/mastodon/files/patch-package.json ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/mastodon/files/patch-package.json Mon Jul 31 15:19:10 2017 (r446963) @@ -0,0 +1,15 @@ +--- package.json.orig 2017-07-31 15:09:11 UTC ++++ package.json +@@ -7,10 +7,9 @@ + "build:production": "cross-env RAILS_ENV=production ./bin/webpack", + "manage:translations": "node ./config/webpack/translationRunner.js", + "start": "node ./streaming/index.js", +- "test": "npm run test:lint && npm run test:mocha", ++ "test": "yarn run test:lint && yarn run test:mocha", + "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ streaming/", +- "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js", +- "postinstall": "npm rebuild node-sass" ++ "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/**/*.test.js" + }, + "repository": { + "type": "git", Modified: head/net-im/mastodon/pkg-plist ============================================================================== --- head/net-im/mastodon/pkg-plist Mon Jul 31 15:09:44 2017 (r446962) +++ head/net-im/mastodon/pkg-plist Mon Jul 31 15:19:10 2017 (r446963) @@ -499,6 +499,7 @@ %%WWWDIR%%/app/javascript/mastodon/features/compose/containers/upload_progress_container.js %%WWWDIR%%/app/javascript/mastodon/features/compose/containers/warning_container.js %%WWWDIR%%/app/javascript/mastodon/features/compose/index.js +%%WWWDIR%%/app/javascript/mastodon/features/compose/util/counter.js %%WWWDIR%%/app/javascript/mastodon/features/favourited_statuses/index.js %%WWWDIR%%/app/javascript/mastodon/features/favourites/index.js %%WWWDIR%%/app/javascript/mastodon/features/follow_requests/components/account_authorize.js @@ -5397,6 +5398,7 @@ %%WWWDIR%%/spec/support/examples/lib/settings/settings_extended.rb %%WWWDIR%%/spec/support/examples/models/concerns/account_avatar.rb %%WWWDIR%%/spec/support/matchers/model/model_have_error_on_field.rb +%%WWWDIR%%/spec/validators/status_length_validator_spec.rb %%WWWDIR%%/spec/views/about/_contact.html.haml_spec.rb %%WWWDIR%%/spec/views/about/show.html.haml_spec.rb %%WWWDIR%%/spec/views/stream_entries/show.html.haml_spec.rb