Attachment #150182 for bug #195675

Lines 2-8 Link Here

(-)scintilla/Makefile (-1 / +9 lines)
2	# $FreeBSD: head/x11-toolkits/scintilla/Makefile 370597 2014-10-10 16:24:00Z madpilot $	2	# $FreeBSD: head/x11-toolkits/scintilla/Makefile 370597 2014-10-10 16:24:00Z madpilot $
3		3
4	PORTNAME= scintilla	4	PORTNAME= scintilla
5	PORTVERSION= 3.5.1	5	PORTVERSION= 3.5.2
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 10-15 Link Here
10	MAINTAINER= cyberbotx@cyberbotx.com	10	MAINTAINER= cyberbotx@cyberbotx.com
11	COMMENT= Full-featured free source code editing component for GTK+	11	COMMENT= Full-featured free source code editing component for GTK+
12		12
		13	LICENSE= SCINTILLA
		14	LICENSE_NAME= License for Scintilla and SciTE
		15	LICENSE_FILE= ${WRKSRC}/../License.txt
		16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
		17
13	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	18	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
14		19
15	USES= gmake iconv pkgconfig tar:tgz	20	USES= gmake iconv pkgconfig tar:tgz
Lines 27-32 Link Here
27	PICFLAG?= -fpic	32	PICFLAG?= -fpic
28	.endif	33	.endif
29		34
		35	post-patch:
		36	@${REINPLACE_CMD} -e 's\| -Os\|\|g' ${WRKSRC}/makefile
		37
30	do-install:	38	do-install:
31	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla	39	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
32	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla	40	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla

Lines 1-2 Link Here

(-)scintilla/distinfo (-2 / +2 lines)
1	SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581	1	SHA256 (scite352.tgz) = d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836
2	SIZE (scite351.tgz) = 2272014	2	SIZE (scite352.tgz) = 2277393




--- makefile.orig	2014-11-28 00:47:24.000000000 +0400
+++ makefile	2014-12-04 14:28:51.000000000 +0400
@@ -7,14 +7,6 @@
 # Also works with ming32-make on Windows.
 

 endif
 
 vpath %.h ../src ../include ../lexlib
@@ -68,8 +61,7 @@
 CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
 endif
 
-CFLAGS:=$(CTFLAGS)
-CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
+CXXTFLAGS:=$(CTFLAGS) $(REFLAGS)
 
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
@@ -77,11 +69,11 @@
 .cxx.o:
 	$(CXX) $(CONFIGFLAGS) $(CXXTFLAGS) $(CXXFLAGS) -c $<
 .c.o:

 
 clean:
 	$(DEL) *.o $(COMPLIB) *.plist
@@ -98,9 +90,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 195675

Lines 1-5 Link Here

(-)scintilla/files/patch-makefile (-7 / +7 lines)
1	--- makefile.orig 2014-08-09 23:52:02 UTC	1	--- makefile.orig 2014-11-28 00:47:24.000000000 +0400
2	+++ makefile	2	+++ makefile 2014-12-04 14:28:51.000000000 +0400
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.
5		5
Lines 25-41 Link Here
25	endif	25	endif
26		26
27	vpath %.h ../src ../include ../lexlib	27	vpath %.h ../src ../include ../lexlib
28	@@ -64,8 +57,7 @@	28	@@ -68,8 +61,7 @@
29	CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)	29	CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
30	endif	30	endif
31		31
32	-CFLAGS:=$(CTFLAGS)	32	-CFLAGS:=$(CTFLAGS)
33	-CXXTFLAGS:=--std=c++0x $(CTFLAGS)	33	-CXXTFLAGS:=--std=c++0x $(CTFLAGS) $(REFLAGS)
34	+CXXTFLAGS:=$(CTFLAGS)	34	+CXXTFLAGS:=$(CTFLAGS) $(REFLAGS)
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	@@ -73,11 +65,11 @@	38	@@ -77,11 +69,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	@@ -94,9 +86,11 @@	52	@@ -98,9 +90,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 \