From owner-svn-ports-all@freebsd.org Tue Mar 12 20:51:50 2019 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 72ED5153E0A9; Tue, 12 Mar 2019 20:51:50 +0000 (UTC) (envelope-from asomers@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 140EF85304; Tue, 12 Mar 2019 20:51:50 +0000 (UTC) (envelope-from asomers@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 E9D96372; Tue, 12 Mar 2019 20:51:49 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2CKpnHm085743; Tue, 12 Mar 2019 20:51:49 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2CKpnTH085742; Tue, 12 Mar 2019 20:51:49 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201903122051.x2CKpnTH085742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 12 Mar 2019 20:51:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495523 - head/shells/fish/files X-SVN-Group: ports-head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: head/shells/fish/files X-SVN-Commit-Revision: 495523 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 140EF85304 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Tue, 12 Mar 2019 20:51:50 -0000 Author: asomers (src committer) Date: Tue Mar 12 20:51:49 2019 New Revision: 495523 URL: https://svnweb.freebsd.org/changeset/ports/495523 Log: shells/fish: fix the build when fish is already installed https://github.com/fish-shell/fish-shell/issues/5735 Submitted by: Stephen Modified: head/shells/fish/files/patch-cmake_Install.cmake Modified: head/shells/fish/files/patch-cmake_Install.cmake ============================================================================== --- head/shells/fish/files/patch-cmake_Install.cmake Tue Mar 12 20:36:49 2019 (r495522) +++ head/shells/fish/files/patch-cmake_Install.cmake Tue Mar 12 20:51:49 2019 (r495523) @@ -1,15 +1,28 @@ ---- cmake/Install.cmake.orig 2018-12-29 16:18:12 UTC +--- cmake/Install.cmake.orig 2019-02-19 13:39:17 UTC +++ cmake/Install.cmake -@@ -113,7 +113,7 @@ INSTALL(FILES share/config.fish +@@ -53,9 +53,7 @@ ENDIF() + # Define a function to help us create directories. + FUNCTION(FISH_CREATE_DIRS) + FOREACH(dir ${ARGV}) +- IF(NOT EXISTS ${CMAKE_INSTALL_PREFIX}/${dir}) +- INSTALL(DIRECTORY DESTINATION ${dir}) +- ENDIF() ++ INSTALL(DIRECTORY DESTINATION ${dir}) + ENDFOREACH(dir) + ENDFUNCTION(FISH_CREATE_DIRS) + +@@ -113,9 +111,9 @@ INSTALL(FILES share/config.fish # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_completionsdir) # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_functionsdir) # -$v $(INSTALL) -m 755 -d $(DESTDIR)$(extra_confdir) -FISH_CREATE_DIRS(${rel_datadir}/pkgconfig) -+FISH_CREATE_DIRS(${rel_datadir}/../libdata/pkgconfig) # Don't try too hard to create these directories as they may be outside our writeable area # https://github.com/Homebrew/homebrew-core/pull/2813 ++FISH_TRY_CREATE_DIRS(${rel_datadir}/../libdata/pkgconfig) FISH_TRY_CREATE_DIRS(${extra_completionsdir} ${extra_functionsdir} ${extra_confdir}) -@@ -132,7 +132,7 @@ ADD_CUSTOM_COMMAND(OUTPUT fish.pc + + # @echo "Installing pkgconfig file" +@@ -132,7 +130,7 @@ ADD_CUSTOM_COMMAND(OUTPUT fish.pc ADD_CUSTOM_TARGET(build_fish_pc ALL DEPENDS fish.pc) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc