CVS commit: pkgsrc/cad/qcad

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Nov 13 00:26:49 UTC 2019

Modified Files:
        pkgsrc/cad/qcad: Makefile

Log Message:
cad/qcad: Add workaround for debug/release library confusion

Avoid name clash between release-mode and debug-mode libraries so that
"libqcaddxf.so" is not rejected by the plugin loader.

Patch from John D. Baker via pkgsrc-users.


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 pkgsrc/cad/qcad/Makefile

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

Modified files:

Index: pkgsrc/cad/qcad/Makefile
diff -u pkgsrc/cad/qcad/Makefile:1.78 pkgsrc/cad/qcad/Makefile:1.79
--- pkgsrc/cad/qcad/Makefile:1.78       Sun Oct 27 15:43:23 2019
+++ pkgsrc/cad/qcad/Makefile    Wed Nov 13 00:26:49 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2019/10/27 15:43:23 nia Exp $
+# $NetBSD: Makefile,v 1.79 2019/11/13 00:26:49 gdt Exp $
 #
 
 DISTNAME=              qcad-3.23.0.0
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            cad
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=qcad/}
 EXTRACT_USING=         bsdtar
@@ -27,6 +27,21 @@ SUBST_FILES.paths+=  scripts/Help/ShowRea
 SUBST_FILES.paths+=    scripts/Widgets/LibraryBrowser/LibraryBrowser.js
 SUBST_VARS.paths=      PREFIX
 
+# Don't build intermediate libraries with the same name in debug mode
+# as in release mode. (Resolves regular libraries ending up in debug
+# mode, which breaks plugin loading.)
+# Reported on QCad Community Edition forum:
+#   https://qcad.org/rsforum/viewtopic.php?f=76&t=6708
+#
+SUBST_CLASSES+=         dbgmode
+SUBST_STAGE.dbgmode=    post-configure
+SUBST_MESSAGE.dbgmode=  Debug mode: lib*.so -> lib*_debug.so
+SUBST_FILES.dbgmode=    src/3rdparty/dxflib/Makefile.Debug
+SUBST_FILES.dbgmode+=   src/core/Makefile.Debug
+SUBST_FILES.dbgmode+=   src/entity/Makefile.Debug
+SUBST_FILES.dbgmode+=   src/operations/Makefile.Debug
+SUBST_SED.dbgmode=      -e 's,\(lib[dq]..*\)\(\.so\),\1_debug\2,g'
+
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=   glx egl
 .if ${OPSYS} != "Darwin"