devel/lasi: Update to 1.1.3

Changes: https://sourceforge.net/p/lasi/news/2019/02/liblasi-113-has-been-released/

11 files changed, 20 insertions, 88 deletions

diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile
index ce7f891432b9..a193881f501a 100644
--- a/devel/lasi/Makefile
+++ b/devel/lasi/Makefile
@@ -2,8 +2,7 @@
 #    $MCom: ports/devel/lasi/Makefile,v 1.1 2006/10/04 20:25:40 ahze Exp $
 
 PORTNAME=	lasi
-PORTVERSION=	1.1.1
-PORTREVISION=	8
+PORTVERSION=	1.1.3
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 DISTNAME=	libLASi-${PORTVERSION}
@@ -39,8 +38,8 @@ pre-install:
 .endif
 
 post-install:
-	@${MV} ${STAGEDIR}${PREFIX}/lib/libLASi.so.1.0.0 \
-		${STAGEDIR}${PREFIX}/lib/libLASi.so.1
+	@${MV} ${STAGEDIR}${PREFIX}/lib/libLASi.so.2.0.0 \
+		${STAGEDIR}${PREFIX}/lib/libLASi.so.2
 .if ${PORT_OPTIONS:MDOXYGEN}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${MV} ${STAGEDIR}${DATADIR}/doc/* ${STAGEDIR}${DOCSDIR}/
diff --git a/devel/lasi/distinfo b/devel/lasi/distinfo
index 42d2327d9aa8..66b7eca207ba 100644
--- a/devel/lasi/distinfo
+++ b/devel/lasi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libLASi-1.1.1.tar.gz) = 175964cb4fec347737899f9fa0b8d7441864ae20f439e013432d9b9072ab3723
-SIZE (libLASi-1.1.1.tar.gz) = 223589
+TIMESTAMP = 1619715384
+SHA256 (libLASi-1.1.3.tar.gz) = 5e5d2306f7d5a275949fb8f15e6d79087371e2a1caa0d8f00585029d1b47ba3b
+SIZE (libLASi-1.1.3.tar.gz) = 726769
diff --git a/devel/lasi/files/patch-cmake+modules+instdirs.cmake b/devel/lasi/files/patch-cmake+modules+instdirs.cmake
index 18fcf8b2b3c1..6f9b09198143 100644
--- a/devel/lasi/files/patch-cmake+modules+instdirs.cmake
+++ b/devel/lasi/files/patch-cmake+modules+instdirs.cmake
@@ -1,8 +1,10 @@
---- cmake/modules/instdirs.cmake.orig	2008-12-31 14:43:21.000000000 -0500
-+++ cmake/modules/instdirs.cmake	2008-12-31 14:44:24.000000000 -0500
-@@ -61,4 +61,4 @@
- set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
- set(docdir ${CMAKE_INSTALL_DATADIR}/doc/libLASi-${VERSION})
+--- cmake/modules/instdirs.cmake.orig	2019-01-31 07:34:50 UTC
++++ cmake/modules/instdirs.cmake
+@@ -80,6 +80,6 @@ set(docdir ${CMAKE_INSTALL_DATADIR}/doc/libLASi-${VERS
+ CACHE PATH "install location for documentation"
+ )
  
--set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION})
-+set(DATA_DIR ${CMAKE_INSTALL_DATADIR})
+-set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${PACKAGE}${VERSION}
++set(DATA_DIR ${CMAKE_INSTALL_DATADIR}
+ CACHE PATH "install location for architecture-independent data"
+ )
diff --git a/devel/lasi/files/patch-include_LASi.h b/devel/lasi/files/patch-include_LASi.h
deleted file mode 100644
index 613b5c712c83..000000000000
--- a/devel/lasi/files/patch-include_LASi.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/LASi.h.orig	2013-12-13 10:12:32.000000000 +0100
-+++ include/LASi.h	2013-12-13 10:14:20.000000000 +0100
-@@ -11,7 +11,8 @@
- #include <sstream>
- #include <map>
- #include <pango/pango.h>
--#include <freetype/ftglyph.h>
-+#include <ft2build.h>
-+#include FT_GLYPH_H
- 
- class FreetypeGlyphMgr;
- class ContextMgr;
diff --git a/devel/lasi/files/patch-src_drawGlyph.cpp b/devel/lasi/files/patch-src_drawGlyph.cpp
deleted file mode 100644
index 1ce9a4c23382..000000000000
--- a/devel/lasi/files/patch-src_drawGlyph.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/drawGlyph.cpp.orig	2013-12-13 10:13:26.000000000 +0100
-+++ src/drawGlyph.cpp	2013-12-13 10:15:19.000000000 +0100
-@@ -6,7 +6,8 @@
-  */
- 
- #include <ostream>
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
- #include <algorithm>
- #include <LASi.h>
- #include <config.h>
diff --git a/devel/lasi/files/patch-src_drawGlyph.h b/devel/lasi/files/patch-src_drawGlyph.h
deleted file mode 100644
index cb174aae7889..000000000000
--- a/devel/lasi/files/patch-src_drawGlyph.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/drawGlyph.h.orig	2013-12-13 10:13:05.000000000 +0100
-+++ src/drawGlyph.h	2013-12-13 10:15:40.000000000 +0100
-@@ -10,7 +10,8 @@
- 
- #include <iostream>
- #include <pango/pango.h>
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- 
- /** Generate the Postscript commands to draw the glyph
-   * using the font in pPangoCtx.
diff --git a/devel/lasi/files/patch-src_glyphMgr.cpp b/devel/lasi/files/patch-src_glyphMgr.cpp
deleted file mode 100644
index 426821e6d803..000000000000
--- a/devel/lasi/files/patch-src_glyphMgr.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/glyphMgr.cpp.orig	2013-12-13 10:13:39.000000000 +0100
-+++ src/glyphMgr.cpp	2013-12-13 10:17:39.000000000 +0100
-@@ -10,8 +10,7 @@
- 
- #include <ft2build.h>
- #include FT_FREETYPE_H
--
--#include <freetype/ftglyph.h>
-+#include FT_GLYPH_H
- 
- #include <cassert>
- #include "util.h"
diff --git a/devel/lasi/files/patch-src_glyphMgr.h b/devel/lasi/files/patch-src_glyphMgr.h
deleted file mode 100644
index 23afe4b1052f..000000000000
--- a/devel/lasi/files/patch-src_glyphMgr.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/glyphMgr.h.orig	2013-12-13 10:13:45.000000000 +0100
-+++ src/glyphMgr.h	2013-12-13 10:17:50.000000000 +0100
-@@ -15,8 +15,7 @@
- 
- #include <ft2build.h>
- #include FT_FREETYPE_H
--
--#include <freetype/ftglyph.h>
-+#include FT_GLYPH_H
- 
- /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
-  */
diff --git a/devel/lasi/files/patch-src_util.h b/devel/lasi/files/patch-src_util.h
deleted file mode 100644
index 567da584216a..000000000000
--- a/devel/lasi/files/patch-src_util.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/util.h.orig	2013-12-13 10:13:16.000000000 +0100
-+++ src/util.h	2013-12-13 10:17:01.000000000 +0100
-@@ -18,7 +18,7 @@
- 
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include <freetype/ftglyph.h>
-+#include FT_GLYPH_H
- 
- std::ostream& operator<<(std::ostream&, const FT_Library);
- std::ostream& operator<<(std::ostream&, const FT_Face);
diff --git a/devel/lasi/pkg-plist b/devel/lasi/pkg-plist
index a014446400e5..8eee39a18928 100644
--- a/devel/lasi/pkg-plist
+++ b/devel/lasi/pkg-plist
@@ -1,6 +1,6 @@
 include/LASi.h
 lib/libLASi.so
-lib/libLASi.so.1
+lib/libLASi.so.2
 libdata/pkgconfig/lasi.pc
 %%DOXYGEN%%%%DOCSDIR%%/libLASi-1.1.1/html/developer/html/LASi_8h.html
 %%DOXYGEN%%%%DOCSDIR%%/libLASi-1.1.1/html/developer/html/LASi_8h_source.html
@@ -150,9 +150,10 @@ libdata/pkgconfig/lasi.pc
 %%DOXYGEN%%%%DOCSDIR%%/libLASi-1.1.1/html/user/html/tab_s.png
 %%DOXYGEN%%%%DOCSDIR%%/libLASi-1.1.1/html/user/html/tabs.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ComplexTextLayoutExample.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example_1_Result.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Example_2_Result.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ComplexTextLayoutExample.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/MissingGlyphExample.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/SimpleLASiExample.png
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index db9cd180c45a..0b62caca6aeb 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	plplot
 DISTVERSION=	5.15.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source