Update to 1.1.0

- Update the sample configuration to add ISSUE_INDEXER_PATH in the new
  [indexer] section.  While here, alphabetize sections and variables
  so future updates are easier to diff.  Also merge duplicate section
  [session].

Changes:	https://blog.gitea.io/2017/03/release-of-1.1.0/

PR:		217694
Submitted by:	stb@lassitu.de (maintainer)
Approved by:	lme (mentor)
Differential Revision:	https://reviews.freebsd.org/D9963

4 files changed, 49 insertions, 29 deletions

diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index cc31b167d31f..ca8e20a43a43 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gitea
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/gitea/distinfo b/www/gitea/distinfo
index 75197d8cf015..a9a6b282ebf7 100644
--- a/www/gitea/distinfo
+++ b/www/gitea/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487873480
-SHA256 (go-gitea-gitea-v1.0.2_GH0.tar.gz) = 821fe52ea93cb93a1c60bdc2be7fb1990bcd71b013868270877ae75f6289e15a
-SIZE (go-gitea-gitea-v1.0.2_GH0.tar.gz) = 13446235
+TIMESTAMP = 1489219594
+SHA256 (go-gitea-gitea-v1.1.0_GH0.tar.gz) = baf35f5b4920498c91e66d6afa13fa4320af9997f3321b1176fac0b0384a4d6f
+SIZE (go-gitea-gitea-v1.1.0_GH0.tar.gz) = 13014916
diff --git a/www/gitea/files/app.ini.sample.in b/www/gitea/files/app.ini.sample.in
index cdb8cc82b7fd..70f3656dd7e8 100644
--- a/www/gitea/files/app.ini.sample.in
+++ b/www/gitea/files/app.ini.sample.in
@@ -18,19 +18,30 @@ APP_NAME = Gitea: Git with a cup of tea
 RUN_USER = %%GITUSER%%
 RUN_MODE = prod
 
-[log]
-ROOT_PATH = /var/log/gitea
-MODE      = file
-LEVEL     = Info
-
 [database]
 DB_TYPE  = sqlite3
 HOST     = 127.0.0.1:3306
 NAME     = gitea
-USER     = root
 PASSWD   = 
-SSL_MODE = disable
 PATH     = /var/db/gitea/gitea.db
+SSL_MODE = disable
+USER     = root
+
+[indexer]
+ISSUE_INDEXER_PATH = /var/db/gitea/indexers/issues.bleve
+
+[log]
+ROOT_PATH = /var/log/gitea
+MODE      = file
+LEVEL     = Info
+
+[mailer]
+ENABLED = false
+
+[picture]
+AVATAR_UPLOAD_PATH      = /var/db/gitea/data/avatars
+DISABLE_GRAVATAR        = false
+ENABLE_FEDERATED_AVATAR = false
 
 [repository]
 ROOT = /var/db/gitea/gitea-repositories
@@ -38,6 +49,14 @@ ROOT = /var/db/gitea/gitea-repositories
 [repository.upload]
 TEMP_PATH = /var/db/gitea/data/tmp/uploads
 
+[security]
+INSTALL_LOCK = true
+SECRET_KEY   = ChangeMeBeforeRunning
+
+[session]
+PROVIDER = file
+PROVIDER_CONFIG = /var/db/gitea/data/sessions
+
 [server]
 DOMAIN       = localhost
 HTTP_ADDR    = 127.0.0.1
@@ -49,12 +68,6 @@ SSH_PORT     = 22
 OFFLINE_MODE = false
 APP_DATA_PATH = /var/db/gitea/data
 
-[session]
-PROVIDER_CONFIG = /var/db/gitea/data/sessions
-
-[mailer]
-ENABLED = false
-
 [service]
 REGISTER_EMAIL_CONFIRM = false
 ENABLE_NOTIFY_MAIL     = false
@@ -62,15 +75,3 @@ DISABLE_REGISTRATION   = false
 ENABLE_CAPTCHA         = true
 REQUIRE_SIGNIN_VIEW    = false
 
-[picture]
-AVATAR_UPLOAD_PATH      = /var/db/gitea/data/avatars
-DISABLE_GRAVATAR        = false
-ENABLE_FEDERATED_AVATAR = false
-
-[session]
-PROVIDER = file
-
-[security]
-INSTALL_LOCK = true
-SECRET_KEY   = ChangeMeBeforeRunning
-
diff --git a/www/gitea/pkg-plist b/www/gitea/pkg-plist
index e5af44218f34..f3a5e18760ed 100644
--- a/www/gitea/pkg-plist
+++ b/www/gitea/pkg-plist
@@ -21,6 +21,7 @@ sbin/gitea
 %%DATADIR%%/options/gitignore/CVS
 %%DATADIR%%/options/gitignore/CakePHP
 %%DATADIR%%/options/gitignore/ChefCookbook
+%%DATADIR%%/options/gitignore/Clojure
 %%DATADIR%%/options/gitignore/Cloud9
 %%DATADIR%%/options/gitignore/CodeIgniter
 %%DATADIR%%/options/gitignore/CodeKit
@@ -47,6 +48,7 @@ sbin/gitea
 %%DATADIR%%/options/gitignore/Espresso
 %%DATADIR%%/options/gitignore/ExpressionEngine
 %%DATADIR%%/options/gitignore/ExtJs
+%%DATADIR%%/options/gitignore/FSharp
 %%DATADIR%%/options/gitignore/Fancy
 %%DATADIR%%/options/gitignore/Finale
 %%DATADIR%%/options/gitignore/FlexBuilder
