CVS commit: pkgsrc/cad/qcad

["Iain Hibbert" <plunky%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   plunky
Date:           Sun Dec 29 14:15:32 UTC 2019

Modified Files:
        pkgsrc/cad/qcad: Makefile PLIST

Log Message:
install icons as qcad.???


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/cad/qcad/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/cad/qcad/PLIST

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.81 pkgsrc/cad/qcad/Makefile:1.82
--- pkgsrc/cad/qcad/Makefile:1.81       Sun Dec 29 12:44:15 2019
+++ pkgsrc/cad/qcad/Makefile    Sun Dec 29 14:15:32 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2019/12/29 12:44:15 plunky Exp $
+# $NetBSD: Makefile,v 1.82 2019/12/29 14:15:32 plunky Exp $
 #
 
 DISTNAME=              qcad-3.24.0.1
+PKGREVISION=           1
 CATEGORIES=            cad
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=qcad/}
 EXTRACT_USING=         bsdtar
@@ -26,6 +27,12 @@ SUBST_FILES.paths+=  scripts/Help/ShowRea
 SUBST_FILES.paths+=    scripts/Widgets/LibraryBrowser/LibraryBrowser.js
 SUBST_VARS.paths=      PREFIX
 
+SUBST_CLASSES+=                icon
+SUBST_STAGE.icon=      pre-configure
+SUBST_MESSAGE.icon=    Fix icon name.
+SUBST_FILES.icon=      qcad.desktop
+SUBST_SED.icon=                -e s,qcad_icon,qcad,g
+
 .include "../../mk/bsd.prefs.mk"
 PLIST_VARS+=   glx egl
 .if ${OPSYS} != "Darwin"
@@ -56,15 +63,15 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/qcad.desktop \
            ${DESTDIR}${PREFIX}/share/applications
        ${INSTALL_DATA} ${WRKSRC}/support/logo/logo_512.svg \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qcad_icon.svg
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/qcad.svg
        ${INSTALL_DATA} ${WRKSRC}/support/logo/logo_512.svg \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/qcad_icon.svg
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/qcad.svg
        ${INSTALL_DATA} ${WRKSRC}/support/logo/logo_512.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/qcad_icon.png
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/qcad.png
        ${INSTALL_DATA} ${WRKSRC}/scripts/qcad_icon.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/256x256/apps/qcad_icon.png
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/256x256/apps/qcad.png
        ${INSTALL_DATA} ${WRKSRC}/support/doc/api/qcad_icon.png \
-           ${DESTDIR}${PREFIX}/share/icons/hicolor/64x64/apps/qcad_icon.png
+           ${DESTDIR}${PREFIX}/share/icons/hicolor/64x64/apps/qcad.png
        ${INSTALL_LIB} ${WRKSRC}/src/3rdparty/qt-labs-qtscriptgenerator-*/qtbindings/qtscript_*/libqtscript_*.so* \
            ${DESTDIR}${PREFIX}/lib/qcad/plugins/script
        ${INSTALL_MAN} ${WRKSRC}/qcad.1 \

Index: pkgsrc/cad/qcad/PLIST
diff -u pkgsrc/cad/qcad/PLIST:1.16 pkgsrc/cad/qcad/PLIST:1.17
--- pkgsrc/cad/qcad/PLIST:1.16  Sun Dec 29 12:44:15 2019
+++ pkgsrc/cad/qcad/PLIST       Sun Dec 29 14:15:32 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2019/12/29 12:44:15 plunky Exp $
+@comment $NetBSD: PLIST,v 1.17 2019/12/29 14:15:32 plunky Exp $
 bin/qcad
 lib/libdxflib.so
 lib/libopennurbs.so
@@ -10547,11 +10547,11 @@ ${PLIST.glx}lib/qcad/xcbglintegrations/l
 lib/qcad/xcbglintegrations/readme.txt
 man/man1/qcad.1
 share/applications/qcad.desktop
-share/icons/hicolor/256x256/apps/qcad_icon.png
-share/icons/hicolor/512x512/apps/qcad_icon.png
-share/icons/hicolor/512x512/apps/qcad_icon.svg
-share/icons/hicolor/64x64/apps/qcad_icon.png
-share/icons/hicolor/scalable/apps/qcad_icon.svg
+share/icons/hicolor/256x256/apps/qcad.png
+share/icons/hicolor/512x512/apps/qcad.png
+share/icons/hicolor/512x512/apps/qcad.svg
+share/icons/hicolor/64x64/apps/qcad.png
+share/icons/hicolor/scalable/apps/qcad.svg
 share/qcad/examples/calibration.dxf
 share/qcad/examples/colors.dxf
 share/qcad/examples/entities.dxf