From owner-svn-ports-all@freebsd.org Sat Dec 26 11:48:37 2020 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 AE5634B6D0C; Sat, 26 Dec 2020 11:48:37 +0000 (UTC) (envelope-from thierry@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4D32Bs4L1bz3R63; Sat, 26 Dec 2020 11:48:37 +0000 (UTC) (envelope-from thierry@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 8344A147A5; Sat, 26 Dec 2020 11:48:37 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BQBmb9d092388; Sat, 26 Dec 2020 11:48:37 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BQBmaGd092384; Sat, 26 Dec 2020 11:48:36 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202012261148.0BQBmaGd092384@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sat, 26 Dec 2020 11:48:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559285 - in head/science: cgnslib cgnslib/files xcrysden X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: in head/science: cgnslib cgnslib/files xcrysden X-SVN-Commit-Revision: 559285 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.34 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: Sat, 26 Dec 2020 11:48:37 -0000 Author: thierry Date: Sat Dec 26 11:48:36 2020 New Revision: 559285 URL: https://svnweb.freebsd.org/changeset/ports/559285 Log: science/cgnslib: rename unitconv to unitconv.sh, thus avoiding the conflict with XCrySDen. Added: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt (contents, props changed) head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix (contents, props changed) Modified: head/science/cgnslib/Makefile head/science/cgnslib/pkg-plist head/science/xcrysden/Makefile Modified: head/science/cgnslib/Makefile ============================================================================== --- head/science/cgnslib/Makefile Sat Dec 26 10:26:22 2020 (r559284) +++ head/science/cgnslib/Makefile Sat Dec 26 11:48:36 2020 (r559285) @@ -4,6 +4,7 @@ PORTNAME= cgnslib PORTVERSION= 4.1.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= science @@ -21,8 +22,6 @@ GH_ACCOUNT= CGNS GH_PROJECT= CGNS USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes - -CONFLICTS_INSTALL= xcrysden-1.* # bin/unitconv TEST_TARGET= test FFLAGS+= -std=legacy Added: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt Sat Dec 26 11:48:36 2020 (r559285) @@ -0,0 +1,15 @@ +--- src/cgnstools/cgnscalc/CMakeLists.txt.orig 2020-08-18 19:44:35 UTC ++++ src/cgnstools/cgnscalc/CMakeLists.txt +@@ -77,10 +77,10 @@ else (WIN32) + cgnscalc.sh + DESTINATION bin + RENAME cgnscalc) ++ # Do not install as unitconv to avoid a conflicy with XCrySDen + install(PROGRAMS + unitconv.sh +- DESTINATION bin +- RENAME unitconv) ++ DESTINATION bin) + install(FILES + cgnscalc.tcl + unitconv.tcl Added: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix Sat Dec 26 11:48:36 2020 (r559285) @@ -0,0 +1,14 @@ +--- src/cgnstools/cgnscalc/Makefile.unix.orig 2020-08-18 19:44:35 UTC ++++ src/cgnstools/cgnscalc/Makefile.unix +@@ -45,8 +45,9 @@ install-prog : + @echo "installing cgnscalc shell scripts to $(BIN_INSTALL_DIR)" + @$(INSTALL_PROG) cgnscalc.sh $(BIN_INSTALL_DIR)/cgnscalc + @chmod +x $(BIN_INSTALL_DIR)/cgnscalc +- @$(INSTALL_PROG) unitconv.sh $(BIN_INSTALL_DIR)/unitconv +- @chmod +x $(BIN_INSTALL_DIR)/unitconv ++ # Do not install as unitconv to avoid a conflicy with XCrySDen ++ @$(INSTALL_PROG) unitconv.sh $(BIN_INSTALL_DIR)/unitconv.sh ++ @chmod +x $(BIN_INSTALL_DIR)/unitconv.sh + @if [ ! -f $(EXE_INSTALL_DIR)/cgconfig ] ; then \ + echo "installing configuration file to $(EXE_INSTALL_DIR)"; \ + $(INSTALL_DATA) ../cgconfig $(EXE_INSTALL_DIR)/cgconfig; \ Modified: head/science/cgnslib/pkg-plist ============================================================================== --- head/science/cgnslib/pkg-plist Sat Dec 26 10:26:22 2020 (r559284) +++ head/science/cgnslib/pkg-plist Sat Dec 26 11:48:36 2020 (r559285) @@ -26,7 +26,7 @@ %%TOOLS%%bin/cgnstools/update_ngon %%TOOLS%%bin/cgnstools/vgrid_to_cgns %%TOOLS%%bin/cgnsview -%%TOOLS%%bin/unitconv +%%TOOLS%%bin/unitconv.sh bin/cgnscheck bin/cgnscompress bin/cgnsconvert Modified: head/science/xcrysden/Makefile ============================================================================== --- head/science/xcrysden/Makefile Sat Dec 26 10:26:22 2020 (r559284) +++ head/science/xcrysden/Makefile Sat Dec 26 11:48:36 2020 (r559285) @@ -24,7 +24,7 @@ USES= fortran gl gmake localbase:ldflags tcl tk xorg USE_GL= gl glu USE_XORG= x11 xmu -CONFLICTS_INSTALL= cgnslib-4.* # bin/unitconv +CONFLICTS_INSTALL= cgnslib-4.1.2,1 # bin/unitconv MAKE_ARGS= prefix=${STAGEDIR}${PREFIX}