CVS commit: pkgsrc/cad/librecad

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Jan 20 23:29:25 UTC 2025

Modified Files:
        pkgsrc/cad/librecad: Makefile distinfo
        pkgsrc/cad/librecad/patches: patch-scripts_postprocess-unix.sh
Removed Files:
        pkgsrc/cad/librecad/patches:
            patch-librecad_src_lib_engine_rs__ellipse.cpp
            patch-librecad_src_lib_engine_rs__system.cpp

Log Message:
cad/librecad: Update to 2.2.0

This is a tiny update, from rc2 to the final release.

  - drop upstream patch now in upstream
  - drop fix for /usr to @PREFIX@ because upstream changed how they
    find paths, it clearly doesn't apply, and it looks like upstream's
    approach is ok


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/cad/librecad/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/cad/librecad/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/cad/librecad/patches/patch-librecad_src_lib_engine_rs__ellipse.cpp
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/cad/librecad/patches/patch-librecad_src_lib_engine_rs__system.cpp
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/cad/librecad/patches/patch-scripts_postprocess-unix.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/librecad/Makefile
diff -u pkgsrc/cad/librecad/Makefile:1.91 pkgsrc/cad/librecad/Makefile:1.92
--- pkgsrc/cad/librecad/Makefile:1.91   Mon Jan 20 23:09:47 2025
+++ pkgsrc/cad/librecad/Makefile        Mon Jan 20 23:29:25 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.91 2025/01/20 23:09:47 gdt Exp $
+# $NetBSD: Makefile,v 1.92 2025/01/20 23:29:25 gdt Exp $
 
-DISTNAME=      LibreCAD-2.2.0-rc2
-PKGNAME=       ${DISTNAME:tl:S/-rc2/.rc2/g}
-PKGREVISION=   24
+DISTNAME=      LibreCAD-2.2.0
+PKGNAME=       ${DISTNAME:tl}
+#PKGNAME=      ${DISTNAME:tl:S/-rc2/.rc2/g}
 CATEGORIES=    cad
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=LibreCAD/}
 GITHUB_PROJECT=        LibreCAD
@@ -42,12 +42,6 @@ SUBST_MESSAGE.qtdir= Set qt5/bin
 SUBST_FILES.qtdir+=    scripts/postprocess-unix.sh
 SUBST_VARS.qtdir+=     QTDIR
 
-SUBST_CLASSES+=                prefix
-SUBST_STAGE.prefix=    pre-configure
-SUBST_MESSAGE.prefix=  Fix hardcoded path
-SUBST_FILES.prefix+=   librecad/src/lib/engine/rs_system.cpp
-SUBST_VARS.prefix+=    PREFIX
-
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mclang*)
 BUILDLINK_TRANSFORM+=   rm:-fext-numeric-literals

Index: pkgsrc/cad/librecad/distinfo
diff -u pkgsrc/cad/librecad/distinfo:1.13 pkgsrc/cad/librecad/distinfo:1.14
--- pkgsrc/cad/librecad/distinfo:1.13   Tue Oct 26 10:04:13 2021
+++ pkgsrc/cad/librecad/distinfo        Mon Jan 20 23:29:25 2025
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:04:13 nia Exp $
+$NetBSD: distinfo,v 1.14 2025/01/20 23:29:25 gdt Exp $
 
-BLAKE2s (LibreCAD-2.2.0-rc2.tar.gz) = e0ed6497160a4d98ad64ab28036d235b02a121d7e96d878a15f67acb122d2fee
-SHA512 (LibreCAD-2.2.0-rc2.tar.gz) = e4f6041ea9685f57d08a2e33f7202341f31698e7faa860b2710109ad650be4a3f93f368044d5d7175dedd852e2a81d4de2a5d4949b559d74e41ecc9ad502b652
-Size (LibreCAD-2.2.0-rc2.tar.gz) = 13561381 bytes
-SHA1 (patch-librecad_src_lib_engine_rs__ellipse.cpp) = 0d236bb0047007bb994d93399360ed8dcdc33f3f
-SHA1 (patch-librecad_src_lib_engine_rs__system.cpp) = 38ceb3cde81042a1eeb6c68ead874e1a3a3512bb
+BLAKE2s (LibreCAD-2.2.0.tar.gz) = 336e387eb0c95fed9412b85cf8a0d1fb00f5754fb018326911848a1ef01934fa
+SHA512 (LibreCAD-2.2.0.tar.gz) = df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2
+Size (LibreCAD-2.2.0.tar.gz) = 13837301 bytes
 SHA1 (patch-librecad_src_main_qc__applicationwindow.cpp) = 1234b3b4e087c651da76c1d8d7770bebaa71dddc
-SHA1 (patch-scripts_postprocess-unix.sh) = dfa529bff1251967764c1a21654976844cc7e19a
+SHA1 (patch-scripts_postprocess-unix.sh) = 16f2768867da15b6309bd1e1368b3bf833eec6d7

Index: pkgsrc/cad/librecad/patches/patch-scripts_postprocess-unix.sh
diff -u pkgsrc/cad/librecad/patches/patch-scripts_postprocess-unix.sh:1.4 pkgsrc/cad/librecad/patches/patch-scripts_postprocess-unix.sh:1.5
--- pkgsrc/cad/librecad/patches/patch-scripts_postprocess-unix.sh:1.4   Sat Oct 26 12:23:01 2019
+++ pkgsrc/cad/librecad/patches/patch-scripts_postprocess-unix.sh       Mon Jan 20 23:29:25 2025
@@ -1,13 +1,13 @@
-$NetBSD: patch-scripts_postprocess-unix.sh,v 1.4 2019/10/26 12:23:01 kamil Exp $
+$NetBSD: patch-scripts_postprocess-unix.sh,v 1.5 2025/01/20 23:29:25 gdt Exp $
 
 Fix QTDIR.
 
---- scripts/postprocess-unix.sh.orig   2018-02-15 20:54:45.000000000 +0000
+--- scripts/postprocess-unix.sh.orig   2022-12-17 11:13:13.000000000 +0000
 +++ scripts/postprocess-unix.sh
-@@ -8,7 +8,7 @@ APPDATADIR="${THISDIR}/unix/appdata"
- TSDIRLC="${LCDIR}/ts"
+@@ -9,7 +9,7 @@ TSDIRLC="${LCDIR}/ts"
  TSDIRPI="${PIDIR}/ts"
  SPTDIR="${LCDIR}/support"
+ DESKTOPDIR="${THISDIR}/desktop"
 -LRELEASE="lrelease"
 +LRELEASE="@QTDIR@/bin/lrelease"