CVS commit: pkgsrc/cad/gcad3d

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/cad/gcad3d
From: "Iain Hibbert" <plunky%netbsd.org@localhost>
Date: Mon, 23 May 2022 19:10:04 +0000

Module Name:    pkgsrc
Committed By:   plunky
Date:           Mon May 23 19:10:03 UTC 2022

Added Files:
        pkgsrc/cad/gcad3d: DESCR Makefile PLIST distinfo
        pkgsrc/cad/gcad3d/patches: patch-src_APP_srcOS.mak patch-src_gcad3d
            patch-src_gui__version__set.sh patch-src_options.sh
            patch-src_ut_ut__err.c patch-src_ut_ut__os__aix.c patch-src_xa_xa.c
            patch-src_xa_xa__main.c patch-src_xa_xa__msg.h

Log Message:
add gcad3d, a GTK based 3D CAD software

3D - CADCAM - software

gCAD3D has its own:
    import and export-programs (Step, Iges, VRML, DXF, SVG ..),
    integrated 3D-OpenGL viewer,
    program interpreter for geometry and NC commands in 3D,
    integrated NC processor.
    programming interface for userprograms (plugins)
    programming interface for RemoteControl


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/cad/gcad3d/DESCR pkgsrc/cad/gcad3d/Makefile \
    pkgsrc/cad/gcad3d/PLIST pkgsrc/cad/gcad3d/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/cad/gcad3d/patches/patch-src_APP_srcOS.mak \
    pkgsrc/cad/gcad3d/patches/patch-src_gcad3d \
    pkgsrc/cad/gcad3d/patches/patch-src_gui__version__set.sh \
    pkgsrc/cad/gcad3d/patches/patch-src_options.sh \
    pkgsrc/cad/gcad3d/patches/patch-src_ut_ut__err.c \
    pkgsrc/cad/gcad3d/patches/patch-src_ut_ut__os__aix.c \
    pkgsrc/cad/gcad3d/patches/patch-src_xa_xa.c \
    pkgsrc/cad/gcad3d/patches/patch-src_xa_xa__main.c \
    pkgsrc/cad/gcad3d/patches/patch-src_xa_xa__msg.h

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

Added files:

