Attachment #148144 for bug #193781

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= scintilla	4	PORTNAME= scintilla
5	PORTVERSION= 3.4.4	5	PORTVERSION= 3.5.1
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 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (scite344.tgz) = 89602ea4c245928caac07bc5192d57f98b968e578efaf0748e3dd832a724c499	1	SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581
2	SIZE (scite344.tgz) = 2245870	2	SIZE (scite351.tgz) = 2272014




--- makefile.orig	2014-08-09 23:52:02 UTC
+++ makefile
@@ -7,14 +7,6 @@
 # Also works with ming32-make on Windows.
 
 .SUFFIXES: .cxx .c .o .h .a
-ifdef CLANG
-CXX = clang++ -Wno-deprecated-register
-CC = clang
-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
-# thread also need to create Position Independent Executable -> search online documentation

 
 clean:
 	$(DEL) *.o $(COMPLIB) *.plist
@@ -94,9 +86,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 \
-	$(MARSHALLER) $(LEXOBJS)

Lines 7-10 Link Here

(-)pkg-plist (-1 / +1 lines)
7	lib/libscintilla.so.2	7	lib/libscintilla.so.2
8	lib/libscintilla_lexers.so	8	lib/libscintilla_lexers.so
9	lib/libscintilla_lexers.so.2	9	lib/libscintilla_lexers.so.2
10	@dirrm include/scintilla	10

Return to bug 193781

Lines 1-11 Link Here

(-)files/patch-makefile (-5 / +5 lines)
1	--- ./makefile.orig 2014-07-25 06:59:40.000000000 -0400	1	--- makefile.orig 2014-08-09 23:52:02 UTC
2	+++ ./makefile 2014-08-07 08:31:47.000000000 -0400	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.
5		5
6	.SUFFIXES: .cxx .c .o .h .a	6	.SUFFIXES: .cxx .c .o .h .a
7	-ifdef CLANG	7	-ifdef CLANG
8	-CXX = clang++	8	-CXX = clang++ -Wno-deprecated-register
9	-CC = clang	9	-CC = clang
10	-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for	10	-# Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
11	-# thread also need to create Position Independent Executable -> search online documentation	11	-# thread also need to create Position Independent Executable -> search online documentation
Lines 49-56 Link Here
49		49
50	clean:	50	clean:
51	$(DEL) .o $(COMPLIB) .plist	51	$(DEL) .o $(COMPLIB) .plist
52	@@ -93,9 +85,11 @@	52	@@ -94,9 +86,11 @@
53	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o 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 \
56	- $(MARSHALLER) $(LEXOBJS)	56	- $(MARSHALLER) $(LEXOBJS)