From nobody Sun Apr 10 08:32:10 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 527EB1A8E221; Sun, 10 Apr 2022 08:32:10 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KblbG1lDlz3kqB; Sun, 10 Apr 2022 08:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649579530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=chCSaVzql6NqZS/SR53+NO75a7/EiwJD1awl2arOAO4=; b=vnpAOfqJ9fxgi3NwX0IXJKpX2M75axmFt0hKBMzTlbAzb+hTKMDz9jvsPEnvnAFXeYbWkh fZrXJp8huRS8Wi4iPC+mtml/RSVsVufptZbrE3p/PWvNTM+70MKXwaX6VFw/fQfcrDy4tC KN7HfnGNri4eTc59/USQFl26NxsjS4oXU8BZeCj7usI5BwXrn1AB9YJsvYd3bTdb0W2kR9 T39HnLd2A3coEYItASskLhPj4pj8+nNruBmjN6Zj6U9DjECu2jpRviY5MeIeQ43sn4MopK Py0NMbu4XoccirHrPCGIC5lpJTVjXL1qZ+kmv+XigAOlJeYwEeK7iiTLJIboWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D4632F16; Sun, 10 Apr 2022 08:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23A8WA8H066342; Sun, 10 Apr 2022 08:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23A8WAf9066326; Sun, 10 Apr 2022 08:32:10 GMT (envelope-from git) Date: Sun, 10 Apr 2022 08:32:10 GMT Message-Id: <202204100832.23A8WAf9066326@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 3b86347c82ef - main - math/octave: fix pkg-plist. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b86347c82ef71a0486447b40684d1c3a0496cbe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649579530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=chCSaVzql6NqZS/SR53+NO75a7/EiwJD1awl2arOAO4=; b=GijLc8vJ4VXHOFRgaR14Phj6qCZLMuLue4hsgPxJLFkmEkHfqhWUy+ssm/Hpk3kyX0txu8 b9sl3sGXaDv959yucslpNA+1HkzD3NWJyroCjL8UbSpSzlxlp/YvjyaydYRbPX1U1qj4b1 wNVGzIR7IGpS0x/TW+q1sHPnHCfkMbQ9D7ZDh0SWWHn1jTp9tjbiD4eaoSC+yH1osl1g7n Fh8Ws8QSXLnSdlOZkMFYFbg+hJHFAOqoY1L3/n+OGY2x7xDJu8RURU5aviEafCtdb8N1Z0 9OJKtuyL7ZpI2cYiIzT886BmFWZrFsV3drM/rbfftNsoj7N+k1JLHCxFLbstfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649579530; a=rsa-sha256; cv=none; b=HL/vPrUZah9rAFKcJNiDsE0x/ve6mDNo2Qo+nD6FAASzGyyivOOkwjHN0wipr2ofX7w7dS iPJhkF3cT50QmYjkzpdVl7oPAlHod8XYzYXsFEcfppnrqU1AlcEbSyZuOfMzV5ic6E/20i QFA3twTRgBwtcnLvwM+B48HC34yc9gnGXBNQVYYAs7PKYZqlpsbdGscPpINXVFSkQngoS4 uxmsDW5p3n8bcF8KMF67cjPX1VqPQRRwCu2G42uECCdOyJkfYbndtjzW8U65RgwRZ8a+NE t/b8dIey9LuY0Un+7oYC5We2inWRiVQlFYmubV7k3vJP7E0OaxwZOjDNbC4NxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b86347c82ef71a0486447b40684d1c3a0496cbe commit 3b86347c82ef71a0486447b40684d1c3a0496cbe Author: Stephen Montgomery-Smith AuthorDate: 2022-04-10 08:28:17 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2022-04-10 08:28:17 +0000 math/octave: fix pkg-plist. - This installed a number of files whose path name is derived from the directory in which the port is built. This is a band-aid fix which deletes those files. This will enable the installation to work if the ports directory is something other than /usr/ports. Reported by: pkg-fallout@ --- math/octave/Makefile | 4 ++++ math/octave/pkg-plist | 17 ----------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/math/octave/Makefile b/math/octave/Makefile index 4f4b2c85b989..060d7fcbbe36 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -2,6 +2,7 @@ PORTNAME= octave PORTVERSION= ${OCTAVE_VERSION} +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= GNU @@ -116,8 +117,11 @@ pre-configure: ${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc ${REINPLACE_CMD} 's/"-qt=$$qt_version"/"-qt=qt$$qt_version"/' ${WRKSRC}/configure +RM_STUFF=${WRKSRC:C+/++:C+/.*++} + post-install: (cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib .) + ${RM} -r ${STAGEDIR}${DATADIR}/${PORTVERSION}/etc/tests/fixed/${WRKDIR:C+/++:C+/.*++} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist index fbf0f5b5045d..aac620126767 100644 --- a/math/octave/pkg-plist +++ b/math/octave/pkg-plist @@ -1211,23 +1211,6 @@ share/metainfo/org.octave.Octave.appdata.xml %%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/transpose.tst %%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/try.tst %%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/unwind.tst -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@cell/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@char/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@double/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@function_handle/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@int16/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@int32/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@int64/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@int8/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@logical/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@single/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@struct/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@uint16/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@uint32/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@uint64/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/@uint8/tbcover.m -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/bc-overloads.tst -%%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/usr/ports/math/octave/work/octave-%%OCTAVE_VERSION%%/test/tbcover.m %%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/fixed/while.tst %%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/libinterp/corefcn/Cell.cc-tst %%DATADIR%%/%%OCTAVE_VERSION%%/etc/tests/libinterp/corefcn/__contourc__.cc-tst