diff --git a/editors/Makefile b/editors/Makefile index 1c05ff426891..9809b87bf2b9 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -1,280 +1,281 @@ COMMENT = Editors SUBDIR += 2bsd-vi SUBDIR += abiword SUBDIR += abiword-docs SUBDIR += aee SUBDIR += aewan SUBDIR += apel SUBDIR += asedit SUBDIR += beav SUBDIR += biew SUBDIR += bitedit SUBDIR += boiling-egg SUBDIR += bpatch SUBDIR += bvi SUBDIR += calligra SUBDIR += calligraplan SUBDIR += chexedit SUBDIR += codelite SUBDIR += cooledit SUBDIR += cpeditor SUBDIR += cream SUBDIR += cudatext SUBDIR += deforaos-editor SUBDIR += dhex SUBDIR += diakonos + SUBDIR += diamond SUBDIR += dkns SUBDIR += drjava SUBDIR += dte SUBDIR += e3 SUBDIR += e93 SUBDIR += ecce SUBDIR += ecrire SUBDIR += edith SUBDIR += editorconfig-core-c SUBDIR += elementary-code SUBDIR += emacs SUBDIR += emacs-devel SUBDIR += encryptpad SUBDIR += featherpad SUBDIR += fileobj SUBDIR += flim SUBDIR += focuswriter SUBDIR += fpc-ide SUBDIR += fte SUBDIR += fxite SUBDIR += gedit SUBDIR += gedit-plugins SUBDIR += ghex SUBDIR += ghostwriter SUBDIR += gmanedit SUBDIR += gnome-latex SUBDIR += gobby SUBDIR += gomate SUBDIR += gummi SUBDIR += helix SUBDIR += heme SUBDIR += hexcurse SUBDIR += hexedit SUBDIR += hexer SUBDIR += hexpert SUBDIR += hnb SUBDIR += hte SUBDIR += imhex SUBDIR += impress SUBDIR += jed SUBDIR += jedit SUBDIR += joe SUBDIR += jove SUBDIR += jucipp SUBDIR += jupp SUBDIR += kak-lsp SUBDIR += kakoune SUBDIR += kate SUBDIR += kibi SUBDIR += kile SUBDIR += komodo-edit SUBDIR += lazarus SUBDIR += lazarus-devel SUBDIR += lazarus-qt5 SUBDIR += lazarus-qt5-devel SUBDIR += le SUBDIR += leafpad SUBDIR += led SUBDIR += libreoffice SUBDIR += libreoffice-af SUBDIR += libreoffice-am SUBDIR += libreoffice-as SUBDIR += libreoffice-ast SUBDIR += libreoffice-be SUBDIR += libreoffice-bg SUBDIR += libreoffice-bn SUBDIR += libreoffice-bn_IN SUBDIR += libreoffice-bo SUBDIR += libreoffice-br SUBDIR += libreoffice-brx SUBDIR += libreoffice-bs SUBDIR += libreoffice-ca SUBDIR += libreoffice-ca_valencia SUBDIR += libreoffice-ckb SUBDIR += libreoffice-cs SUBDIR += libreoffice-cy SUBDIR += libreoffice-da SUBDIR += libreoffice-dgo SUBDIR += libreoffice-dsb SUBDIR += libreoffice-dz SUBDIR += libreoffice-el SUBDIR += libreoffice-en_GB SUBDIR += libreoffice-en_ZA SUBDIR += libreoffice-eo SUBDIR += libreoffice-es SUBDIR += libreoffice-et SUBDIR += libreoffice-eu SUBDIR += libreoffice-fa SUBDIR += libreoffice-fi SUBDIR += libreoffice-fur SUBDIR += libreoffice-fy SUBDIR += libreoffice-ga SUBDIR += libreoffice-gd SUBDIR += libreoffice-gl SUBDIR += libreoffice-gu SUBDIR += libreoffice-gug SUBDIR += libreoffice-hi SUBDIR += libreoffice-hr SUBDIR += libreoffice-hsb SUBDIR += libreoffice-i18n SUBDIR += libreoffice-id SUBDIR += libreoffice-is SUBDIR += libreoffice-it SUBDIR += libreoffice-ka SUBDIR += libreoffice-kab SUBDIR += libreoffice-kk SUBDIR += libreoffice-km SUBDIR += libreoffice-kmr_Latn SUBDIR += libreoffice-kn SUBDIR += libreoffice-kok SUBDIR += libreoffice-ks SUBDIR += libreoffice-lb SUBDIR += libreoffice-lo SUBDIR += libreoffice-lt SUBDIR += libreoffice-lv SUBDIR += libreoffice-mai SUBDIR += libreoffice-mk SUBDIR += libreoffice-ml SUBDIR += libreoffice-mn SUBDIR += libreoffice-mni SUBDIR += libreoffice-mr SUBDIR += libreoffice-my SUBDIR += libreoffice-nb SUBDIR += libreoffice-ne SUBDIR += libreoffice-nl SUBDIR += libreoffice-nn SUBDIR += libreoffice-nr SUBDIR += libreoffice-nso SUBDIR += libreoffice-oc SUBDIR += libreoffice-om SUBDIR += libreoffice-or SUBDIR += libreoffice-pa_IN SUBDIR += libreoffice-ro SUBDIR += libreoffice-rw SUBDIR += libreoffice-sa_IN SUBDIR += libreoffice-sat SUBDIR += libreoffice-sd SUBDIR += libreoffice-si SUBDIR += libreoffice-sid SUBDIR += libreoffice-sk SUBDIR += libreoffice-sl SUBDIR += libreoffice-sq SUBDIR += libreoffice-sr SUBDIR += libreoffice-sr_Latn SUBDIR += libreoffice-ss SUBDIR += libreoffice-st SUBDIR += libreoffice-sv SUBDIR += libreoffice-sw_TZ SUBDIR += libreoffice-szl SUBDIR += libreoffice-ta SUBDIR += libreoffice-te SUBDIR += libreoffice-tg SUBDIR += libreoffice-th SUBDIR += libreoffice-tn SUBDIR += libreoffice-tr SUBDIR += libreoffice-ts SUBDIR += libreoffice-tt SUBDIR += libreoffice-ug SUBDIR += libreoffice-uz SUBDIR += libreoffice-ve SUBDIR += libreoffice-vec SUBDIR += libreoffice-xh SUBDIR += libreoffice-zu SUBDIR += libreoffice6 SUBDIR += linux-bcompare SUBDIR += linux-sublime SUBDIR += linux-sublime-text4 SUBDIR += linux-sublime3 SUBDIR += linux-wps-office SUBDIR += madedit SUBDIR += marker SUBDIR += mg SUBDIR += micro SUBDIR += mined SUBDIR += mle SUBDIR += morla SUBDIR += mousepad SUBDIR += mp SUBDIR += nano SUBDIR += ne SUBDIR += nedit SUBDIR += neovim SUBDIR += neovim-qt SUBDIR += nvi-m17n SUBDIR += nvi2 SUBDIR += o SUBDIR += openoffice-4 SUBDIR += openoffice-devel SUBDIR += p5-Proc-InvokeEditor SUBDIR += p5-Vimana SUBDIR += paredit-mode.el SUBDIR += parinfer-rust SUBDIR += pdfedit SUBDIR += pico-alpine SUBDIR += picpas SUBDIR += pluma SUBDIR += pluma-plugins SUBDIR += poedit SUBDIR += poke SUBDIR += psgml SUBDIR += puff SUBDIR += py-babi SUBDIR += py-editorconfig SUBDIR += py-pynvim SUBDIR += py-vim-bridge SUBDIR += quilter SUBDIR += rehex SUBDIR += rubygem-neovim SUBDIR += scite SUBDIR += se SUBDIR += semi SUBDIR += setzer SUBDIR += shed SUBDIR += slime SUBDIR += sly SUBDIR += sly-asdf SUBDIR += sly-named-readtables SUBDIR += sly-quicklisp SUBDIR += ssed SUBDIR += sted SUBDIR += tamago SUBDIR += tea SUBDIR += teco SUBDIR += ted SUBDIR += tetradraw SUBDIR += texmacs SUBDIR += texmaker SUBDIR += texstudio SUBDIR += textadept SUBDIR += texworks SUBDIR += the SUBDIR += treeform SUBDIR += tweak SUBDIR += uemacs SUBDIR += uzap SUBDIR += ved SUBDIR += vigor SUBDIR += vile SUBDIR += vim SUBDIR += vscode SUBDIR += web-mode SUBDIR += with-editor SUBDIR += wordgrinder SUBDIR += wxhexeditor SUBDIR += xcoral SUBDIR += xed SUBDIR += xi-core SUBDIR += xi-term SUBDIR += xmlcopyeditor SUBDIR += xvile SUBDIR += yudit SUBDIR += zile .include diff --git a/editors/diamond/Makefile b/editors/diamond/Makefile new file mode 100644 index 000000000000..37f3d8a80606 --- /dev/null +++ b/editors/diamond/Makefile @@ -0,0 +1,26 @@ +PORTNAME= diamond +DISTVERSIONPREFIX= diamond- +DISTVERSION= 1.3.6 +CATEGORIES= editors + +MAINTAINER= adridg@FreeBSD.org +COMMENT= Compact programmers editor + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell +BUILD_DEPENDS= copperspice>=1.7:x11-toolkits/copperspice +RUN_DEPENDS= copperspice>=1.7:x11-toolkits/copperspice + +USES= compiler:c++17-lang cmake gl gnome iconv jpeg pkgconfig ssl xorg +USE_GL= gl +USE_GNOME= cairo glib20 libxml2 +USE_XORG= ice sm x11 xau xcb xcursor xext xfixes xi xinerama xrandr xrender + +USE_GITHUB= yes +GH_ACCOUNT= copperspice +GH_PROJECT= diamond + +.include + diff --git a/editors/diamond/distinfo b/editors/diamond/distinfo new file mode 100644 index 000000000000..d907474b1d5a --- /dev/null +++ b/editors/diamond/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1645301383 +SHA256 (copperspice-diamond-diamond-1.3.6_GH0.tar.gz) = e1b85890a870236370207c5d6b7aa7d44d7414a090723ecea513f8b5cec4fb67 +SIZE (copperspice-diamond-diamond-1.3.6_GH0.tar.gz) = 4626624 diff --git a/editors/diamond/files/patch-CMakeLists.txt b/editors/diamond/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..9973587f5eb2 --- /dev/null +++ b/editors/diamond/files/patch-CMakeLists.txt @@ -0,0 +1,18 @@ +--- CMakeLists.txt.orig 2022-02-19 20:16:57 UTC ++++ CMakeLists.txt +@@ -31,7 +31,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + elseif(CMAKE_SYSTEM_NAME MATCHES "(Linux|OpenBSD|FreeBSD|NetBSD|DragonFly)") + include(GNUInstallDirs) + +- set(CMAKE_INSTALL_RPATH "\$ORIGIN") ++ # set(CMAKE_INSTALL_RPATH "\$ORIGIN") + + elseif(MSVC) + # use defaults +@@ -109,4 +109,4 @@ message("") + message("Diamond configured to run on: ${CMAKE_SYSTEM_NAME} ${TARGETBITS} bit, ${CMAKE_BUILD_TYPE} Mode") + message("Diamond will be built in: ${CMAKE_BINARY_DIR}") + message("Diamond will be installed in: ${CMAKE_INSTALL_PREFIX}") +-message("\n") +\ No newline at end of file ++message("\n") diff --git a/editors/diamond/files/patch-src_CMakeLists.txt b/editors/diamond/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..2105866af22a --- /dev/null +++ b/editors/diamond/files/patch-src_CMakeLists.txt @@ -0,0 +1,67 @@ +--- src/CMakeLists.txt.orig 2021-01-28 22:43:22 UTC ++++ src/CMakeLists.txt +@@ -120,6 +120,8 @@ target_link_libraries(Diamond + CopperSpice::CsNetwork + ) + ++set(install_resource_dir ${CMAKE_INSTALL_DATADIR}/copperspice/diamond) ++ + if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + set_target_properties(Diamond PROPERTIES OUTPUT_NAME diamond) + +@@ -169,8 +171,9 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "(Linux|OpenBSD|FreeB + PRIVATE + PkgConfig::Hunspell + ) ++ target_compile_definitions(Diamond PRIVATE DIAMOND_SHARE_DIR="${CMAKE_INSTALL_PREFIX}/${install_resource_dir}") + +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../resources/diamond.png DESTINATION .) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../resources/diamond.png DESTINATION ${install_resource_dir}) + + elseif(CMAKE_SYSTEM_NAME MATCHES "Windows") + +@@ -198,28 +201,21 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Windows") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../resources/diamond.ico DESTINATION .) + endif() + +-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../source_extra/syntax/ DESTINATION syntax) ++install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../source_extra/syntax/ DESTINATION ${install_resource_dir}/syntax) + + # installs English by default +-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../source_extra/dictionary/en_US.aff DESTINATION dictionary) +-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../source_extra/dictionary/en_US.dic DESTINATION dictionary) ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../source_extra/dictionary/en_US.aff DESTINATION ${install_resource_dir}/dictionary) ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../source_extra/dictionary/en_US.dic DESTINATION ${install_resource_dir}/dictionary) + +-# will not overwrite dictionary/userDict.txt +-install(CODE " +- if (NOT EXISTS \"${CMAKE_INSTALL_PREFIX}/dictionary/userDict.txt \") +- file(INSTALL \"${CMAKE_CURRENT_SOURCE_DIR}/../source_extra/dictionary/userDict.txt\" DESTINATION \"${CMAKE_INSTALL_PREFIX}/dictionary\") +- endif() +-") +- + if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + install(TARGETS Diamond DESTINATION ../MacOS) + else() +- install(TARGETS Diamond DESTINATION .) ++ install(TARGETS Diamond) + endif() + +-cs_copy_library(CsCore) +-cs_copy_library(CsGui) +-cs_copy_library(CsNetwork) ++# cs_copy_library(CsCore) ++# cs_copy_library(CsGui) ++# cs_copy_library(CsNetwork) + + if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + # copy required plugins to the bundle +@@ -227,6 +223,6 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + cs_copy_plugins(CsPrinterDriver ../plugins) + else() + # installs required plugins +- cs_copy_plugins(CsGui) +- cs_copy_plugins(CsPrinterDriver) ++ # cs_copy_plugins(CsGui) ++ # cs_copy_plugins(CsPrinterDriver) + endif() diff --git a/editors/diamond/files/patch-src_json.cpp b/editors/diamond/files/patch-src_json.cpp new file mode 100644 index 000000000000..a11b06bdf71a --- /dev/null +++ b/editors/diamond/files/patch-src_json.cpp @@ -0,0 +1,11 @@ +--- src/json.cpp.orig 2022-02-20 12:59:53 UTC ++++ src/json.cpp +@@ -36,7 +36,7 @@ bool MainWindow::json_Read(Config trail) + { + bool ok = true; + +- m_appPath = QCoreApplication::applicationDirPath(); ++ m_appPath = DIAMOND_SHARE_DIR; // QCoreApplication::applicationDirPath(); + + QSettings settings("Diamond Editor", "Settings"); + m_jsonFname = settings.value("configName").toString(); diff --git a/editors/diamond/pkg-descr b/editors/diamond/pkg-descr new file mode 100644 index 000000000000..610a1f4847df --- /dev/null +++ b/editors/diamond/pkg-descr @@ -0,0 +1,19 @@ +Diamond is a cross platform compact editor designed for programmers. +It was developed using the CopperSpice libraries and was written in C++. + + - View multiple documents in movable tabs + - Auto Load previously open Files + - Configuration saved as a JSON format + - Define preset Folders + - Insert Date, Time, and Symbols + - Search and Replace + - Advanced Find + - Syntax Highlighting based on File Type + - Horizontal or Vertical split Window + - Spell Check + - Customize printed Header and Footer + - Show Spaces and Tabs + - User definable standard and custom Keyboard Shortcuts + - Record, Save, and Play back Macros + +WWW: https://github.com/copperspice/diamond diff --git a/editors/diamond/pkg-plist b/editors/diamond/pkg-plist new file mode 100644 index 000000000000..a4f2eb0d70d1 --- /dev/null +++ b/editors/diamond/pkg-plist @@ -0,0 +1,23 @@ +bin/diamond +share/copperspice/diamond/diamond.png +share/copperspice/diamond/dictionary/en_US.aff +share/copperspice/diamond/dictionary/en_US.dic +share/copperspice/diamond/syntax/syn_clipper.json +share/copperspice/diamond/syntax/syn_cmake.json +share/copperspice/diamond/syntax/syn_cpp.json +share/copperspice/diamond/syntax/syn_css.json +share/copperspice/diamond/syntax/syn_doxy.json +share/copperspice/diamond/syntax/syn_errlog.json +share/copperspice/diamond/syntax/syn_html.json +share/copperspice/diamond/syntax/syn_java.json +share/copperspice/diamond/syntax/syn_js.json +share/copperspice/diamond/syntax/syn_json.json +share/copperspice/diamond/syntax/syn_make.json +share/copperspice/diamond/syntax/syn_none.json +share/copperspice/diamond/syntax/syn_nsi.json +share/copperspice/diamond/syntax/syn_php.json +share/copperspice/diamond/syntax/syn_pl.json +share/copperspice/diamond/syntax/syn_py.json +share/copperspice/diamond/syntax/syn_sh.json +share/copperspice/diamond/syntax/syn_txt.json +share/copperspice/diamond/syntax/syn_xml.json