From owner-svn-ports-head@freebsd.org Wed Feb 5 11:46:34 2020 Return-Path: Delivered-To: svn-ports-head@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 D42502484F2; Wed, 5 Feb 2020 11:46:34 +0000 (UTC) (envelope-from gahr@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 48CKXV5Ct9z4S2F; Wed, 5 Feb 2020 11:46:34 +0000 (UTC) (envelope-from gahr@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 AE0B2212C; Wed, 5 Feb 2020 11:46:34 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 015BkYce057140; Wed, 5 Feb 2020 11:46:34 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 015BkYQJ057139; Wed, 5 Feb 2020 11:46:34 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <202002051146.015BkYQJ057139@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Wed, 5 Feb 2020 11:46:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525268 - head/lang/expect X-SVN-Group: ports-head X-SVN-Commit-Author: gahr X-SVN-Commit-Paths: head/lang/expect X-SVN-Commit-Revision: 525268 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Feb 2020 11:46:34 -0000 Author: gahr Date: Wed Feb 5 11:46:34 2020 New Revision: 525268 URL: https://svnweb.freebsd.org/changeset/ports/525268 Log: lang/expect: register LDCONFIG path Because expect installs its shared libraries as symlinks libexpect.so.1 -> lib/expect5.45.4/libexpect5.45.4.so programs and libraries linked with -lexpect will fail to locate the final .so file. See https://lists.freebsd.org/pipermail/freebsd-tcltk/2020-February/000677.html Reported by: Daniel Morante Modified: head/lang/expect/Makefile Modified: head/lang/expect/Makefile ============================================================================== --- head/lang/expect/Makefile Wed Feb 5 11:42:25 2020 (r525267) +++ head/lang/expect/Makefile Wed Feb 5 11:46:34 2020 (r525268) @@ -3,10 +3,10 @@ PORTNAME= expect PORTVERSION= 5.45.4 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= lang tcl tk -MASTER_SITES= SF/expect/Expect/${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/Expect/${PORTVERSION} DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= tcltk@FreeBSD.org @@ -16,7 +16,7 @@ LICENSE= PD LICENSE_FILE= ${WRKSRC}/license.terms USES= tcl:tea autoreconf -USE_LDCONFIG= yes +USE_LDCONFIG= ${LOCALBASE}/lib/${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME} PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -25,8 +25,8 @@ SUB_LIST+= MANPREFIX=${MANPREFIX} TEST_TARGET= test post-install: - ${LN} -sf expect${PORTVERSION}/libexpect${PORTVERSION}.so \ - ${STAGEDIR}${PREFIX}/lib/libexpect.so.1 - ${LN} -sf libexpect.so.1 ${STAGEDIR}${PREFIX}/lib/libexpect.so + ${LN} -sf ${DISTNAME}/lib${DISTNAME}.so \ + ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.1 + ${LN} -sf lib${PORTNAME}.so.1 ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so .include