science/molsketch: Update 0.5.2 -> 0.6.0

Reported by:	portscout

5 files changed, 8 insertions, 34 deletions

diff --git a/science/molsketch/Makefile b/science/molsketch/Makefile
index 95bc1f3a0a33..28179b789f0e 100644
--- a/science/molsketch/Makefile
+++ b/science/molsketch/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	molsketch
-DISTVERSION=	0.5.2
+DISTVERSION=	0.6.0
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	1
 CATEGORIES=	science
-MASTER_SITES=	SF/${PORTNAME}/Molsketch/Boron-11%20${DISTVERSION}/
+MASTER_SITES=	SF/${PORTNAME}/Molsketch/Nitrogen%20${DISTVERSION}/
 DISTNAME=	Molsketch-${DISTVERSIONFULL}
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/science/molsketch/distinfo b/science/molsketch/distinfo
index b3c2fd23765e..70c1aa3ebd08 100644
--- a/science/molsketch/distinfo
+++ b/science/molsketch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540350640
-SHA256 (Molsketch-0.5.2-src.tar.gz) = 87a4382c2cac8eb280f69ea2f7bd26f945adbce6012a347684f24304b1c491ae
-SIZE (Molsketch-0.5.2-src.tar.gz) = 1670642
+TIMESTAMP = 1552970968
+SHA256 (Molsketch-0.6.0-src.tar.gz) = 999751d0dca25fe5c0b117dddd8a43f2583bb9e2df7fd14cddfa859896389537
+SIZE (Molsketch-0.6.0-src.tar.gz) = 1680065
diff --git a/science/molsketch/files/patch-molsketch_programversion.cpp b/science/molsketch/files/patch-molsketch_programversion.cpp
deleted file mode 100644
index a8eb0872cee8..000000000000
--- a/science/molsketch/files/patch-molsketch_programversion.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- molsketch/programversion.cpp.orig	2018-10-24 03:35:50 UTC
-+++ molsketch/programversion.cpp
-@@ -88,10 +88,10 @@ QString ProgramVersion::toString() const
-   return QString("%1.%2.%3.%4").arg(d->major).arg(d->minor).arg(d->patch).arg(d->build);
- }
- 
--unsigned int ProgramVersion::minor() const {
-+unsigned int ProgramVersion::minorx() const {
-   return d->minor;
- }
- 
--unsigned int ProgramVersion::major() const {
-+unsigned int ProgramVersion::majorx() const {
-   return d->major;
- }
diff --git a/science/molsketch/files/patch-molsketch_programversion.h b/science/molsketch/files/patch-molsketch_programversion.h
deleted file mode 100644
index 235c7f084274..000000000000
--- a/science/molsketch/files/patch-molsketch_programversion.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- molsketch/programversion.h.orig	2018-10-24 03:35:24 UTC
-+++ molsketch/programversion.h
-@@ -30,8 +30,8 @@ public:
-   ProgramVersion(const QString& version = "");
-   ProgramVersion(int major, int minor = 0, int patch = 0, int build = 0);
-   ~ProgramVersion();
--  unsigned int major() const;
--  unsigned int minor() const;
-+  unsigned int majorx() const;
-+  unsigned int minorx() const;
-   unsigned int patch() const;
-   unsigned int build() const;
-   bool operator ==(const ProgramVersion& other) const;
diff --git a/science/molsketch/pkg-plist b/science/molsketch/pkg-plist
index eea93969bb87..1b34fc2ca201 100644
--- a/science/molsketch/pkg-plist
+++ b/science/molsketch/pkg-plist
@@ -31,6 +31,7 @@ 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
@@ -74,12 +75,14 @@ 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/xmlobjectinterface.h
 lib/molsketch/libmolsketch.so
 lib/molsketch/libobabeliface.so
 share/applications/molsketch.desktop
 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