git: 1df8ab6a09d6 - main - cad/oregano: stop using rarian and small cleanup

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Baptiste Daroussin <bapt_at_FreeBSD.org>
Date: Tue, 15 Mar 2022 13:36:35 UTC
The branch main has been updated by bapt:

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

commit 1df8ab6a09d65b09b0cf1d877929ca5ba56edf61
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-03-15 13:15:35 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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 <bsd.port.mk>
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