Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Aug 2024 17:22:36 GMT
From:      Zsolt Udvari <uzsolt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9a1364953026 - main - graphics/zathura-{pdf-poppler,ps}: fix metainfo
Message-ID:  <202408231722.47NHMaev050479@gitrepo.freebsd.org>

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

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

commit 9a1364953026b18055e78f78ff2063779f4603e3
Author:     mew14930xvi <mew14930xvi@inbox.lv>
AuthorDate: 2024-08-23 17:13:46 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-08-23 17:21:53 +0000

    graphics/zathura-{pdf-poppler,ps}: fix metainfo
    
    Removing pre-configure target fixes directory of metainfo.xml files.
    Remove unneeded STRIP_CMD.
    
    PR:             280989
    Approved by:    submitter is maintainer
---
 graphics/zathura-pdf-poppler/Makefile |  8 +++-----
 graphics/zathura-ps/Makefile          | 12 +++---------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile
index 52fcc7c2de7a..6c111a8b34bc 100644
--- a/graphics/zathura-pdf-poppler/Makefile
+++ b/graphics/zathura-pdf-poppler/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	zathura-pdf-poppler
 DISTVERSION=	0.3.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-poppler/download/
 
@@ -23,10 +24,7 @@ USE_GNOME=	cairo glib20
 CONFLICTS_INSTALL=	zathura-pdf-mupdf
 
 PLIST_FILES=	lib/zathura/libpdf-poppler.so \
-		share/appdata/org.pwmt.zathura-pdf-poppler.metainfo.xml \
-		share/applications/org.pwmt.zathura-pdf-poppler.desktop
-
-pre-configure:
-	@${REINPLACE_CMD} "s:join_paths(datadir, 'metainfo'):join_paths(datadir, 'appdata'):" ${WRKSRC}/meson.build
+		share/applications/org.pwmt.zathura-pdf-poppler.desktop \
+		share/metainfo/org.pwmt.zathura-pdf-poppler.metainfo.xml
 
 .include <bsd.port.mk>
diff --git a/graphics/zathura-ps/Makefile b/graphics/zathura-ps/Makefile
index b4fa4a3986e7..1c2e0ad46276 100644
--- a/graphics/zathura-ps/Makefile
+++ b/graphics/zathura-ps/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	zathura-ps
 DISTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://pwmt.org/projects/zathura-ps/download/
 
@@ -21,14 +22,7 @@ USES=		compiler:c11 desktop-file-utils gnome meson ninja pkgconfig \
 USE_GNOME=	cairo
 
 PLIST_FILES=	lib/zathura/libps.so \
-		share/appdata/org.pwmt.zathura-ps.metainfo.xml \
-		share/applications/org.pwmt.zathura-ps.desktop
-
-pre-configure:
-	${REINPLACE_CMD} "s:join_paths(datadir, 'metainfo'):join_paths(datadir, 'appdata'):" \
-		${WRKSRC}/meson.build
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/zathura/libps.so
+		share/applications/org.pwmt.zathura-ps.desktop \
+		share/metainfo/org.pwmt.zathura-ps.metainfo.xml
 
 .include <bsd.port.mk>



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