From nobody Tue Mar 15 13:36:34 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 91C241A2AEE4; Tue, 15 Mar 2022 13:36:34 +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 4KHvZV3BRNz3qQv; Tue, 15 Mar 2022 13:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647351394; 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=Cl5RRe6TIkmzURAQCeiTqqe/7RGnDJGm+Utg/GrGcho=; b=SAUpNEKXBO073BuDukyoOdDiPl7gWzZXUq558L3xlESezGudrVS7mFhX4oo0TgWpXSaArE dwM8DbP83tcoyBEFKfDpVw2PoNwQFAPXkIHGGr8HhkEl3Ql7C26m6AlBJhrdgPbeLW01VY qapbm0QfvySzgqz23RAfMr1Ai3J1kqOjIN9HMdjTb/HaUhw3heA3k4plvsdb9mP3KJuA1T TPj5K+Kpld4QNQI0AJe4QtFi6+6CdlBf1CXF1SEj5RZTDMOVRPOm9gYh+z9z/RB8Wmzbnt otoKSWuk91J5qZYy4gc5XslTON5uVCzqd5VkPGgVL0WvdFy5uWsr7VK5yvRxAg== 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 47D49228F7; Tue, 15 Mar 2022 13:36:34 +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 22FDaYtW096156; Tue, 15 Mar 2022 13:36:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FDaYLC096155; Tue, 15 Mar 2022 13:36:34 GMT (envelope-from git) Date: Tue, 15 Mar 2022 13:36:34 GMT Message-Id: <202203151336.22FDaYLC096155@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: d217e3884a6b - main - sysutils/xvidcap: disable rarian/scrollkeeper 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: d217e3884a6b0b55be4df899586515f2dad87a49 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647351394; 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=Cl5RRe6TIkmzURAQCeiTqqe/7RGnDJGm+Utg/GrGcho=; b=R0HRfZ/imtdxDIaflo4gqQgFImUiI6NydQOwphqsizVW1kEM2EtL5+femxdNJ6EO+qNk6p OZSF7WLfaSZuUKLGJikIsfs42dC3matp16Z+ghjlXmjHYGYEER56+48PcoVerTPBT1cPrv wZ6XhU3bc5YGIoYQRmU0LW9U5TkseYW5PmOXRCpMbFuIpYJyEOHzOIq2JKlDK1CSwwLIVg 4YABnKLOQW8GsU/J4Tn437690pvLGP8MP/LmWsa6KHdgTAWp4HHYqje+XTyOJ3GatGxbDe yaSvShptPDJ68fZrNSlQJE3hNsXFpxtj45A4/XQ3gbyaRC0ReaZ3GYkfcdcBHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647351394; a=rsa-sha256; cv=none; b=nBA1LPmgJhhEyHkDJ5OTOEfEAsvH4MBUtytgMKar2fAcgi3AkLbPDVCmf9C3FHqZngDpxP ClphK5ij4FlWN+CgA1uhCWsCc2J1+8QfWOmPvj7SY5OrJ9ldN7ypkZNwT7lQqc4hXe0h6W hVfFGEKDSWcern9e5cHNOg38Cwtf84/lY1vPCZycfUTjd1GAQXbLExx++5jhJ7HP62Zfpw ES92djINWE5FLy/kxEW7Kr6qYfpPWmhJbz9vOIfxCWgB/p+Lz9x2TQnSkW/YWDdyvNGTdL jAmybioKvFArY6CxuYE+hDFuRDNHw3XxKF+/PRVNYb/PvV7wgKFB1sTIv8kOig== 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=d217e3884a6b0b55be4df899586515f2dad87a49 commit d217e3884a6b0b55be4df899586515f2dad87a49 Author: Baptiste Daroussin AuthorDate: 2022-03-15 12:53:58 +0000 Commit: Baptiste Daroussin CommitDate: 2022-03-15 13:36:29 +0000 sysutils/xvidcap: disable rarian/scrollkeeper xvidcap is the last consumer of rarian/scrollkeeper. While the build system allows to build without it, the install phase will fail trying to install omf files, workaround it by telling it there is no OMF files --- sysutils/xvidcap/Makefile | 9 ++++++--- sysutils/xvidcap/pkg-plist | 4 ---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile index ccef2be8ad16..5b446465ed5c 100644 --- a/sysutils/xvidcap/Makefile +++ b/sysutils/xvidcap/Makefile @@ -2,7 +2,7 @@ PORTNAME= xvidcap PORTVERSION= 1.1.7 -PORTREVISION= 12 +PORTREVISION= 13 PORTEPOCH= 1 CATEGORIES= sysutils multimedia MASTER_SITES= SF @@ -12,7 +12,6 @@ COMMENT= Capture your X display to individual frames or MPEG video LICENSE= GPLv3 -BUILD_DEPENDS= scrollkeeper-config:textproc/rarian LIB_DEPENDS= libdbus-1.so:devel/dbus \ libfreetype.so:print/freetype2 \ libswscale.so:multimedia/ffmpeg \ @@ -25,8 +24,8 @@ USES= gettext gmake gnome localbase magick:6,run pkgconfig xorg USE_GNOME= cairo gdkpixbuf2 glib20 libglade2 intltool USE_XORG= x11 xext xmu ice xfixes xdamage -INSTALLS_OMF= yes MANLANG= "" de es it +MAKE_ARGS= omffile="" GNU_CONFIGURE= yes # --export-dynamic fixes libglade problems @@ -55,4 +54,8 @@ pre-configure-DOCS-on: post-install-DOCS-on: ${RM} ${NULLDOCS:S|^|${STAGEDIR}${DOCSDIR}/|} +post-install: + ${RMDIR} ${STAGEDIR}${PREFIX}/share/omf/xvidcap + ${RMDIR} ${STAGEDIR}${PREFIX}/share/omf/ + .include diff --git a/sysutils/xvidcap/pkg-plist b/sysutils/xvidcap/pkg-plist index cd45bf477cbb..c4b78b6e2724 100644 --- a/sysutils/xvidcap/pkg-plist +++ b/sysutils/xvidcap/pkg-plist @@ -139,10 +139,6 @@ share/locale/de/LC_MESSAGES/xvidcap.mo share/locale/en/LC_MESSAGES/xvidcap.mo share/locale/es/LC_MESSAGES/xvidcap.mo share/locale/it/LC_MESSAGES/xvidcap.mo -share/omf/xvidcap/xvidcap-C.omf -share/omf/xvidcap/xvidcap-de.omf -share/omf/xvidcap/xvidcap-es.omf -share/omf/xvidcap/xvidcap-it.omf share/pixmaps/xvidcap.png %%DATADIR%%/glade/gnome-xvidcap.glade %%DATADIR%%/glade/xvidcap_logo.png