- Update to version 1.56

PR:		58629
Submitted by:	Ports Fury

4 files changed, 2 insertions, 50 deletions

diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 338ab73ae037..4d8293e6fd48 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.55
-PORTREVISION=	1
+PORTVERSION=	1.56
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -33,13 +32,6 @@ USE_GNOME=	gtk12
 MAKE_ARGS=	GTK1=yes
 .endif
 
-post-extract:
-.for i in PlatGTK.cxx ScintillaGTK.cxx
-	@cd ${WRKSRC} \
-		&& ${MV} ${i} ${i}.pre_tr \
-		&& ${TR} -d '\r' < ${i}.pre_tr > ${i}
-.endfor
-
 do-install:
 	${MKDIR} ${PREFIX}/include/scintilla
 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index 8629d81541dc..de4e0614f320 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite155.tgz) = f5292ac35853207d648c39decc165d63
+MD5 (scite156.tgz) = 83a4d56bc06f168107127d3717399295
diff --git a/x11-toolkits/scintilla/files/patch-PlatGTK.cxx b/x11-toolkits/scintilla/files/patch-PlatGTK.cxx
deleted file mode 100644
index 431b07977e47..000000000000
--- a/x11-toolkits/scintilla/files/patch-PlatGTK.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- PlatGTK.cxx.orig	Sun Sep 28 12:41:04 2003
-+++ PlatGTK.cxx	Sun Sep 28 12:42:27 2003
-@@ -1034,7 +1034,7 @@
- static char *UTF8FromIconv(iconv_t iconvh, const char *s, int len) {
- 	if (iconvh != ((iconv_t)(-1))) {
- 		char *utfForm = new char[len*3+1];
--		char *pin = const_cast<char *>(s);
-+		const char *pin = s;
- 		size_t inLeft = len;
- 		char *pout = utfForm;
- 		size_t outLeft = len*3+1;
-@@ -1051,7 +1051,7 @@
- static size_t MultiByteLenFromIconv(iconv_t iconvh, const char *s, size_t len) {
- 	for (size_t lenMB=1; (lenMB<4) && (lenMB <= len); lenMB++) {
- 		char wcForm[2];
--		char *pin = const_cast<char *>(s);
-+		const char *pin = s;
- 		size_t inLeft = lenMB;
- 		char *pout = wcForm;
- 		size_t outLeft = 2;
diff --git a/x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx b/x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx
deleted file mode 100644
index aa8bedd15f46..000000000000
--- a/x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- ScintillaGTK.cxx.orig	Sun Sep 28 12:41:04 2003
-+++ ScintillaGTK.cxx	Sun Sep 28 12:43:32 2003
-@@ -965,7 +965,7 @@
- 					iconv_t iconvh = iconv_open(source, "UTF-8");
- 					if (iconvh != ((iconv_t)(-1))) {
- 						char localeVal[4]="\0\0\0";
--						char *pin = utfVal;
-+						const char *pin = utfVal;
- 						size_t inLeft = strlen(utfVal);
- 						char *pout = localeVal;
- 						size_t outLeft = sizeof(localeVal);
-@@ -1103,7 +1103,7 @@
- 	iconv_t iconvh = iconv_open(charSetDest, charSetSource);
- 	if (iconvh != ((iconv_t)(-1))) {
- 		destForm = new char[len*3+1];
--		char *pin = s;
-+		const char *pin = s;
- 		size_t inLeft = len;
- 		char *pout = destForm;
- 		size_t outLeft = len*3+1;