From owner-svn-ports-all@freebsd.org Fri Jun 3 20:10:03 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E83CB69D4E; Fri, 3 Jun 2016 20:10:03 +0000 (UTC) (envelope-from db@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 mx1.freebsd.org (Postfix) with ESMTPS id 6ED431482; Fri, 3 Jun 2016 20:10:03 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u53KA26t079413; Fri, 3 Jun 2016 20:10:02 GMT (envelope-from db@FreeBSD.org) Received: (from db@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u53KA2lP079411; Fri, 3 Jun 2016 20:10:02 GMT (envelope-from db@FreeBSD.org) Message-Id: <201606032010.u53KA2lP079411@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: db set sender to db@FreeBSD.org using -f From: Diane Bruce Date: Fri, 3 Jun 2016 20:10:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416336 - in head/comms/sdr-wspr: . files X-SVN-Group: ports-head 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.22 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, 03 Jun 2016 20:10:03 -0000 Author: db Date: Fri Jun 3 20:10:02 2016 New Revision: 416336 URL: https://svnweb.freebsd.org/changeset/ports/416336 Log: Cleanup a bit by passing necessary CMAKE_INSTALL_RPATH in Makefile Modified: head/comms/sdr-wspr/Makefile head/comms/sdr-wspr/files/patch-CMakeLists.txt (contents, props changed) Modified: head/comms/sdr-wspr/Makefile ============================================================================== --- head/comms/sdr-wspr/Makefile Fri Jun 3 19:37:15 2016 (r416335) +++ head/comms/sdr-wspr/Makefile Fri Jun 3 20:10:02 2016 (r416336) @@ -20,5 +20,6 @@ USES= cmake:outsource compiler:gcc-c++1 PLIST_FILES= bin/sdr-wspr share/applications/sdr-wspr.desktop \ share/icons/sdr-wspr.svg +CMAKE_ARGS= -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" .include Modified: head/comms/sdr-wspr/files/patch-CMakeLists.txt ============================================================================== --- head/comms/sdr-wspr/files/patch-CMakeLists.txt Fri Jun 3 19:37:15 2016 (r416335) +++ head/comms/sdr-wspr/files/patch-CMakeLists.txt Fri Jun 3 20:10:02 2016 (r416336) @@ -1,18 +1,6 @@ --- CMakeLists.txt.orig 2015-04-21 14:32:18 UTC +++ CMakeLists.txt -@@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 2.8.8) - project(sdr-wspr) - # required for original wspr code - enable_language(Fortran) -+# temporary ugly hack -+string(REGEX MATCH "-rpath=.*" CMAKE_RPATH_ARG ${CMAKE_Fortran_FLAGS} ) -+string(SUBSTRING ${CMAKE_RPATH_ARG} 7 -1 CMAKE_RPATH) -+set(CMAKE_INSTALL_RPATH ${CMAKE_RPATH} ) -+message(STATUS CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH}) - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake) - include(InstallHeadersWithDirectory) -@@ -63,34 +68,6 @@ ELSE(NOT LIBSDR_GUI_FOUND) +@@ -63,34 +63,6 @@ ELSE(NOT LIBSDR_GUI_FOUND) ENDIF(NOT LIBSDR_GUI_FOUND) # Set compiler flags