@@ -237,6 +239,7 @@ sbin/gitea
 %%DATADIR%%/public/assets/octicons-4.3.0/octicons.ttf
 %%DATADIR%%/public/assets/octicons-4.3.0/octicons.woff
 %%DATADIR%%/public/assets/octicons-4.3.0/octicons.woff2
+%%DATADIR%%/public/css/gitgraph.css
 %%DATADIR%%/public/css/github.min.css
 %%DATADIR%%/public/css/index.css
 %%DATADIR%%/public/css/semantic-2.2.1.min.css
@@ -1143,11 +1146,15 @@ sbin/gitea
 %%DATADIR%%/public/img/favicon.png
 %%DATADIR%%/public/img/gitea-large-resize.png
 %%DATADIR%%/public/img/gitea-lg.png
+%%DATADIR%%/public/img/github.png
 %%DATADIR%%/public/img/slack.png
+%%DATADIR%%/public/js/draw.js
 %%DATADIR%%/public/js/index.js
 %%DATADIR%%/public/js/jquery-1.11.3.min.js
+%%DATADIR%%/public/js/libs/autolink.js
 %%DATADIR%%/public/js/libs/clipboard-1.5.9.min.js
 %%DATADIR%%/public/js/libs/emojify-1.1.0.min.js
+%%DATADIR%%/public/js/libs/gitgraph.js
 %%DATADIR%%/public/js/libs/jquery.are-you-sure.js
 %%DATADIR%%/public/js/semantic-2.2.1.min.js
 %%DATADIR%%/public/less/_admin.less
@@ -1618,6 +1625,7 @@ sbin/gitea
 %%DATADIR%%/templates/repo/editor/edit.tmpl
 %%DATADIR%%/templates/repo/editor/upload.tmpl
 %%DATADIR%%/templates/repo/forks.tmpl
+%%DATADIR%%/templates/repo/graph.tmpl
 %%DATADIR%%/templates/repo/header.tmpl
 %%DATADIR%%/templates/repo/home.tmpl
 %%DATADIR%%/templates/repo/issue/comment_tab.tmpl
@@ -1629,6 +1637,7 @@ sbin/gitea
 %%DATADIR%%/templates/repo/issue/navbar.tmpl
 %%DATADIR%%/templates/repo/issue/new.tmpl
 %%DATADIR%%/templates/repo/issue/new_form.tmpl
+%%DATADIR%%/templates/repo/issue/search.tmpl
 %%DATADIR%%/templates/repo/issue/view.tmpl
 %%DATADIR%%/templates/repo/issue/view_content.tmpl
 %%DATADIR%%/templates/repo/issue/view_title.tmpl
@@ -1640,6 +1649,7 @@ sbin/gitea
 %%DATADIR%%/templates/repo/pulls/tab_menu.tmpl
 %%DATADIR%%/templates/repo/release/list.tmpl
 %%DATADIR%%/templates/repo/release/new.tmpl
+%%DATADIR%%/templates/repo/settings/branches.tmpl
 %%DATADIR%%/templates/repo/settings/collaboration.tmpl
 %%DATADIR%%/templates/repo/settings/deploy_keys.tmpl
 %%DATADIR%%/templates/repo/settings/githook_edit.tmpl
@@ -1667,10 +1677,15 @@ sbin/gitea
 %%DATADIR%%/templates/status/500.tmpl
 %%DATADIR%%/templates/user/auth/activate.tmpl
 %%DATADIR%%/templates/user/auth/forgot_passwd.tmpl
+%%DATADIR%%/templates/user/auth/link_account.tmpl
 %%DATADIR%%/templates/user/auth/prohibit_login.tmpl
 %%DATADIR%%/templates/user/auth/reset_passwd.tmpl
 %%DATADIR%%/templates/user/auth/signin.tmpl
+%%DATADIR%%/templates/user/auth/signin_inner.tmpl
 %%DATADIR%%/templates/user/auth/signup.tmpl
+%%DATADIR%%/templates/user/auth/signup_inner.tmpl
+%%DATADIR%%/templates/user/auth/twofa.tmpl
+%%DATADIR%%/templates/user/auth/twofa_scratch.tmpl
 %%DATADIR%%/templates/user/dashboard/dashboard.tmpl
 %%DATADIR%%/templates/user/dashboard/feeds.tmpl
 %%DATADIR%%/templates/user/dashboard/issues.tmpl
@@ -1678,7 +1693,9 @@ sbin/gitea
 %%DATADIR%%/templates/user/meta/followers.tmpl
 %%DATADIR%%/templates/user/meta/header.tmpl
 %%DATADIR%%/templates/user/meta/stars.tmpl
+%%DATADIR%%/templates/user/notification/notification.tmpl
 %%DATADIR%%/templates/user/profile.tmpl
+%%DATADIR%%/templates/user/settings/account_link.tmpl
 %%DATADIR%%/templates/user/settings/applications.tmpl
 %%DATADIR%%/templates/user/settings/avatar.tmpl
 %%DATADIR%%/templates/user/settings/delete.tmpl
@@ -1687,6 +1704,8 @@ sbin/gitea
 %%DATADIR%%/templates/user/settings/password.tmpl
 %%DATADIR%%/templates/user/settings/profile.tmpl
 %%DATADIR%%/templates/user/settings/sshkeys.tmpl
+%%DATADIR%%/templates/user/settings/twofa.tmpl
+%%DATADIR%%/templates/user/settings/twofa_enroll.tmpl
 @owner git
 @group git
 @dir /var/db/gitea