From nobody Sat May 21 09:10:00 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 435491B34F85; Sat, 21 May 2022 09:10:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L4yV06VxMz4gVk; Sat, 21 May 2022 09:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653124201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuS4Cqh9h4xa5dJ3RtNJ5ewiXXVxWf7QhiZFBv7K7/w=; b=pAodSmU99nu0vEd1l2RqxFK0v7Ack9cSBx9cHUxzYA9C8fzDa0CxCELNfMq85XYm2jossu 1gXqq+TozQTnTnn3Vy6mtTKwq49OMDUwKF2zAkuTf/v6oT0KwnxM66jzCpFZz4qTKcRsri WJ6Xlnw2Ab94HX2l5vL4sDTDozqlwoeVs/5qouTBGpKndtXz0cxSf5E4EWQKzqypKv731K Ulb4JfcfOF9cdofaU7vgZsmsnjgHKptTMFHtDc8FxkrSl7DaJ95N9d9bK1xFj/fB5BFYc0 80rhWmD2fkkYNuivvFzvWxzl0fOjhdtLrwH7jYVi7t73fzP3ZX2SGqIGid8grQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9A13E239F2; Sat, 21 May 2022 09:10:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24L9A0O5027985; Sat, 21 May 2022 09:10:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24L9A0hM027972; Sat, 21 May 2022 09:10:00 GMT (envelope-from git) Date: Sat, 21 May 2022 09:10:00 GMT Message-Id: <202205210910.24L9A0hM027972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 3a63bbd85bd1 - main - cad/camotics: adding CAMotics, Simulation & Computer Aided Machining List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a63bbd85bd196569eca764dd9579e77eaf59a2d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653124201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JuS4Cqh9h4xa5dJ3RtNJ5ewiXXVxWf7QhiZFBv7K7/w=; b=C5qexK9apFmHHMYSz7SpcOcRFPkx5aEpE7hTP6YqMO+mIPB7XtXYgSsLd4D24prjVCsHal W86qgDlXl/1gCylxh7W3iZl0Uglsrug0FGpce8EWgjLrucGWOekMaquDIZMgQx3G947UxR Roee1dsyHcs85Qm/axOIEMvplmQIlXAMQ3jPaG9Svu3gwaR8PQrc5KDBJQztekBi8ccZKY fz+ztekJsexKaYGirD667XWGmKd7zd2X+yOr9ykVrokZqakELlkTjR5irbCv5KcTMD2tS/ VdJXiNj/TwfE431CR2pJspQ24o0acvo3q71UW+KKnph1h7vY5pNjoGHs47nVbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653124201; a=rsa-sha256; cv=none; b=gSOP2FBzFzbc1RXKwhJ4wp7QQmtHvoW5UJ/DsKVVQhwsyGEPzf/hsZIluCv+QK/aj4bjd7 cWLtZuvpC/jiw4IGsH8Lahe7OQyluUOVFit4XQK27KGmtbbEHMt+7C6Jky0dyPUhGLrKLv UEtGHPEGlbHYsUtGJ8D982Rs19CnpnzVO1Lp/sqNCIrY1vVJrrxFBDEnksyecufjsxNGBL 7UdmlToQ/zA71UIHLX6++3eXfCJGe7a5DQj+41vJbjc4SvMw6wRf5rIkKuiT0nlxOT0pjh +EERtatL5ek5ICEpE8oC8n7As/c70hmtUrfrF2rc4lTTibQDT3zqgeFFmt9L2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a63bbd85bd196569eca764dd9579e77eaf59a2d commit 3a63bbd85bd196569eca764dd9579e77eaf59a2d Author: Thierry Thomas AuthorDate: 2022-05-21 08:56:42 +0000 Commit: Thierry Thomas CommitDate: 2022-05-21 08:56:42 +0000 cad/camotics: adding CAMotics, Simulation & Computer Aided Machining The latest stable release, v1.2.0, is for Python-2.7, this is why I ported this -RC1, but it is somewhat buggy. Do not hesitate to report any problem! PR: 262763 Requested by: luzpaz (at) pm.me --- cad/Makefile | 1 + cad/camotics/Makefile | 102 +++++++++++++++++++++ cad/camotics/distinfo | 3 + .../files/patch-config_qt5_____init____.py | 26 ++++++ cad/camotics/pkg-descr | 8 ++ cad/camotics/pkg-plist | 10 ++ 6 files changed, 150 insertions(+) diff --git a/cad/Makefile b/cad/Makefile index d3459b8e3f19..3229fe0b7c5f 100644 --- a/cad/Makefile +++ b/cad/Makefile @@ -15,6 +15,7 @@ SUBDIR += brlcad SUBDIR += calculix SUBDIR += calculix-ccx + SUBDIR += camotics SUBDIR += caneda SUBDIR += cascade SUBDIR += cascade-compiler diff --git a/cad/camotics/Makefile b/cad/camotics/Makefile new file mode 100644 index 000000000000..08ccaaec69c9 --- /dev/null +++ b/cad/camotics/Makefile @@ -0,0 +1,102 @@ +# Created by: thierry@pompo.net + +PORTNAME= CAMotics +DISTVERSIONPREFIX= v +DISTVERSION= 1.2.2-rc1 +CATEGORIES= cad + +MAINTAINER= thierry@FreeBSD.org +COMMENT= 3-axis CNC GCode simulator + +LICENSE= GPLv2+ + +BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ + ${LOCALBASE}/lib/libdxflib.a:cad/qcad \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} +LIB_DEPENDS= libv8.so:lang/v8 \ + libre2.so:devel/re2 \ + libcbang0.so:devel/cbang \ + liblz4.so:archivers/liblz4 \ + libevent.so:devel/libevent \ + libexpat.so:textproc/expat2 \ + libyaml.so:textproc/libyaml \ + libsnappy.so:archivers/snappy \ + libsysinfo.so:devel/libsysinfo \ + libleveldb.so:databases/leveldb + +USE_GITHUB= yes +GH_ACCOUNT= CauldronDevelopmentLLC + +USES= compiler:c++14-lang desktop-file-utils gettext-runtime gl gnome \ + localbase:ldflags mysql:client pkgconfig python qt:5 scons \ + shared-mime-info shebangfix sqlite ssl +SHEBANG_FILES= examples/python/camotics_python_example.py +USE_GL= gl glu +USE_GNOME= cairo +USE_QT= assistant buildtools core dbus gui linguisttools network opengl \ + websockets widgets +QT5_INC= -I${LOCALBASE}/include/qt5 \ + -I${LOCALBASE}/include/qt5/QtCore \ + -I${LOCALBASE}/include/qt5/QtGui \ + -I${LOCALBASE}/include/qt5/QtNetwork \ + -I${LOCALBASE}/include/qt5/QtOpenGL \ + -I${LOCALBASE}/include/qt5/QtWidgets +QT5_LIBS_= ${qt-core_LIB} \ + ${qt-gui_LIB} \ + ${qt-network_LIB} \ + ${qt-opengl_LIB} \ + ${qt-websockets_LIB} \ + ${qt-widgets_LIB} +QT5_LIBS= -L${QT_LIBDIR} ${QT5_LIBS_:C/^lib/-l/:C/.so//} + +OPTIONS_DEFINE= EXAMPLES +PORTEXAMPLES= * + +MAKE_ARGS+= cc="${CC}" \ + cxx="${CXX}" \ + cxxstd="c++14" \ + ccflags="${CCFLAGS}" \ + cxxflags="${CXXFLAGS} ${QT5_INC}" \ + linkflags="${LDFLAGS} ${QT5_LIBS}" \ + libpath="${LIBPATH}" \ + sharedlib=1 \ + install_prefix="${STAGEDIR}${PREFIX}" \ + compiler="${CHOSEN_COMPILER_TYPE:C/gcc/gnu/}" \ + disable_local="zlib bzip2 lz4 sqlite3 expat libevent re2 libyaml" +MAKE_ENV+= QT5DIR="${LOCALBASE}" \ + CBANG_HOME="${WRKDIR}/cbang" +.if defined(WITH_DEBUG) +MAKE_ARGS+= debug=1 strict=0 +.endif + +TEST_WRKSRC= ${WRKSRC}/tests +DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS} + +pre-configure: + ${CP} -R ${LOCALBASE}/share/cbang ${WRKDIR} + ${RLN} ${LOCALBASE}/include ${WRKDIR}/cbang/ + ${REINPLACE_CMD} -e "/python_version/s|'3'|'${PYTHON_VER}'|" \ + ${WRKSRC}/SConstruct + ${REINPLACE_CMD} -e 's|/usr/bin/env python2| ${PYTHON_CMD}|' \ + ${TEST_WRKSRC}/testHarness + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/share/metainfo \ + ${STAGEDIR}${PREFIX}/share/mime/packages + ${INSTALL_DATA} ${WRKSRC}/CAMotics.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKSRC}/CAMotics.appdata.xml \ + ${STAGEDIR}${PREFIX}/share/metainfo + ${INSTALL_DATA} ${WRKSRC}/mime.xml \ + ${STAGEDIR}${PREFIX}/share/mime/packages/${PORTNAME}.xml + ${INSTALL_DATA} ${WRKSRC}/images/*.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps + +post-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} + +#do-test: +# (cd ${TEST_WRKSRC} && ./testHarness) + +.include diff --git a/cad/camotics/distinfo b/cad/camotics/distinfo new file mode 100644 index 000000000000..8968e40da060 --- /dev/null +++ b/cad/camotics/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1652128288 +SHA256 (CauldronDevelopmentLLC-CAMotics-v1.2.2-rc1_GH0.tar.gz) = c928d58c31b42eb970ed4022fac86c73a082c67b336eb4a83cd1100d4dee2e60 +SIZE (CauldronDevelopmentLLC-CAMotics-v1.2.2-rc1_GH0.tar.gz) = 12570228 diff --git a/cad/camotics/files/patch-config_qt5_____init____.py b/cad/camotics/files/patch-config_qt5_____init____.py new file mode 100644 index 000000000000..4e48a0bdd748 --- /dev/null +++ b/cad/camotics/files/patch-config_qt5_____init____.py @@ -0,0 +1,26 @@ +--- config/qt5/__init__.py.orig 2021-07-27 23:51:08 UTC ++++ config/qt5/__init__.py +@@ -710,6 +710,13 @@ def generate(env): + Action = SCons.Action.Action + Builder = SCons.Builder.Builder + ++ version = tuple(map(int, SCons.__version__.split('.'))) ++ ++ QT5_MOCDEFINES = \ ++ '${_defines(QT5_MOCDEFPREFIX, CPPDEFINES, QT5_MOCDEFSUFFIX, __env__' ++ if (4, 2, 0) <= version: QT5_MOCDEFINES += ', TARGET, SOURCE' ++ QT5_MOCDEFINES += ')}' ++ + env['QT5DIR'] = _detect(env) + env.Replace( + QT5DIR = _detect(env), +@@ -762,8 +769,7 @@ def generate(env): + QT5_QRCCXXPREFIX = 'qrc_', + QT5_MOCDEFPREFIX = '-D', + QT5_MOCDEFSUFFIX = '', +- QT5_MOCDEFINES = '${_defines(QT5_MOCDEFPREFIX, CPPDEFINES, ' +- 'QT5_MOCDEFSUFFIX, __env__)}', ++ QT5_MOCDEFINES = QT5_MOCDEFINES, + QT5_MOCCPPPATH = [], + QT5_MOCINCFLAGS = '$( ${_concat(QT5_MOCINCPREFIX, QT5_MOCCPPPATH, ' + 'INCSUFFIX, __env__, RDirs)} $)', diff --git a/cad/camotics/pkg-descr b/cad/camotics/pkg-descr new file mode 100644 index 000000000000..3a522a9100c8 --- /dev/null +++ b/cad/camotics/pkg-descr @@ -0,0 +1,8 @@ +CAMotics is an Open-Source software which can simulate 3-axis NC machining. It +is a fast, flexible and user friendly simulation software for the DIY and +Open-Source community. + + + +WWW: http://camotics.org/ +WWW: https://github.com/CauldronDevelopmentLLC/CAMotics diff --git a/cad/camotics/pkg-plist b/cad/camotics/pkg-plist new file mode 100644 index 000000000000..42f0cd651e07 --- /dev/null +++ b/cad/camotics/pkg-plist @@ -0,0 +1,10 @@ +bin/camotics +bin/camsim +bin/gcodetool +bin/planner +bin/tplang +share/applications/CAMotics.desktop +share/metainfo/CAMotics.appdata.xml +share/mime/packages/CAMotics.xml +share/pixmaps/camotics-logo.png +share/pixmaps/camotics.png