pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove molsketch: soon in main
Module Name: pkgsrc-wip
Committed By: pin <voidpin%protonmail.com@localhost>
Pushed By: pin
Date: Fri Dec 18 15:31:25 2020 +0100
Changeset: 31e2f951fe064d1f8940a14cb4b9df6bcaa9092d
Modified Files:
Makefile
Removed Files:
molsketch/DESCR
molsketch/Makefile
molsketch/PLIST
molsketch/distinfo
molsketch/patches/patch-CMakeLists.txt
molsketch/patches/patch-cmake_modules_FindOpenBabel2.cmake
molsketch/patches/patch-obabeliface_obabeliface.cpp
Log Message:
Remove molsketch: soon in main
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=31e2f951fe064d1f8940a14cb4b9df6bcaa9092d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
molsketch/DESCR | 11 --
molsketch/Makefile | 35 ------
molsketch/PLIST | 130 ---------------------
molsketch/distinfo | 9 --
molsketch/patches/patch-CMakeLists.txt | 16 ---
.../patch-cmake_modules_FindOpenBabel2.cmake | 24 ----
.../patches/patch-obabeliface_obabeliface.cpp | 48 --------
8 files changed, 274 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 783507cda5..e77b04a639 100644
--- a/Makefile
+++ b/Makefile
@@ -2191,7 +2191,6 @@ SUBDIR+= modular-xorg-server-dfbsd
SUBDIR+= modular-xorg-server-dfbsd-meson
SUBDIR+= modular-xorg-xspice
SUBDIR+= moe
-SUBDIR+= molsketch
SUBDIR+= mona
SUBDIR+= monajat
SUBDIR+= mono
diff --git a/molsketch/DESCR b/molsketch/DESCR
deleted file mode 100644
index 3f08aac5ee..0000000000
--- a/molsketch/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Molsketch is a 2D molecular editing tool. Its goal is to help you draw
-molecules quick and easily. Of course you're creation can be exported
-afterwards in high quality in a number of vector and bitmap formats.
-
-Features:
-
- * open, save and import in all formats supported by the OpenBabel(tm)
- library
- * export to Scalable Vector Graphics (SVG) and a number of common used
- bitmap formats
- * print and export your document to PDF
diff --git a/molsketch/Makefile b/molsketch/Makefile
deleted file mode 100644
index ac02f00748..0000000000
--- a/molsketch/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD$
-
-DISTNAME= Molsketch-0.6.0-src
-PKGNAME= ${DISTNAME:S/-src//:tl}
-CATEGORIES= biology
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=molsketch/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://sourceforge.net/projects/molsketch/files/Molsketch/Nitrogen%200.6.0/Molsketch-0.6.0-src.tar.gz/
-COMMENT= Program for drawing molecular structures
-LICENSE= gnu-gpl-v2
-
-USE_TOOLS= pkg-config
-
-USE_CMAKE= yes
-
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
-USE_LANGUAGES= c c++
-
-CMAKE_ARGS+= -DMSK_PREFIX=${PREFIX:Q}
-CMAKE_ARGS+= -DMSK_INSTALL_PREFIX=${PREFIX:Q}
-CMAKE_ARGS+= -DMSK_INSTALL_DOCS=/share/doc/molsketch
-CMAKE_ARGS+= -DMSK_INSTALL_LIBS64=/lib
-CMAKE_ARGS+= -DMSK_INSTALL_LIBS=/lib
-CMAKE_ARGS+= -DMSK_INSTALL_INCLUDES=/include
-
-post-install:
- ${RM} -rf ${DESTDIR}${PREFIX}/include/libmolsketch/molsketch_LIB_autogen
- ${RM} -rf ${DESTDIR}${PREFIX}/include/libmolsketch/CMakeFiles
-
-.include "../../biology/openbabel/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/molsketch/PLIST b/molsketch/PLIST
deleted file mode 100644
index b85f573ac7..0000000000
--- a/molsketch/PLIST
+++ /dev/null
@@ -1,130 +0,0 @@
-@comment $NetBSD$
-bin/molsketch-qt5
-include/libmolsketch/TextInputItem.h
-include/libmolsketch/abstractxmlobject.h
-include/libmolsketch/actions/abstractitemaction.h
-include/libmolsketch/actions/abstractrecursiveitemaction.h
-include/libmolsketch/actions/alignmentaction.h
-include/libmolsketch/actions/arrowtypeaction.h
-include/libmolsketch/actions/arrowtypewidget.h
-include/libmolsketch/actions/bondtypeaction.h
-include/libmolsketch/actions/bondtypewidget.h
-include/libmolsketch/actions/coloraction.h
-include/libmolsketch/actions/deleteaction.h
-include/libmolsketch/actions/drawaction.h
-include/libmolsketch/actions/flipbondaction.h
-include/libmolsketch/actions/flipstereobondsaction.h
-include/libmolsketch/actions/frameaction.h
-include/libmolsketch/actions/frametypeaction.h
-include/libmolsketch/actions/frametypewidget.h
-include/libmolsketch/actions/genericaction.h
-include/libmolsketch/actions/incdecaction.h
-include/libmolsketch/actions/itemgrouptypeaction.h
-include/libmolsketch/actions/itemtypeaction.h
-include/libmolsketch/actions/itemtypeselectionaction.h
-include/libmolsketch/actions/itemtypewidget.h
-include/libmolsketch/actions/linewidthaction.h
-include/libmolsketch/actions/mechanismarrowaction.h
-include/libmolsketch/actions/multiaction.h
-include/libmolsketch/actions/periodictablewidget.h
-include/libmolsketch/actions/reactionarrowaction.h
-include/libmolsketch/actions/ringaction.h
-include/libmolsketch/actions/rotateaction.h
-include/libmolsketch/actions/textaction.h
-include/libmolsketch/actions/transformcommand.h
-include/libmolsketch/actions/zlevelaction.h
-include/libmolsketch/arrow.h
-include/libmolsketch/arrowpopup.h
-include/libmolsketch/atom.h
-include/libmolsketch/atompopup.h
-include/libmolsketch/bond.h
-include/libmolsketch/boundingboxlinker.h
-include/libmolsketch/colorbutton.h
-include/libmolsketch/commands.h
-include/libmolsketch/constants.h
-include/libmolsketch/coordinatedelegate.h
-include/libmolsketch/coordinatemodel.h
-include/libmolsketch/coordinatetableview.h
-include/libmolsketch/electronsystem.h
-include/libmolsketch/element.h
-include/libmolsketch/fileio.h
-include/libmolsketch/fontchooser.h
-include/libmolsketch/frame.h
-include/libmolsketch/generics.h
-include/libmolsketch/graphicsitem.h
-include/libmolsketch/grid.h
-include/libmolsketch/helptextemptydock.h
-include/libmolsketch/helptextonemptylabel.h
-include/libmolsketch/librarymodel.h
-include/libmolsketch/libraryview.h
-include/libmolsketch/lineupaction.h
-include/libmolsketch/lonepair.h
-include/libmolsketch/math2d.h
-include/libmolsketch/mimemolecule.h
-include/libmolsketch/molecule.h
-include/libmolsketch/moleculemodelitem.h
-include/libmolsketch/moleculepopup.h
-include/libmolsketch/molscene.h
-include/libmolsketch/molview.h
-include/libmolsketch/propertiesdock.h
-include/libmolsketch/propertieswidget.h
-include/libmolsketch/qtversionmacros.h
-include/libmolsketch/radicalelectron.h
-include/libmolsketch/scenepropertieswidget.h
-include/libmolsketch/scenesettings.h
-include/libmolsketch/settingsconnector.h
-include/libmolsketch/settingsfacade.h
-include/libmolsketch/settingsitem.h
-include/libmolsketch/stringify.h
-include/libmolsketch/sumformula.h
-include/libmolsketch/textitem.h
-include/libmolsketch/ui_alignrowdialog.h
-include/libmolsketch/ui_arrowpopup.h
-include/libmolsketch/ui_atompopup.h
-include/libmolsketch/ui_fontchooser.h
-include/libmolsketch/ui_moleculepopup.h
-include/libmolsketch/ui_scenepropertieswidget.h
-include/libmolsketch/ui_typelistdialog.h
-include/libmolsketch/xmlobjectinterface.h
-lib/libmolsketch-qt5.so
-lib/libobabeliface-qt5.so
-share/applications/molsketch.desktop
-share/doc/molsketch/cs/advanced.html
-share/doc/molsketch/cs/basic.html
-share/doc/molsketch/cs/faq.html
-share/doc/molsketch/cs/features.html
-share/doc/molsketch/cs/files.html
-share/doc/molsketch/cs/index.html
-share/doc/molsketch/cs/install.html
-share/doc/molsketch/cs/molsketch.adp
-share/doc/molsketch/cs/overview.html
-share/doc/molsketch/cs/thank.html
-share/doc/molsketch/en/about.html
-share/doc/molsketch/en/advanced.html
-share/doc/molsketch/en/basic.html
-share/doc/molsketch/en/faq.html
-share/doc/molsketch/en/features.html
-share/doc/molsketch/en/files.html
-share/doc/molsketch/en/index.html
-share/doc/molsketch/en/install.html
-share/doc/molsketch/en/molsketch.adp
-share/doc/molsketch/en/molsketch.qch
-share/doc/molsketch/en/overview.html
-share/doc/molsketch/en/thank.html
-share/doc/molsketch/molsketch.qhc
-share/doc/molsketch/nl/advanced.html
-share/doc/molsketch/nl/basic.html
-share/doc/molsketch/nl/faq.html
-share/doc/molsketch/nl/features.html
-share/doc/molsketch/nl/files.html
-share/doc/molsketch/nl/index.html
-share/doc/molsketch/nl/install.html
-share/doc/molsketch/nl/molsketch.adp
-share/doc/molsketch/nl/overview.html
-share/doc/molsketch/nl/thank.html
-share/icons/hicolor/scalable/apps/molsketch.svg
-share/icons/hicolor/scalable/mimetypes/application-x-molsketch-molecule.svg
-share/icons/hicolor/scalable/mimetypes/application-x-molsketch.svg
-share/metainfo/net.sourceforge.molsketch.appdata.xml
-share/mime/packages/molsketch.xml
-share/pixmaps/molsketch.xpm
diff --git a/molsketch/distinfo b/molsketch/distinfo
deleted file mode 100644
index 20e32ccd8f..0000000000
--- a/molsketch/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-SHA1 (Molsketch-0.6.0-src.tar.gz) = c6292b9cc913374bc748a511c4595a5abb435569
-RMD160 (Molsketch-0.6.0-src.tar.gz) = 91322bace06ef1da18512619a7dc7583415af25c
-SHA512 (Molsketch-0.6.0-src.tar.gz) = 94e6ae7daff5dd6b17923022873c8891b316a29f7b6cc9bb8eef5b515a376477f5d05d6c746b30696740aa01acb23cbbd9a6c16baa61479da4d2e6f9fd85e2b1
-Size (Molsketch-0.6.0-src.tar.gz) = 1680065 bytes
-SHA1 (patch-CMakeLists.txt) = c3d43bd07d443d69edf855f8e47aafdde726ee71
-SHA1 (patch-cmake_modules_FindOpenBabel2.cmake) = 3a6493e0af9d61d62c1f068c30c3d80cda8a2844
-SHA1 (patch-obabeliface_obabeliface.cpp) = 56af584f0cde18951943ba7008c22252186b740d
diff --git a/molsketch/patches/patch-CMakeLists.txt b/molsketch/patches/patch-CMakeLists.txt
deleted file mode 100644
index 9767163914..0000000000
--- a/molsketch/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix path of cmake_uninstall.cmake.in.
-CMAKE_MODULE_PATH is changed after running of the pkgsrc wrappers.
-
---- CMakeLists.txt.orig 2019-03-13 20:46:48.000000000 +0000
-+++ CMakeLists.txt
-@@ -33,7 +33,7 @@ set(CPACK_SOURCE_IGNORE_FILES "/build;/.
- include(CPack)
-
- # Add support for the "make uninstall" target
--configure_file("${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
-+configure_file("${CMAKE_SOURCE_DIR}/cmake/modules/cmake_uninstall.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE @ONLY)
- add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
diff --git a/molsketch/patches/patch-cmake_modules_FindOpenBabel2.cmake b/molsketch/patches/patch-cmake_modules_FindOpenBabel2.cmake
deleted file mode 100644
index 8e2d7f1ae0..0000000000
--- a/molsketch/patches/patch-cmake_modules_FindOpenBabel2.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
---- cmake/modules/FindOpenBabel2.cmake.orig 2019-03-13 20:46:48.000000000 +0000
-+++ cmake/modules/FindOpenBabel2.cmake
-@@ -20,15 +20,15 @@ else (OPENBABEL2_INCLUDE_DIR AND OPENBAB
- # not cached
- if(NOT WIN32)
- # set(PKG_CONFIG_PATH ${PKG_CONFIG_PATH} /usr/local)
-- pkg_check_modules(OPENBABEL2 openbabel-2.0)
-+ pkg_check_modules(OPENBABEL2 openbabel-3)
-
-- # query pkg-config asking for a openbabel >= 2.1.0
-- exec_program(${PKG_CONFIG_EXECUTABLE} ARGS --atleast-version=2.1.0 openbabel-2.0 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
-+ # query pkg-config asking for a openbabel >= 3.0.0
-+ exec_program(${PKG_CONFIG_EXECUTABLE} ARGS --atleast-version=3.0.0 openbabel-3 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
- if(_return_VALUE STREQUAL "0")
- set(OPENBABEL_MINI_FOUND TRUE)
- endif(_return_VALUE STREQUAL "0")
-
-- exec_program(${PKG_CONFIG_EXECUTABLE} ARGS --variable=pkgincludedir openbabel-2.0 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _obPkgIncDir )
-+ exec_program(${PKG_CONFIG_EXECUTABLE} ARGS --variable=pkgincludedir openbabel-3 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _obPkgIncDir )
- message(STATUS "Querying include dir: ${_obPkgIncDir}")
- if (_obPkgIncDir)
- set(OPENBABEL2_INCLUDE_DIR "${_obPkgIncDir}")
diff --git a/molsketch/patches/patch-obabeliface_obabeliface.cpp b/molsketch/patches/patch-obabeliface_obabeliface.cpp
deleted file mode 100644
index 2f3d24ef18..0000000000
--- a/molsketch/patches/patch-obabeliface_obabeliface.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD$
-
---- obabeliface/obabeliface.cpp.orig 2019-03-13 20:46:48.000000000 +0000
-+++ obabeliface/obabeliface.cpp
-@@ -48,6 +48,9 @@
- #include <openbabel/canon.h>
- #endif
-
-+#include <openbabel/obiter.h>
-+#include <openbabel/bond.h>
-+#include <openbabel/elements.h>
- #include <openbabel/mol.h>
- #include <openbabel/data.h>
- #include <openbabel/obconversion.h>
-@@ -55,20 +58,18 @@
- #include <openbabel/op.h>
- #include <openbabel/stereo/stereo.h>
-
--OpenBabel::OBElementTable eTable ;
--
- namespace Molsketch
- {
- static const char INCHI_FORMAT[] = "inchi";
-
- QString number2symbol( int number )
- {
-- return eTable.GetSymbol(number);
-+ return OpenBabel::OBElements::GetSymbol(number);
- }
-
- int symbol2number( const QString &symbol )
- {
-- return eTable.GetAtomicNum(symbol.STRINGCONVERSION) ;
-+ return OpenBabel::OBElements::GetAtomicNum(symbol.STRINGCONVERSION) ;
- }
-
- OpenBabel::OBMol toOBMolecule(const Molsketch::Molecule* originalMolecule, unsigned short int dim = 2)
-@@ -353,8 +354,8 @@ namespace Molsketch
- using namespace OpenBabel;
- // Remove any existing wedge and hash bonds
- FOR_BONDS_OF_MOL(b, &mol) {
-- b->UnsetWedge();
-- b->UnsetHash();
-+ b->SetWedge(false);
-+ b->SetHash(false);
- }
-
- std::map<OBBond*, enum OBStereo::BondDirection> updown;
Home |
Main Index |
Thread Index |
Old Index