Attachment #166538 for bug #206910

Lines 2-8 Link Here

(-)scintilla/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/x11-toolkits/scintilla/Makefile 402317 2015-11-23 19:35:18Z amdmi3 $	2	# $FreeBSD: head/x11-toolkits/scintilla/Makefile 402317 2015-11-23 19:35:18Z amdmi3 $
3		3
4	PORTNAME= scintilla	4	PORTNAME= scintilla
5	PORTVERSION= 3.6.2	5	PORTVERSION= 3.6.3
6	CATEGORIES= x11-toolkits	6	CATEGORIES= x11-toolkits
7	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}	7	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
8	DISTNAME= scite${PORTVERSION:S/.//g}	8	DISTNAME= scite${PORTVERSION:S/.//g}
Lines 33-39 Link Here
33	.endif	33	.endif
34		34
35	post-patch:	35	post-patch:
36	@${REINPLACE_CMD} -e 's\| -Os\|\|g' ${WRKSRC}/makefile	36	@${REINPLACE_CMD} -e 's\| -Os\|\|g ; s\| $$(PICFLAGS)\|\|' ${WRKSRC}/makefile
37		37
38	do-install:	38	do-install:
39	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla	39	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla

Lines 1-2 Link Here

(-)scintilla/distinfo (-2 / +2 lines)
1	SHA256 (scite362.tgz) = 6530d0d86c72485b815663e3b2c2987d59779340a71632ed8bb97a43530737a3	1	SHA256 (scite363.tgz) = f7308c2bcce34720d856af2dde022b29cde6f6a4d808a7ccaae40899115a86f4
2	SIZE (scite362.tgz) = 2368491	2	SIZE (scite363.tgz) = 2385888




--- makefile.orig	2016-01-17 22:34:04 UTC
+++ makefile
@@ -7,14 +7,6 @@
 # Also works with ming32-make on Windows.

 RANLIB = touch
 
 ifdef GTK3
@@ -41,7 +33,8 @@
 COMPLIB=..\bin\scintilla.a
 else
 DEL = rm -f

 endif
 
 vpath %.h ../src ../include ../lexlib
@@ -73,8 +66,7 @@
 CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
 endif
 

 
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
@@ -82,11 +74,11 @@
 .cxx.o:
 	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
 .c.o:

 
 clean:
 	$(DEL) *.o $(COMPLIB) *.plist
@@ -103,9 +95,11 @@
 	PropSetSimple.o PlatGTK.o \
 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \
 	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \

Return to bug 206910

Lines 1-4 Link Here

(-)scintilla/files/patch-makefile (-5 / +5 lines)
1	--- makefile.orig 2014-11-27 20:47:24 UTC	1	--- makefile.orig 2016-01-17 22:34:04 UTC
2	+++ makefile	2	+++ makefile
3	@@ -7,14 +7,6 @@	3	@@ -7,14 +7,6 @@
4	# Also works with ming32-make on Windows.	4	# Also works with ming32-make on Windows.
Lines 15-21 Link Here
15	RANLIB = touch	15	RANLIB = touch
16		16
17	ifdef GTK3	17	ifdef GTK3
18	@@ -36,7 +28,8 @@	18	@@ -41,7 +33,8 @@
19	COMPLIB=..\bin\scintilla.a	19	COMPLIB=..\bin\scintilla.a
20	else	20	else
21	DEL = rm -f	21	DEL = rm -f
Lines 25-31 Link Here
25	endif	25	endif
26		26
27	vpath %.h ../src ../include ../lexlib	27	vpath %.h ../src ../include ../lexlib
28	@@ -68,8 +61,7 @@	28	@@ -73,8 +66,7 @@
29	CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)	29	CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
30	endif	30	endif
31		31
Lines 35-41 Link Here
35		35
36	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))	36	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
37	MARSHALLER=scintilla-marshal.o	37	MARSHALLER=scintilla-marshal.o
38	@@ -77,11 +69,11 @@	38	@@ -82,11 +74,11 @@
39	.cxx.o:	39	.cxx.o:
40	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<	40	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
41	.c.o:	41	.c.o:
Lines 49-55 Link Here
49		49
50	clean:	50	clean:
51	$(DEL) .o $(COMPLIB) .plist	51	$(DEL) .o $(COMPLIB) .plist
52	@@ -98,9 +90,11 @@	52	@@ -103,9 +95,11 @@
53	PropSetSimple.o PlatGTK.o \	53	PropSetSimple.o PlatGTK.o \
54	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \	54	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o CharacterCategory.o ViewStyle.o \
55	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \	55	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \