Update to 1.55.

PR:		57362
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

5 files changed, 80 insertions, 20 deletions

diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 36c4c45d8de..b3b52dd6512 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scintilla
-PORTVERSION=	1.54
+PORTVERSION=	1.55
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -21,9 +21,23 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12
-INSTALLS_SHLIB=	yes
 MAKEFILE=	makefile
+INSTALLS_SHLIB=	yes
+
+.if defined(WITH_GTK2)
+USE_GNOME=	gtk20
+PKGNAMESUFFIX=	-gtk2
+.else
+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
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index 3712a7b8692..8629d81541d 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1 +1 @@
-MD5 (scite154.tgz) = 5086acda2bb7a637fc34b0655e30930e
+MD5 (scite155.tgz) = f5292ac35853207d648c39decc165d63
diff --git a/x11-toolkits/scintilla/files/patch-PlatGTK.cxx b/x11-toolkits/scintilla/files/patch-PlatGTK.cxx
new file mode 100644
index 00000000000..431b07977e4
--- /dev/null
+++ b/x11-toolkits/scintilla/files/patch-PlatGTK.cxx
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 00000000000..aa8bedd15f4
--- /dev/null
+++ b/x11-toolkits/scintilla/files/patch-ScintillaGTK.cxx
@@ -0,0 +1,20 @@
+--- 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;
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index 8d0d5b5e4eb..6ddc8b3705d 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,10 +1,7 @@
-
-$FreeBSD$
-
---- makefile.orig	Sun Aug 10 19:55:54 2003
-+++ makefile	Wed Aug 13 00:35:59 2003
-@@ -6,8 +6,8 @@
- # To build for GTK+ 2, define GTK2 on the make command line.
+--- makefile.orig	Sun Sep 21 11:19:30 2003
++++ makefile	Sun Sep 28 11:48:04 2003
+@@ -8,8 +8,8 @@
+ # To force GTK+ 1 build, define GTK1 on the make command line.
  
  .SUFFIXES: .cxx .o .h .a
 -CC = g++
@@ -14,7 +11,7 @@ $FreeBSD$
  RANLIB = touch
  
  ifeq ($(OSTYPE),darwin)
-@@ -16,7 +16,8 @@
+@@ -18,7 +18,8 @@
  RANLIB = ranlib
  endif
  
@@ -24,7 +21,7 @@ $FreeBSD$
  
  vpath %.h ../src ../include
  vpath %.cxx ../src
-@@ -31,9 +32,9 @@
+@@ -33,9 +34,9 @@
  endif
  
  ifdef DEBUG
@@ -35,17 +32,26 @@ $FreeBSD$
 +CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
  endif
  
- ifdef GTK2
-@@ -43,7 +44,7 @@
+ # If explicit setting of GTK1 or GTK2 then use that else look for
+@@ -44,7 +45,7 @@
+ CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+ else
+ ifdef GTK1
+-CONFIGFLAGS=gtk-config --cflags
++CONFIGFLAGS=pkg-config --cflags gtk+
+ else
+ ifneq (,$(findstring /,$(shell whereis -b pkg-config)))
+ CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+@@ -55,7 +56,7 @@
  endif
  
  .cxx.o:
 -	$(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
-+	$(CC) -DPIC -fpic $(shell $(GTK_CONFIG) --cflags) $(CXXFLAGS) -c $<
++	$(CC) -DPIC -fpic `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
  
  #++Autogenerated -- run src/LexGen.py to regenerate
  #**LEXOBJS=\\\n\(\*.o \)
-@@ -57,7 +58,7 @@
+@@ -69,7 +70,7 @@
  
  # The LEXOBJS have to be treated specially as the functions in them are not called from external code
  
@@ -54,16 +60,16 @@ $FreeBSD$
  
  clean:
  	rm -f *.o $(COMPLIB)
-@@ -69,8 +70,10 @@
+@@ -81,8 +82,10 @@
  	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
  	KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
  	RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o
 -	$(AR) rc $@ $^
 -	$(RANLIB) $@
-+	$(AR) $(shell $(GTK_CONFIG) --libs gthread) -o $@ $^
++	$(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
 +
 + $(LEXRLIB): $(LEXOBJS)
-+	$(AR) $(shell $(GTK_CONFIG) --libs gthread) -o $@ $^
++	$(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak