molsketch: Fix package creation

diff --git a/molsketch/Makefile b/molsketch/Makefile
index 4c8b40270eadf4af200745e169a6afe4b1f8875e..ac02f007489518505d2c30e44467b9b50c4b7d53 100644 (file)
--- a/molsketch/Makefile
+++ b/molsketch/Makefile
@@ -17,7 +17,19 @@ 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
index 92ba51a2d7a82937fb8e0d7b5d69a4b40b07872f..b85f573ac727336a241ad95fb20100d0d3e15db6 100644 (file)
--- a/molsketch/PLIST
+++ b/molsketch/PLIST
@@ -1,4 +1,130 @@
 @comment $NetBSD$
-@comment TODO: to fill this file with the file listing:
-@comment TODO: 1. run "/usr/bin/make package"
-@comment TODO: 2. run "/usr/bin/make print-PLIST"
+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
index 7187242a879a7ed03f1b64fa51180297bd356e06..3b0640401622dc743564ded11327bd29b8a072fe 100644 (file)
--- a/molsketch/distinfo
+++ b/molsketch/distinfo
@@ -4,4 +4,4 @@ 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) = 14dade7df767f6d31aa88dd720a978d73c9ec9c6
+SHA1 (patch-CMakeLists.txt) = c3d43bd07d443d69edf855f8e47aafdde726ee71

diff --git a/molsketch/patches/patch-CMakeLists.txt b/molsketch/patches/patch-CMakeLists.txt
index 637859c4c4a41ecb841eccaf56e3d06474f860ca..97671639143901fe8ca36792744bc2a32333ed4d 100644 (file)
--- a/molsketch/patches/patch-CMakeLists.txt
+++ b/molsketch/patches/patch-CMakeLists.txt
@@ -1,5 +1,8 @@
 $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;/.