From owner-svn-ports-branches@freebsd.org Wed Apr 17 03:00:39 2019 Return-Path: Delivered-To: svn-ports-branches@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 7FCE6158423B; Wed, 17 Apr 2019 03:00:39 +0000 (UTC) (envelope-from shurd@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 271E58B68F; Wed, 17 Apr 2019 03:00:39 +0000 (UTC) (envelope-from shurd@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 021B7E10; Wed, 17 Apr 2019 03:00:39 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3H30cmv037610; Wed, 17 Apr 2019 03:00:38 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3H30cEn037609; Wed, 17 Apr 2019 03:00:38 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201904170300.x3H30cEn037609@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Wed, 17 Apr 2019 03:00:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r499145 - branches/2019Q2/comms/wsjtx/files X-SVN-Group: ports-branches X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: branches/2019Q2/comms/wsjtx/files X-SVN-Commit-Revision: 499145 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 271E58B68F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.941,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-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Apr 2019 03:00:39 -0000 Author: shurd Date: Wed Apr 17 03:00:38 2019 New Revision: 499145 URL: https://svnweb.freebsd.org/changeset/ports/499145 Log: MFH: r499037 Fix build when hamlib is installed. Put /usr/local/include at end of AM_CPPFLAGS instead of at beginning, ensures the included header files are used. Link included hamlib using ${libdir}/libhamlib.a rather than -lhamlib to ensure the included static hamlib is used instead of a dynamic one in the library path. Approved by: ports-secteam (miwi) Modified: branches/2019Q2/comms/wsjtx/files/hamlib.patch (contents, props changed) Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/comms/wsjtx/files/hamlib.patch ============================================================================== --- branches/2019Q2/comms/wsjtx/files/hamlib.patch Wed Apr 17 01:20:50 2019 (r499144) +++ branches/2019Q2/comms/wsjtx/files/hamlib.patch Wed Apr 17 03:00:38 2019 (r499145) @@ -1,5 +1,14 @@ --- hamlib/configure.ac.orig 2019-02-24 18:41:47.000000000 -0500 -+++ hamlib/configure.ac 2019-03-03 22:03:13.673990000 -0500 ++++ hamlib/configure.ac 2019-04-15 12:40:39.767084000 -0400 +@@ -270,7 +270,7 @@ + dnl The host_os variable is set by the AC_CANONICAL_HOST macro above. + AS_CASE(["$host_os"], + [freebsd*], [ +- AM_CPPFLAGS="-I/usr/local/include ${AM_CPPFLAGS}" ++ AM_CPPFLAGS="${AM_CPPFLAGS} -I/usr/local/include" + AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib" + AC_SUBST([AM_LDFLAGS])], + @@ -317,6 +317,7 @@ AC_MSG_RESULT([$cf_with_libusb]) @@ -8,3 +17,12 @@ LIBUSB="" AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults]) AC_ARG_VAR([LIBUSB_LIBS], [linker flags for libusb, overriding configure check (useful for specifying static libusb-1.0.a (see INSTALL))]) +--- hamlib/hamlib.pc.in.orig 2019-04-15 13:06:46.078042000 -0400 ++++ hamlib/hamlib.pc.in 2019-04-15 13:06:59.695694000 -0400 +@@ -9,5 +9,5 @@ + Version: @PACKAGE_VERSION@ + Requires.private: @LIBUSB@ + Cflags: -I${includedir} @PTHREAD_CFLAGS@ +-Libs: -L${libdir} -lhamlib ++Libs: -L${libdir} ${libdir}/libhamlib.a + Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@