From owner-svn-ports-all@freebsd.org Fri Nov 22 16:16:05 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B8F7F1BB429; Fri, 22 Nov 2019 16:16:05 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47KM454S1kz3wdS; Fri, 22 Nov 2019 16:16:05 +0000 (UTC) (envelope-from dmgk@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 788BB261DA; Fri, 22 Nov 2019 16:16:05 +0000 (UTC) (envelope-from dmgk@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAMGG5bS072601; Fri, 22 Nov 2019 16:16:05 GMT (envelope-from dmgk@FreeBSD.org) Received: (from dmgk@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAMGG4dv072599; Fri, 22 Nov 2019 16:16:04 GMT (envelope-from dmgk@FreeBSD.org) Message-Id: <201911221616.xAMGG4dv072599@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dmgk set sender to dmgk@FreeBSD.org using -f From: Dmitri Goutnik Date: Fri, 22 Nov 2019 16:16:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r518151 - in branches/2019Q4/devel/nexus2-oss: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: dmgk X-SVN-Commit-Paths: in branches/2019Q4/devel/nexus2-oss: . files X-SVN-Commit-Revision: 518151 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.29 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: Fri, 22 Nov 2019 16:16:05 -0000 Author: dmgk Date: Fri Nov 22 16:16:04 2019 New Revision: 518151 URL: https://svnweb.freebsd.org/changeset/ports/518151 Log: Unbreak after incomplete merge in r517133 PR: 242153 Reported by: Michael Osipov (maintainer) Approved by: ports-secteam (joneum) Modified: branches/2019Q4/devel/nexus2-oss/files/nexus2.in branches/2019Q4/devel/nexus2-oss/pkg-plist Modified: branches/2019Q4/devel/nexus2-oss/files/nexus2.in ============================================================================== --- branches/2019Q4/devel/nexus2-oss/files/nexus2.in Fri Nov 22 15:32:40 2019 (r518150) +++ branches/2019Q4/devel/nexus2-oss/files/nexus2.in Fri Nov 22 16:16:04 2019 (r518151) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: %%NEXUS_RC%% -# REQUIRE: LOGIN FILESYSTEMS +# REQUIRE: LOGIN FILESYSTEMS NETWORKING # KEYWORD: shutdown # # Add the following line to /etc/rc.conf[.local] to enable Nexus: @@ -28,7 +28,7 @@ command=%%WRAPPER_CMD%% command_args="%%ETCDIR%%/wrapper.conf wrapper.syslog.ident=%%NEXUS_RC%% \ wrapper.pidfile=${pidfile} wrapper.lockfile=%%RUNDIR%%/%%NEXUS_RC%%.lock \ wrapper.java.pidfile=%%RUNDIR%%/%%NEXUS_RC%%.java.pid wrapper.daemonize=TRUE \ - wrapper.name=%%NEXUS_RC%% wrapper.displayname=Nexus\ Repository\ Manager\ OSS" + wrapper.name=%%NEXUS_RC%% wrapper.displayname=Nexus_Repository_Manager_OSS" run_rc_command "$1" Modified: branches/2019Q4/devel/nexus2-oss/pkg-plist ============================================================================== --- branches/2019Q4/devel/nexus2-oss/pkg-plist Fri Nov 22 15:32:40 2019 (r518150) +++ branches/2019Q4/devel/nexus2-oss/pkg-plist Fri Nov 22 16:16:04 2019 (r518151) @@ -315,8 +315,8 @@ %%DATADIR%%/nexus/WEB-INF/web.xml %%DATADIR%%/nexus/favicon.ico %%DATADIR%%/nexus/favicon.png -%%DATADIR%%/nexus/images/header_branding.png -%%DATADIR%%/nexus/images/nexus650x55.png +%%DATADIR%%/nexus/images/NexusRepoMngr_horiz_white+color@2x.png +%%DATADIR%%/nexus/images/NexusRepoMngr_withSonatype@3x.png %%DATADIR%%/nexus/robots.txt @dir(%%USER%%,%%GROUP%%,750) %%RUNDIR%% @dir(%%USER%%,%%GROUP%%,750) %%LOGDIR%%