git: 1ae149dc78a8 - main - cad/librecad: Update to 2.2.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Sun, 18 Dec 2022 06:25:46 UTC
The branch main has been updated by jhale:

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

commit 1ae149dc78a8f091645b99e5d466a7d30656f187
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2022-12-18 06:19:42 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2022-12-18 06:24:09 +0000

    cad/librecad: Update to 2.2.0
    
    https://github.com/LibreCAD/LibreCAD/releases/tag/2.2.0
---
 cad/librecad/Makefile  | 10 +++-------
 cad/librecad/distinfo  |  8 +++-----
 cad/librecad/pkg-plist |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/cad/librecad/Makefile b/cad/librecad/Makefile
index 699687c17d17..8c3947d19f16 100644
--- a/cad/librecad/Makefile
+++ b/cad/librecad/Makefile
@@ -1,11 +1,7 @@
 PORTNAME=	librecad
-DISTVERSION=	2.2.0-rc4
-PORTREVISION=	1
+DISTVERSION=	2.2.0
 CATEGORIES=	cad
 
-PATCH_SITES=	https://github.com/BSDKaffee/LibreCAD/commit/
-PATCHFILES=	d81cd49db2421bb4ca9a283638500ebf1c7d02e5.patch:-p1 # Fix ortho tool with Clang
-
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	2D CAD system
 WWW=		https://librecad.org/
@@ -42,9 +38,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/ttf2lff ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}/unix/resources && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo
-	${INSTALL_DATA} ${WRKSRC}/unix/appdata/librecad.appdata.xml \
+	${INSTALL_DATA} ${WRKSRC}/unix/appdata/org.librecad.librecad.appdata.xml \
 		${STAGEDIR}${PREFIX}/share/metainfo
-	${INSTALL_DATA} ${WRKSRC}/desktop/librecad.desktop \
+	${INSTALL_DATA} ${WRKSRC}/unix/appdata/librecad.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/librecad/res/main/librecad.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
diff --git a/cad/librecad/distinfo b/cad/librecad/distinfo
index aa56dce7ca53..871ef74ffd1a 100644
--- a/cad/librecad/distinfo
+++ b/cad/librecad/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1666920763
-SHA256 (LibreCAD-LibreCAD-2.2.0-rc4_GH0.tar.gz) = f34c295cdb22bb4fca021a7cb95a648365e52b97b651a645ae5f78cd7a53e4d4
-SIZE (LibreCAD-LibreCAD-2.2.0-rc4_GH0.tar.gz) = 13833398
-SHA256 (d81cd49db2421bb4ca9a283638500ebf1c7d02e5.patch) = 55ec8409b6dfd83364655afae0f44f4aa8beb1f449d03c55505628f9111d94da
-SIZE (d81cd49db2421bb4ca9a283638500ebf1c7d02e5.patch) = 9814
+TIMESTAMP = 1671313202
+SHA256 (LibreCAD-LibreCAD-2.2.0_GH0.tar.gz) = dfce6f290b89707a0717789aa0cdea4ca5a96685fa0e65cfc49d70166bd182f2
+SIZE (LibreCAD-LibreCAD-2.2.0_GH0.tar.gz) = 13837301
diff --git a/cad/librecad/pkg-plist b/cad/librecad/pkg-plist
index 1f39c30c40e1..2abe5b197fee 100644
--- a/cad/librecad/pkg-plist
+++ b/cad/librecad/pkg-plist
@@ -1508,5 +1508,5 @@ share/applications/librecad.desktop
 %%DATADIR%%/qm/plugins_uk.qm
 %%DATADIR%%/qm/plugins_zh_cn.qm
 %%DATADIR%%/qm/plugins_zh_tw.qm
-share/metainfo/librecad.appdata.xml
+share/metainfo/org.librecad.librecad.appdata.xml
 share/pixmaps/librecad.png