From owner-svn-ports-all@freebsd.org Tue Sep 18 12:18:25 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B5B2C109D0C5; Tue, 18 Sep 2018 12:18:25 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6B77E8E45D; Tue, 18 Sep 2018 12:18:25 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4D0F91FD49; Tue, 18 Sep 2018 12:18:25 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8ICIPDm089074; Tue, 18 Sep 2018 12:18:25 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8ICIPME089073; Tue, 18 Sep 2018 12:18:25 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201809181218.w8ICIPME089073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Tue, 18 Sep 2018 12:18:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r480016 - head/www/gitlab-ce X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: head/www/gitlab-ce X-SVN-Commit-Revision: 480016 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.27 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: Tue, 18 Sep 2018 12:18:26 -0000 Author: mfechner Date: Tue Sep 18 12:18:24 2018 New Revision: 480016 URL: https://svnweb.freebsd.org/changeset/ports/480016 Log: Due to problems with portmaster, portmaster does not install RUN_DEPENDS before the do-install target is executed. To not break the installation of www/gitlab-ce for portmaster users, RUN_DEPENS are now also defined BUILD_DEPENDS. PR: 231224 Reported by: hakan@siktas.com Approved by: mentors (implicit) Modified: head/www/gitlab-ce/Makefile Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Tue Sep 18 12:17:37 2018 (r480015) +++ head/www/gitlab-ce/Makefile Tue Sep 18 12:18:24 2018 (r480016) @@ -3,7 +3,7 @@ PORTNAME= gitlab-ce PORTVERSION= 11.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -12,19 +12,11 @@ COMMENT= Web GUI for managing git repositories LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -OPTIONS_SINGLE= DATABASE -OPTIONS_SINGLE_DATABASE= PGSQL MYSQL -OPTIONS_DEFAULT= PGSQL -PGSQL_DESC= Default PostgreSQL support (preferred) -MYSQL_DESC= Optional MySQL support - -BUILD_DEPENDS= gem:devel/ruby-gems - # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS # for the options -RUN_DEPENDS= git>=2.16.2:devel/git \ +MY_DEPENDS= git>=2.16.2:devel/git \ gitlab-shell>=8.1.1:devel/gitlab-shell \ gitlab-workhorse>=5.1.0:www/gitlab-workhorse \ gitaly>=0.117.2:devel/gitaly \ @@ -205,6 +197,17 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-grape_logging>=1.7:devel/rubygem-grape_logging \ rubygem-asset_sync>=2.4:net/rubygem-asset_sync +BUILD_DEPENDS= gem:devel/ruby-gems \ + ${MY_DEPENDS} + +RUN_DEPENDS= ${MY_DEPENDS} + +OPTIONS_SINGLE= DATABASE +OPTIONS_SINGLE_DATABASE= PGSQL MYSQL +OPTIONS_DEFAULT= PGSQL +PGSQL_DESC= Default PostgreSQL support (preferred) +MYSQL_DESC= Optional MySQL support + PGSQL_RUN_DEPENDS= rubygem-pg018>=0.18.2:databases/rubygem-pg018 \ rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \ @@ -244,10 +247,8 @@ post-patch-PGSQL-off: ${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile ${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile -pre-install: - (cd ${WRKSRC} && rm Gemfile.lock && bundle install --local) - do-install: + (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local) ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete