Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Mar 2022 13:36:34 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d217e3884a6b - main - sysutils/xvidcap: disable rarian/scrollkeeper
Message-ID:  <202203151336.22FDaYLC096155@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d217e3884a6b0b55be4df899586515f2dad87a49

commit d217e3884a6b0b55be4df899586515f2dad87a49
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-03-15 12:53:58 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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 <bsd.port.mk>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203151336.22FDaYLC096155>