From nobody Tue Mar 15 13:36:35 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 43A141A2AF64; Tue, 15 Mar 2022 13:36:36 +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 4KHvZW5QVFz3qR6; Tue, 15 Mar 2022 13:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647351395; 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=Mn+ac0GGsWkhRanaSE7zrxdpVpZuOe+mDOWB6/qrwwQ=; b=M08zTleFutzDe3pnzQpR8kj99BS6OnVXKNyLlOR82PJaRQQiDdJVR4l6naqU9A0o1H6fmw EUn3L1ROEhIipU22Kr4diVi0Y6nOnm0jCkCnWjBYaZzbyP/i2yLfPcMgaGXfOHQpEKy/9u y3tylYBrfbtidul+2rhNUKxnJU7E9WhO13iOU+qhkxnRpebnhF20+UrTaQoD79NNKRvWiL fZj8phHdVBZXZ+dCGwLgx7VNLGdMuaA+A6ds0w4z0pSWEOyPc5dJOPJKevCTUHbpC1Q0Mt cnh11MvhNdUjyR7PKW6CwiFyfAqFgcK2zezso6Lh4zmRyO/R4i1JIXWGTySQZQ== 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 71F28227F1; Tue, 15 Mar 2022 13:36:35 +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 22FDaZaC096180; Tue, 15 Mar 2022 13:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FDaZ3j096179; Tue, 15 Mar 2022 13:36:35 GMT (envelope-from git) Date: Tue, 15 Mar 2022 13:36:35 GMT Message-Id: <202203151336.22FDaZ3j096179@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 1df8ab6a09d6 - main - cad/oregano: stop using rarian and small cleanup 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1df8ab6a09d65b09b0cf1d877929ca5ba56edf61 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647351395; 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=Mn+ac0GGsWkhRanaSE7zrxdpVpZuOe+mDOWB6/qrwwQ=; b=ynTHBzM9I/qLbxcjaHgz14ucRD9jW2499NcicILOaZDK6QkBW34kDAX/iJpF+i4ZkCRbs7 0BIX2wvWULt8jPxJVbZcvw4nf2f62lA7FPhQk5snb9OxlHfyTbKRdooRALCs5kGrpP7mCe QhSCDRCvSmsc+IhOI8XjvWihbsjPHcS5ZBePzDtm1B+mRqBmbaos2Ored6dRsx/Lj1k94g TcUv/8zauzGjIwfg+siGgZWkgij9XSmznUZCuiBc3ykpYxewnC/Y2soCE8CRUBCthpAgwI NFp+j/FoyV93BaC8+4dzd3zvpmNFCxU0bjIH25sjRX8dVUEA++neQtqNqnEXcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647351395; a=rsa-sha256; cv=none; b=VK9wpgVJIA2E/U7DBf5ymBbM4wqjmUjhPZaYtpkBxGAJY96OSJ2FPfiUZoRE/0cOpM0nQ7 oEjghMn8VOzAipUgTyp9bQNYvcnBlhbFnHwOBkp+MfeN64MdY3OcgWaTzow6y+UYmYjNYe eSgCZjvd/W7ffCEZk4KD6ZjHvo/aGs2vYUaur/z1hoMXLYTClfunA2eHYxgcIOOopRLj54 7zHsFnrncBLeTFJ2DI+PrW9Zo2qKeuRDQuIj6XaHInSruAFmZn2TmRfC2Ghq+ZU3mvKmj5 yT43aJ8VIRLZVe3ZLsxX7X4Jji2JvEG1zg4DdTD8a/56qNxy5/04OPRpoYpr2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=1df8ab6a09d65b09b0cf1d877929ca5ba56edf61 commit 1df8ab6a09d65b09b0cf1d877929ca5ba56edf61 Author: Baptiste Daroussin AuthorDate: 2022-03-15 13:15:35 +0000 Commit: Baptiste Daroussin CommitDate: 2022-03-15 13:36:29 +0000 cad/oregano: stop using rarian and small cleanup rarian is deprecated and unused anymore, stop teaching oregano package to run scrollkeeper on those files. While here stop installing the compiled glib schema which will overwrite the system one. Oregano uses waf, which will wrongly run glib-compile-schema, but also update-mime-info, update-desktop-database which should be run at install time only. A real fix would be to prevent waf from running all those programs, but waf is a blackbox, and patching it is complicated per package. --- cad/oregano/Makefile | 4 ++-- cad/oregano/pkg-plist | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile index 5480595ebe09..905920e05616 100644 --- a/cad/oregano/Makefile +++ b/cad/oregano/Makefile @@ -3,6 +3,7 @@ PORTNAME= oregano DISTVERSIONPREFIX= v DISTVERSION= 0.84.43 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -22,12 +23,11 @@ USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 gtksourceview3 intltool libxml2 pan GLIB_SCHEMAS= io.ahoi.oregano.gschema.xml -INSTALLS_OMF= yes - post-patch: @${REINPLACE_CMD} 's|$${MANDIR}|${MANPREFIX}/man|' ${WRKSRC}/data/wscript post-stage: @cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/oregano bin/microtests + ${RM} ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/gschemas.compiled .include diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist index 47ab0555d23e..95be9022fdb0 100644 --- a/cad/oregano/pkg-plist +++ b/cad/oregano/pkg-plist @@ -2,7 +2,6 @@ bin/microtests bin/oregano man/man1/oregano.1.gz share/applications/oregano.desktop -share/glib-2.0/schemas/gschemas.compiled share/help/C/oregano/figures/Screenshot-zener.oregano.png share/help/C/oregano/figures/oregano-Generate-List.png share/help/C/oregano/figures/oregano-Simulate.png