Index: pkgsrc/cad/gcad3d/DESCR
diff -u /dev/null pkgsrc/cad/gcad3d/DESCR:1.1
--- /dev/null   Mon May 23 19:10:03 2022
+++ pkgsrc/cad/gcad3d/DESCR     Mon May 23 19:10:03 2022
@@ -0,0 +1,9 @@
+3D - CADCAM - software
+
+gCAD3D has its own:
+    import and export-programs (Step, Iges, VRML, DXF, SVG ..),
+    integrated 3D-OpenGL viewer,
+    program interpreter for geometry and NC commands in 3D,
+    integrated NC processor.
+    programming interface for userprograms (plugins)
+    programming interface for RemoteControl
Index: pkgsrc/cad/gcad3d/Makefile
diff -u /dev/null pkgsrc/cad/gcad3d/Makefile:1.1
--- /dev/null   Mon May 23 19:10:03 2022
+++ pkgsrc/cad/gcad3d/Makefile  Mon May 23 19:10:03 2022
@@ -0,0 +1,86 @@
+# $NetBSD: Makefile,v 1.1 2022/05/23 19:10:03 plunky Exp $
+#
+
+#
+# gCAD3D is open source but not open development. Each release is added
+# to github as a single commit, with the message as the ChangeLog. So,
+# the tag is needed to fetch the right version.
+#
+
+DISTNAME=      gcad3d-2.46.24
+CATEGORIES=    cad editors
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=gcad3d/}
+GITHUB_PROJECT=        gcad3d
+GITHUB_TAG=    ff33b206f158092dbac7f2b1236c3d38fee5d656
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.gcad3d.org/
+COMMENT=       3D CADCAM software
+LICENSE=       gnu-gpl-v3
+
+USE_TOOLS=     gmake pkg-config
+USE_LANGUAGES= c99
+TOOLS_NOOP+=   ctags   # exctags is used but not needed
+
+WRKSRC=                ${WRKDIR}/${PKGBASE}-${GITHUB_TAG}
+
+REPLACE_SH+=   src/APP/del_obj.sh
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_MESSAGE.paths=   Fixing hardcoded paths
+SUBST_FILES.paths=     src/gcad3d
+SUBST_VARS.paths=      PREFIX
+
+#
+# The gCAD3D build system is a custom shell script plus a bunch of makefiles
+# with no way to add flags. We leverage cwrappers to wedge the flags we need
+# for pkgsrc in there. pkglint suggests to use :Q but we don't want that.
+#
+CWRAPPERS_PREPEND.cc=  ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
+
+BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+DL_AUTO_VARS=          yes
+
+ALL_ENV+=              DIR_DEV=${WRKSRC}/
+ALL_ENV+=              DIR_BIN=${WRKSRC}/
+
+INSTALLATION_DIRS=     bin lib/gcad3d/plugins/cut1 share/applications share/pixmaps
+INSTALLATION_DIRS+=    share/gcad3d/icons share/doc/gcad3d/html share/doc/gcad3d/msg
+
+do-configure:
+       cd ${WRKSRC}/src/APP && env ${CONFIGURE_ENV} ./do debug_OFF
+
+do-build:
+       cd ${WRKSRC}/src/APP && env ${MAKE_ENV} ./do complete
+
+# see rpm/gcad3d.spec
+do-install:
+       ${INSTALL_SCRIPT} ${WRKSRC}/src/gcad3d ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/gcad3d/gCAD3D ${DESTDIR}${PREFIX}/lib/gcad3d
+       ${INSTALL_PROGRAM} ${WRKSRC}/gcad3d/GUI_dlg1_gtk2 ${DESTDIR}${PREFIX}/lib/gcad3d
+       ${INSTALL_PROGRAM} ${WRKSRC}/gcad3d/GUI_file_gtk2 ${DESTDIR}${PREFIX}/lib/gcad3d
+       ${INSTALL_LIB} ${WRKSRC}/gcad3d/*.so ${DESTDIR}${PREFIX}/lib/gcad3d
+       ${INSTALL_LIB} ${WRKSRC}/gcad3d/plugins/*.so ${DESTDIR}${PREFIX}/lib/gcad3d/plugins
+       ${INSTALL_LIB} ${WRKSRC}/gcad3d/plugins/cut1/* ${DESTDIR}${PREFIX}/lib/gcad3d/plugins/cut1
+       ${INSTALL_DATA} ${WRKSRC}/src/gcad3d.desktop ${DESTDIR}${PREFIX}/share/applications
+       ${INSTALL_DATA} ${WRKSRC}/icons/gCAD3D.xpm ${DESTDIR}${PREFIX}/share/pixmaps/gcad3d.xpm
+       ${INSTALL_DATA} ${WRKSRC}/packages/examples.gz ${DESTDIR}${PREFIX}/share/gcad3d
+       ${INSTALL_DATA} ${WRKSRC}/icons/*.png ${DESTDIR}${PREFIX}/share/gcad3d/icons
+       ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${DESTDIR}${PREFIX}/share/gcad3d/icons
+       ${INSTALL_DATA} ${WRKSRC}/icons/*.bmp ${DESTDIR}${PREFIX}/share/gcad3d/icons
+       ${INSTALL_DATA} ${WRKSRC}/doc/html/*.htm ${DESTDIR}${PREFIX}/share/doc/gcad3d/html
+       ${INSTALL_DATA} ${WRKSRC}/doc/html/*.png ${DESTDIR}${PREFIX}/share/doc/gcad3d/html
+       ${INSTALL_DATA} ${WRKSRC}/doc/html/*.js ${DESTDIR}${PREFIX}/share/doc/gcad3d/html
+       ${INSTALL_DATA} ${WRKSRC}/doc/msg/*.txt ${DESTDIR}${PREFIX}/share/doc/gcad3d/msg
+       ${INSTALL_DATA} ${WRKSRC}/doc/gCAD3D_log.txt ${DESTDIR}${PREFIX}/share/doc/gcad3d/NEWS
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/gcad3d
+       ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/gcad3d
+
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtkglarea2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/cad/gcad3d/PLIST
diff -u /dev/null pkgsrc/cad/gcad3d/PLIST:1.1
--- /dev/null   Mon May 23 19:10:03 2022
+++ pkgsrc/cad/gcad3d/PLIST     Mon May 23 19:10:03 2022
@@ -0,0 +1,231 @@
+@comment $NetBSD: PLIST,v 1.1 2022/05/23 19:10:03 plunky Exp $
+bin/gcad3d
+lib/gcad3d/GUI_dlg1_gtk2
+lib/gcad3d/GUI_file_gtk2
+lib/gcad3d/gCAD3D
+lib/gcad3d/plugins/DemoAssy1.so
+lib/gcad3d/plugins/DemoPlugin_Create.so
+lib/gcad3d/plugins/DemoPlugin_Dialog.so
+lib/gcad3d/plugins/DemoPlugin_Hili.so
+lib/gcad3d/plugins/DemoPlugin_Mousemove.so
+lib/gcad3d/plugins/DemoPlugin_Resolv.so
+lib/gcad3d/plugins/Demo_CPP.so
+lib/gcad3d/plugins/Demo_appDat1.so
+lib/gcad3d/plugins/Demo_export.so
+lib/gcad3d/plugins/Demo_gsrc.so
+lib/gcad3d/plugins/Demo_gui1.so
+lib/gcad3d/plugins/Demo_gui_anim1.so
+lib/gcad3d/plugins/Demo_gui_plate.so
+lib/gcad3d/plugins/Demo_toolbar1.so
+lib/gcad3d/plugins/Demo_toolbar2.so
+lib/gcad3d/plugins/Demo_tstf_1.so
+lib/gcad3d/plugins/Demosimple.so
+lib/gcad3d/plugins/PRC_cut1.so
+lib/gcad3d/plugins/PRC_demo1.so
+lib/gcad3d/plugins/cut1/G-Code
+lib/gcad3d/xa_dxf_r.so
+lib/gcad3d/xa_dxf_w.so
+lib/gcad3d/xa_edmpt.so
+lib/gcad3d/xa_gui.so
+lib/gcad3d/xa_gui_gtk2.so
+lib/gcad3d/xa_ige_r.so
+lib/gcad3d/xa_obj_r.so
+lib/gcad3d/xa_print__.so
+lib/gcad3d/xa_stl_r.so
+lib/gcad3d/xa_stp_r.so
+lib/gcad3d/xa_stp_w.so
+lib/gcad3d/xa_svg_w.so
+lib/gcad3d/xa_vr2_exp.so
+lib/gcad3d/xa_vr2_r.so
+lib/gcad3d/xa_wrl_r.so
+share/applications/gcad3d.desktop
+share/doc/gcad3d/LICENSE
+share/doc/gcad3d/NEWS
+share/doc/gcad3d/README
+share/doc/gcad3d/html/3Dfrom2D_de.htm
+share/doc/gcad3d/html/3Dfrom2D_en.htm
+share/doc/gcad3d/html/APP_GIS1_de.htm
+share/doc/gcad3d/html/APP_GIS1_en.htm
+share/doc/gcad3d/html/AddOn_de.htm
+share/doc/gcad3d/html/AddOn_en.htm
+share/doc/gcad3d/html/Appli_de.htm
+share/doc/gcad3d/html/Appli_en.htm
+share/doc/gcad3d/html/Attribs_de.htm
+share/doc/gcad3d/html/Attribs_en.htm
+share/doc/gcad3d/html/Browser_de.htm
+share/doc/gcad3d/html/Browser_en.htm
+share/doc/gcad3d/html/CAD_Ace_de.htm
+share/doc/gcad3d/html/CAD_Ace_en.htm
+share/doc/gcad3d/html/CAD_Activ_de.htm
+share/doc/gcad3d/html/CAD_Activ_en.htm
+share/doc/gcad3d/html/CAD_Analyz_de.htm
+share/doc/gcad3d/html/CAD_Analyz_en.htm
+share/doc/gcad3d/html/CAD_Base_de.htm
+share/doc/gcad3d/html/CAD_Base_en.htm
+share/doc/gcad3d/html/CAD_CI_de.htm
+share/doc/gcad3d/html/CAD_CI_en.htm
+share/doc/gcad3d/html/CAD_CV_de.htm
+share/doc/gcad3d/html/CAD_CV_en.htm
+share/doc/gcad3d/html/CAD_Joint_de.htm
+share/doc/gcad3d/html/CAD_Joint_en.htm
+share/doc/gcad3d/html/CAD_LN_de.htm
+share/doc/gcad3d/html/CAD_LN_en.htm
+share/doc/gcad3d/html/CAD_Model_de.htm
+share/doc/gcad3d/html/CAD_Model_en.htm
+share/doc/gcad3d/html/CAD_Modify_de.htm
+share/doc/gcad3d/html/CAD_Modify_en.htm
+share/doc/gcad3d/html/CAD_PLN_de.htm
+share/doc/gcad3d/html/CAD_PLN_en.htm
+share/doc/gcad3d/html/CAD_PT_de.htm
+share/doc/gcad3d/html/CAD_PT_en.htm
+share/doc/gcad3d/html/CAD_SOL_de.htm
+share/doc/gcad3d/html/CAD_SOL_en.htm
+share/doc/gcad3d/html/CAD_SUR_de.htm
+share/doc/gcad3d/html/CAD_SUR_en.htm
+share/doc/gcad3d/html/CAD_Tra_de.htm
+share/doc/gcad3d/html/CAD_Tra_en.htm
+share/doc/gcad3d/html/CAD_TxtG_de.htm
+share/doc/gcad3d/html/CAD_TxtG_en.htm
+share/doc/gcad3d/html/CAD_Var_de.htm
+share/doc/gcad3d/html/CAD_Var_en.htm
+share/doc/gcad3d/html/CAD_Vec_de.htm
+share/doc/gcad3d/html/CAD_Vec_en.htm
+share/doc/gcad3d/html/CAD_examples_de.htm
+share/doc/gcad3d/html/CAD_examples_en.htm
+share/doc/gcad3d/html/CAD_input_de.htm
+share/doc/gcad3d/html/CAD_input_en.htm
+share/doc/gcad3d/html/CAD_using_de.htm
+share/doc/gcad3d/html/CAD_using_en.htm
+share/doc/gcad3d/html/Catalog_de.htm
+share/doc/gcad3d/html/Catalog_en.htm
+share/doc/gcad3d/html/Demo_appDat1_en.htm
+share/doc/gcad3d/html/Demo_toolbar1_en.htm
+share/doc/gcad3d/html/EDMPT_de.htm
+share/doc/gcad3d/html/EDMPT_en.htm
+share/doc/gcad3d/html/GMVO_en.htm
+share/doc/gcad3d/html/GROUP_de.htm
+share/doc/gcad3d/html/GROUP_en.htm
+share/doc/gcad3d/html/IO_de.htm
+share/doc/gcad3d/html/IO_en.htm
+share/doc/gcad3d/html/IO_svg_de.htm
+share/doc/gcad3d/html/IO_svg_en.htm
+share/doc/gcad3d/html/Images_de.htm
+share/doc/gcad3d/html/Images_en.htm
+share/doc/gcad3d/html/MAN_de.htm
+share/doc/gcad3d/html/MAN_en.htm
+share/doc/gcad3d/html/MS_dev_en.htm
+share/doc/gcad3d/html/Measure_de.htm
+share/doc/gcad3d/html/Measure_en.htm
+share/doc/gcad3d/html/Notes_de.htm
+share/doc/gcad3d/html/Notes_en.htm
+share/doc/gcad3d/html/PRC__demo1_de.htm
+share/doc/gcad3d/html/PRC__demo1_en.htm
+share/doc/gcad3d/html/PRC_cut1_de.htm
+share/doc/gcad3d/html/PRC_cut1_en.htm
+share/doc/gcad3d/html/Plugin_de.htm
+share/doc/gcad3d/html/Plugin_en.htm
+share/doc/gcad3d/html/Process_de.htm
+share/doc/gcad3d/html/Process_en.htm
+share/doc/gcad3d/html/RemoteControl_de.htm
+share/doc/gcad3d/html/RemoteControl_en.htm
+share/doc/gcad3d/html/SW_layout_en.htm
+share/doc/gcad3d/html/Search_en.htm
+share/doc/gcad3d/html/Select_de.htm
+share/doc/gcad3d/html/Select_en.htm
+share/doc/gcad3d/html/Settings_de.htm
+share/doc/gcad3d/html/Settings_en.htm
+share/doc/gcad3d/html/TextureEditor_de.htm
+share/doc/gcad3d/html/TextureEditor_en.htm
+share/doc/gcad3d/html/Textures_de.htm
+share/doc/gcad3d/html/Textures_en.htm
+share/doc/gcad3d/html/Using_de.htm
+share/doc/gcad3d/html/Using_en.htm
+share/doc/gcad3d/html/VWR_de.htm
+share/doc/gcad3d/html/VWR_en.htm
+share/doc/gcad3d/html/Video_en.htm
+share/doc/gcad3d/html/bc.png
+share/doc/gcad3d/html/blk.png
+share/doc/gcad3d/html/bo.png
+share/doc/gcad3d/html/dev_doc_en.htm
+share/doc/gcad3d/html/dev_inf_en.htm
+share/doc/gcad3d/html/empty_de.htm
+share/doc/gcad3d/html/empty_en.htm
+share/doc/gcad3d/html/file_format_en.htm
+share/doc/gcad3d/html/format_gcad_A_de.htm
+share/doc/gcad3d/html/format_gcad_A_en.htm
+share/doc/gcad3d/html/gCAD3D_basics_de.htm
+share/doc/gcad3d/html/gCAD3D_basics_en.htm
+share/doc/gcad3d/html/gCAD3D_feat_de.htm
+share/doc/gcad3d/html/gCAD3D_feat_en.htm
+share/doc/gcad3d/html/gCAD3D_formats_de.htm
+share/doc/gcad3d/html/gCAD3D_lic_de.htm
+share/doc/gcad3d/html/gCAD3D_lic_en.htm
+share/doc/gcad3d/html/gCAD3D_princ_de.htm
+share/doc/gcad3d/html/gCAD3D_princ_en.htm
+share/doc/gcad3d/html/gCAD3D_startNC_de.htm
+share/doc/gcad3d/html/gCAD3D_startNC_en.htm
+share/doc/gcad3d/html/gCAD3D_startVRML_de.htm
+share/doc/gcad3d/html/gCAD3D_startVRML_en.htm
+share/doc/gcad3d/html/htmTree.js
+share/doc/gcad3d/html/img_doc_sur_extru1.png
+share/doc/gcad3d/html/img_doc_sur_revo1.png
+share/doc/gcad3d/html/img_doc_sur_sph1.png
+share/doc/gcad3d/html/img_doc_sur_sweep1.png
+share/doc/gcad3d/html/img_doc_sur_tps1.png
+share/doc/gcad3d/html/index_de.htm
+share/doc/gcad3d/html/index_en.htm
+share/doc/gcad3d/html/index_tree_de.htm
+share/doc/gcad3d/html/index_tree_de.htm.htm
+share/doc/gcad3d/html/index_tree_en.htm
+share/doc/gcad3d/html/index_tree_en.htm.htm
+share/doc/gcad3d/html/install_en.htm
+share/doc/gcad3d/html/keycodes_en.htm
+share/doc/gcad3d/html/p.png
+share/doc/gcad3d/html/transl_en.htm
+share/doc/gcad3d/html/wcut_de.htm
+share/doc/gcad3d/html/xa.png
+share/doc/gcad3d/msg/msg_const_de.txt
+share/doc/gcad3d/msg/msg_const_en.txt
+share/doc/gcad3d/msg/msg_const_es.txt
+share/doc/gcad3d/msg/msg_const_fr.txt
+share/doc/gcad3d/msg/msg_const_it.txt
+share/doc/gcad3d/msg/msg_const_ms.txt
+share/doc/gcad3d/msg/msg_de.txt
+share/doc/gcad3d/msg/msg_en.txt
+share/doc/gcad3d/msg/msg_es.txt
+share/doc/gcad3d/msg/msg_fr.txt
+share/doc/gcad3d/msg/msg_it.txt
+share/doc/gcad3d/msg/msg_ms.txt
+share/gcad3d/examples.gz
+share/gcad3d/icons/Arrowl.png
+share/gcad3d/icons/Arrowr.png
+share/gcad3d/icons/MouseM0.png
+share/gcad3d/icons/MouseM1.png
+share/gcad3d/icons/MouseM2.png
+share/gcad3d/icons/MouseM3.png
+share/gcad3d/icons/MouseM4.png
+share/gcad3d/icons/NO_IMAGE32x32_24.bmp
+share/gcad3d/icons/binDat.png
+share/gcad3d/icons/body.png
+share/gcad3d/icons/circle.png
+share/gcad3d/icons/curve.png
+share/gcad3d/icons/extMdl.png
+share/gcad3d/icons/gCAD3D.xpm
+share/gcad3d/icons/image.png
+share/gcad3d/icons/libPart.png
+share/gcad3d/icons/line.png
+share/gcad3d/icons/link.png
+share/gcad3d/icons/natM0.png
+share/gcad3d/icons/natMA.png
+share/gcad3d/icons/natMU.png
+share/gcad3d/icons/natMdl.png
+share/gcad3d/icons/p3.png
+share/gcad3d/icons/part.png
+share/gcad3d/icons/plane.png
+share/gcad3d/icons/point.png
+share/gcad3d/icons/process.png
+share/gcad3d/icons/surface.png
+share/gcad3d/icons/value.png
+share/gcad3d/icons/vector.png
+share/gcad3d/icons/xa_logo.xpm
+share/pixmaps/gcad3d.xpm
Index: pkgsrc/cad/gcad3d/distinfo
diff -u /dev/null pkgsrc/cad/gcad3d/distinfo:1.1
--- /dev/null   Mon May 23 19:10:03 2022
+++ pkgsrc/cad/gcad3d/distinfo  Mon May 23 19:10:03 2022
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+BLAKE2s (gcad3d-2.46.24-ff33b206f158092dbac7f2b1236c3d38fee5d656.tar.gz) = 6d350b3ab362c71b6a68216e336ef99a51468083ffbffb5290bca0671340cb92
+SHA512 (gcad3d-2.46.24-ff33b206f158092dbac7f2b1236c3d38fee5d656.tar.gz) = 
3e2cc58b4fbc8437a8f646c7004a9d3af2c60e24e891a873351c0ccd85b5d82230d45c9e13cc4d549a6d529078d8c1e3d5234edaf2848f309da2a35ece5cb55a
+Size (gcad3d-2.46.24-ff33b206f158092dbac7f2b1236c3d38fee5d656.tar.gz) = 3866713 bytes
+SHA1 (patch-src_APP_srcOS.mak) = 088fde697d0f9ccbcae7828561a1465b27076a91
+SHA1 (patch-src_gcad3d) = 40fd61d9bc9eb30dae6f63549cda8b1f4914ef7d
+SHA1 (patch-src_gui__version__set.sh) = 5bb9314665d43982cfa02e44fe62686361c8aabe
+SHA1 (patch-src_options.sh) = 9e3b35152a07b1d1ea5fb9290a91e9a58d18cb65
+SHA1 (patch-src_ut_ut__err.c) = c15b69b8a312369c49184655a4c20ba60eaf113d
+SHA1 (patch-src_ut_ut__os__aix.c) = 489113958dd750ce538556da7b78d98137a3d4f2
+SHA1 (patch-src_xa_xa.c) = 3d6f32c8c3464b3206f5d8d9c1a33d2f8cc35999
+SHA1 (patch-src_xa_xa__main.c) = 945ff97df65fbc704ea5ccca15222ecfbb459caf
+SHA1 (patch-src_xa_xa__msg.h) = 7adf71019b4a61f6e8ddccb13f58cf5cbdac6731

Index: pkgsrc/cad/gcad3d/patches/patch-src_APP_srcOS.mak
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_APP_srcOS.mak:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_APP_srcOS.mak   Mon May 23 19:10:03 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_APP_srcOS.mak,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+always include unix files
+
+--- src/APP/srcOS.mak.orig     2022-03-04 12:26:39.000000000 +0000
++++ src/APP/srcOS.mak
+@@ -4,8 +4,6 @@
+   SRCOS = ../ut/os_uix.c ../ut/ut_os_aix.c ../ut/ctrl_os_aix.c
+ endif
+ 
+-ifeq "$(hTyp)" "Linux_x86_64"
+   SRCOS = ../ut/os_uix.c ../ut/ut_os_aix.c ../ut/ctrl_os_aix.c
+-endif
+ 
+ # eof
Index: pkgsrc/cad/gcad3d/patches/patch-src_gcad3d
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_gcad3d:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_gcad3d  Mon May 23 19:10:03 2022
@@ -0,0 +1,62 @@
+$NetBSD: patch-src_gcad3d,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+rework the startup script to handle our pkgsrc layout
+
+--- src/gcad3d.orig    2021-07-18 06:38:57.000000000 +0000
++++ src/gcad3d
+@@ -3,46 +3,32 @@
+ # Startproc for gCAD3D.
+ # You can modify several directories; default is ${HOME}/gCAD3D/..
+ 
+-#osVer=`getconf LONG_BIT`
+-# 32|64
+-#osVer=${HOSTTYPE}
+-hTyp=`uname -s`_`uname -m`
+-
+-#export LD_LIBRARY_PATH=`dirname $0`
+-
+ # <gcad_dir_bin>                   executable, dll's     ReadOnly
+ # <gcad_dir_bin>plugins/           dll's                 ReadOnly
+-#export gcad_dir_bin=/usr/lib/gCAD3D/binLinux${osVer}/
+-export gcad_dir_bin=/usr/lib/gcad3d/${hTyp}/
++export gcad_dir_bin=@PREFIX@/lib/gcad3d/
+ 
+ # <gcad_dir_bas>examples.gz        local-setup           RO
+-# <gcad_dir_bas>icons/             icons                 RO
+-#export gcad_dir_bas=/usr/share/gcad3d/
++export gcad_dir_bas=@PREFIX@/share/gcad3d/
++
++# <gcad_dir_ico>                   icons                 RO
++export gcad_dir_ico=@PREFIX@/share/gcad3d/icons/
+ 
+ # <gcad_dir_doc>html/              helpfiles .htm        ReadOnly
+ # <gcad_dir_doc>msg/               helpfiles .txt        ReadOnly
+-#export gcad_dir_doc=/usr/share/doc/gcad3d/
++export gcad_dir_doc=@PREFIX@/share/doc/gcad3d/
+ 
+ # <gcad_dir_local>gCAD3D/tmp/      temp-files            ReadWrite
+ # <gcad_dir_local>gCAD3D/cfg/      local setup-files     ReadWrite
+ # <gcad_dir_local>gCAD3D/dat/      example-models        ReadWrite
+ # <gcad_dir_local>gCAD3D/prg/      script-parts          ReadWrite
+ # <gcad_dir_local>gCAD3D/ctlg/     catalog-parts         ReadWrite
+-#export gcad_dir_local=${HOME}/
++export gcad_dir_local=${HOME}/.config/
+ 
+ # <gcad_dir_dev>gCAD3D/dev/        sources plugins       ReadWrite
+ # <gcad_dir_dev>gCAD3D/plugins/    objects executables   ReadWriteExe
+-#export gcad_dir_dev=${HOME}/
+-
+-
+-## if menu is unvisible: (ubuntu 11):
+-#if [ -n "$UBUNTU_MENUPROXY" ]; then
+-#  echo "disactivate ubuntu-global-menu"
+-#  export UBUNTU_MENUPROXY=
+-#fi
++export gcad_dir_dev=${HOME}/.config/
+ 
+ # start it ..
+-#dirname $0`/gCAD3Dx32
+ export LD_LIBRARY_PATH=${gcad_dir_bin}
+-${gcad_dir_bin}/gCAD3D $*
++${gcad_dir_bin}gCAD3D $*
+ # eof
Index: pkgsrc/cad/gcad3d/patches/patch-src_gui__version__set.sh
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_gui__version__set.sh:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_gui__version__set.sh    Mon May 23 19:10:03 2022
@@ -0,0 +1,38 @@
+$NetBSD: patch-src_gui__version__set.sh,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+we are neither deb or rpm; enable pkg-config to find gtk
+
+--- src/gui_version_set.sh.orig        2020-11-16 07:09:05.000000000 +0000
++++ src/gui_version_set.sh
+@@ -15,14 +15,7 @@ echo "instTyp = |"${instTyp}"|"
+ 
+ 
+ if [ $1 = "gtk2" ] ; then
+-  if [ ${instTyp} = "deb" ] ; then
+-    if [ -z "`dpkg -l | grep libgtk2.0-dev`" ] ; then
+-       echo "**** gui_version_set.sh ERROR gtk2 not installed"
+-       exit 1
+-    fi
+-  else
+-#   if [ -z "`pkg-config --list-all | grep gtk+-2.0`" ] ; then
+-    if [ -z "`rpm -qa | grep gtk2-dev`" ] ; then
++    if [ -z "`pkg-config --list-all | grep gtk+-2.0`" ] ; then
+        echo "**** gui_version_set.sh ERROR gtk2 not installed"
+        exit 1
+     fi
+@@ -33,14 +26,7 @@ fi
+ 
+ 
+ if [ $1 = "gtk3" ] ; then
+-  if [ ${instTyp} = "deb" ] ; then
+-    if [ -z "`dpkg -l | grep libgtk-3-dev`" ] ; then
+-       echo "**** gui_version_set.sh ERROR gtk3 not installed"
+-       exit 1
+-    fi
+-  else
+-#   if [ -z "`pkg-config --list-all | grep gtk+-3.0`" ] ; then
+-    if [ -z "`rpm -qa | grep gtk3-dev`" ] ; then
++    if [ -z "`pkg-config --list-all | grep gtk+-3.0`" ] ; then
+        echo "**** gui_version_set.sh ERROR gtk3 not installed"
+        exit 1
+     fi
Index: pkgsrc/cad/gcad3d/patches/patch-src_options.sh
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_options.sh:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_options.sh      Mon May 23 19:10:03 2022
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_options.sh,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+1. active directory won't be that, since we got the source for github
+2. ease installation by not using an osname subdirectory
+
+--- src/options.sh.orig        2022-03-04 12:26:39.000000000 +0000
++++ src/options.sh
+@@ -23,12 +23,6 @@
+ 
+ 
+ 
+-# test if active directory is xx/gcad3d/src/APP
+-S2=`expr length ${PWD} - 14`
+-if [ `echo ${PWD} | cut -c$S2-` != "/gcad3d/src/APP" ] ; then
+-  echo "****** ERROR - not in directory .../gcad3d/src/APP *****"
+-  exit 1;
+-fi
+ 
+ 
+ 
+@@ -55,7 +49,7 @@
+ export gcad_dir_dev=${DIR_DEV}gcad3d/
+ 
+ # gcad_dir_bin      home of objects, executables, libraries
+-export gcad_dir_bin=${DIR_BIN}gcad3d/${hTyp}/
++export gcad_dir_bin=${DIR_BIN}gcad3d/
+ 
+ 
+ 
Index: pkgsrc/cad/gcad3d/patches/patch-src_ut_ut__err.c
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_ut_ut__err.c:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_ut_ut__err.c    Mon May 23 19:10:03 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_ut_ut__err.c,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+do not use obsolete non-standard definitions
+
+--- src/ut/ut_err.c.orig       2021-07-18 06:38:57.000000000 +0000
++++ src/ut/ut_err.c
+@@ -150,7 +150,7 @@ static jmp_buf       err_buf;
+   ssa.sa_handler = ERR_cb1;
+   sigemptyset (&ssa.sa_mask);
+   // ssa.sa_flags   = SA_RESTART | SA_NOMASK | SA_NOCLDSTOP;
+-  ssa.sa_flags   = SA_ONESHOT | SA_NOMASK;
++  ssa.sa_flags   = SA_RESETHAND | SA_NODEFER;
+ 
+   sigaction (SIGSEGV, &ssa, NULL);      // 11
+   // sigaction (SIGSEGV, &ssa, &err_sDfl);      // 11
Index: pkgsrc/cad/gcad3d/patches/patch-src_ut_ut__os__aix.c
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_ut_ut__os__aix.c:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_ut_ut__os__aix.c        Mon May 23 19:10:03 2022
@@ -0,0 +1,55 @@
+$NetBSD: patch-src_ut_ut__os__aix.c,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+1. suppress printing of OS name 'Linux', since it may not be
+2. disable glibc version check
+3. also look for gvim
+4. do not use obsolete non-standard definitions
+
+--- src/ut/ut_os_aix.c.orig    2021-07-18 06:38:57.000000000 +0000
++++ src/ut/ut_os_aix.c
+@@ -335,7 +335,6 @@ extern int errno;
+   char    s1[256];
+ 
+ 
+-  printf("%s\n",OS_get_os_bits());  // 32/64-bit
+ 
+ 
+   // Linux-Version: /proc/version or "uname -a"
+@@ -406,6 +405,7 @@ extern int errno;
+ 
+   // static float versionLinked = 2.8;
+ 
++#if 0
+   char   cBuf[256], *p1;
+   size_t i1;
+   int    iv1, iv2;
+@@ -435,6 +435,7 @@ extern int errno;
+       return -1;
+     }
+   }
++#endif
+ 
+   return 0;
+ 
+@@ -1017,6 +1018,8 @@ extern int errno;
+     strcpy(txbuf, "kate ");
+   if(system("which dtpad 1>/dev/null 2>/dev/null") == 0)
+     strcpy(txbuf, "dtpad ");
++  if(system("which gvim 1>/dev/null 2>/dev/null") == 0)
++    strcpy(txbuf, "gvim ");
+ 
+   if(strlen(txbuf) < 2) { 
+     printf(" **** no Editor found\n");
+@@ -1634,10 +1637,10 @@ extern int errno;
+   void *catch;
+   int ret;
+ 
+-  catch = signal(SIGCLD, SIG_DFL);
++  catch = signal(SIGCHLD, SIG_DFL);
+   ret = system(buf);
+ 
+-  signal(SIGCLD, catch);
++  signal(SIGCHLD, catch);
+   if (ret) { perror(buf); }
+ 
+   return(ret);
Index: pkgsrc/cad/gcad3d/patches/patch-src_xa_xa.c
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_xa_xa.c:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_xa_xa.c Mon May 23 19:10:03 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_xa_xa.c,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+don't use OS name in config dir name
+
+--- src/xa/xa.c.orig   2021-07-28 14:44:53.384469360 +0000
++++ src/xa/xa.c
+@@ -3451,7 +3451,7 @@ remote control nur in VWR, nicht MAN, CA
+ 
+ 
+   // MDLFN_syFn_f_name (txbuf);   // get filename of dir.lst (<cfg>/dir.lst)
+-  sprintf(txbuf, "%scfg_%s%cdir.lst",OS_get_loc_dir(),OS_get_os__(),fnam_del);
++  sprintf(txbuf, "%scfg%cdir.lst",OS_get_loc_dir(),fnam_del);
+ 
+   printf("AP_defaults_dir %s\n",txbuf);
+ 
Index: pkgsrc/cad/gcad3d/patches/patch-src_xa_xa__main.c
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_xa_xa__main.c:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_xa_xa__main.c   Mon May 23 19:10:03 2022
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_xa_xa__main.c,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+1. don't hardwire location of examples.gz
+2. don't use OSname in config dir name
+
+--- src/xa/xa_main.c.orig      2021-07-18 06:38:57.000000000 +0000
++++ src/xa/xa_main.c
+@@ -280,16 +280,10 @@ static int     lngNr;
+ 
+ #else
+   // POSTINSTALL:  extract <os_bas_dir>examples.gz -> local /cfg/
+-  sprintf(txbuf2, "cd %s && tar -xzf /usr/share/gcad3d/examples.gz",
+-          dirLocal);  //, OS_get_bas_dir());
++  sprintf(txbuf2, "cd %s && tar -xzf %sexamples.gz", dirLocal, os_bas_dir);
+     printf("%s\n",txbuf2);
+   system(txbuf2);
+ 
+-  // rename dir. /cfg/ /cfg_Linux/ or /cfg_MS/
+-  sprintf(txbuf1, "%scfg/", os_loc_dir);
+-  sprintf(txbuf2, "%scfg_%s/", os_loc_dir, OS_get_os__());
+-  OS_file_rename (txbuf1, txbuf2);
+-
+ /*
+   // copy desktop-link -> ~/gCAD3D/gCAD3D.desktop
+   sprintf(txbuf2, "cp -f /usr/share/gcad3d/gcad3d.desktop %s.",
+@@ -795,7 +789,7 @@ kopieren geht nicht mehr - 
+   strcpy(s1, os_loc_dir);
+ //   strcat(s1, "cfg");
+ //   UTX_add_fnam_del (s1);   // add closing "/"
+-  sprintf(s1, "%scfg_%s%c", os_loc_dir, OS_get_os__(),fnam_del);
++  sprintf(s1, "%scfg%c", os_loc_dir, fnam_del);
+ 
+   UtxTab_add (&AP_TxTab1, s1);
+   UtxTab_query (&os_cfg_dir, &AP_TxTab1);
Index: pkgsrc/cad/gcad3d/patches/patch-src_xa_xa__msg.h
diff -u /dev/null pkgsrc/cad/gcad3d/patches/patch-src_xa_xa__msg.h:1.1
--- /dev/null   Mon May 23 19:10:04 2022
+++ pkgsrc/cad/gcad3d/patches/patch-src_xa_xa__msg.h    Mon May 23 19:10:03 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_xa_xa__msg.h,v 1.1 2022/05/23 19:10:03 plunky Exp $
+
+include <stdarg.h> for va_list
+
+--- src/xa/xa_msg.h.orig       2020-11-16 07:09:05.000000000 +0000
++++ src/xa/xa_msg.h
+@@ -1,6 +1,6 @@
++#include <stdarg.h>                    // va_list
+ /* Messages.
+ needs
+-#include <stdarg.h>                    // va_list
+ 
+ #include "../xa/xa_msg.h"              // MSG_*
+

Prev by Date: CVS commit: pkgsrc/cad
Next by Date: CVS commit: pkgsrc/cad
Previous by Thread: CVS commit: pkgsrc/cad
Next by Thread: CVS commit: pkgsrc/cad
Indexes:

Home | Main Index | Thread Index | Old Index