Attachment #194183 for bug #228909

Lines 2-8 Link Here

(-)Makefile (-2 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= scintilla	4	PORTNAME= scintilla
5	DISTVERSION= 4.0.2	5	DISTVERSION= 4.0.5
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 15-23 Link Here
15	LICENSE_FILE= ${WRKSRC}/../License.txt	15	LICENSE_FILE= ${WRKSRC}/../License.txt
16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
17		17
		18	BROKEN_FreeBSD_10= Does not compile: error: no member named 'clamp' in namespace 'std'
		19
18	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	20	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
19		21
20	USES= compiler:c++14-lang gmake iconv pkgconfig tar:tgz	22	USES= compiler:c++17-lang gmake iconv pkgconfig tar:tgz
		23	CXXSTD= gnu++17
21	MAKEFILE= makefile	24	MAKEFILE= makefile
22	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
23	USE_GNOME= gtk20	26	USE_GNOME= gtk20

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1516053463	1	TIMESTAMP = 1528511421
2	SHA256 (scite402.tgz) = 1f9bb8eccbaed77c110c30c0e6dbaac04b3f62b751a930192b133a7b6f0f29fb	2	SHA256 (scite405.tgz) = 02a7658883210be0b6c9a113a1a4e75800cb68a7e495dd209cd31a94c4e42640
3	SIZE (scite402.tgz) = 2424648	3	SIZE (scite405.tgz) = 2474862




--- makefile.orig	2018-04-10 01:38:39 UTC
+++ makefile
@@ -11,9 +11,7 @@
 srcdir ?= .
 
 ifdef CLANG
-ifdef CLANG
-CXX = clang++
 CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
-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
 SANITIZE = address
@@ -49,7 +47,12 @@ DEL = del /q
-else
-CXXWARNFLAGS = -Wall -pedantic
-endif
 ARFLAGS = rc
 RANLIB = touch
 
@@ -48,7 +38,12 @@ DEL = del /q
 COMPLIB=$(srcdir)\..\bin\scintilla.a
 else
 DEL = rm -f

 endif
 
 vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(RE
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 MARSHALLER=scintilla-marshal.o
 
 LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
 
-all: $(COMPLIB)
+all: $(COMPLIB) $(LEXRLIB)
 
 clean:
 	$(DEL) *.o $(COMPLIB) *.plist
@@ -123,9 +126,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De
 	PropSetSimple.o PlatGTK.o \
 	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.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 228909

Lines 1-24 Link Here

(-)files/patch-makefile (-19 / +11 lines)
1	--- makefile.orig 2017-08-16 07:34:01 UTC	1	--- makefile.orig 2018-04-10 01:38:39 UTC
2	+++ makefile	2	+++ makefile
3	@@ -9,17 +9,7 @@	3	@@ -11,9 +11,7 @@
4	srcdir ?= .	4	srcdir ?= .
5		5
6	.SUFFIXES: .cxx .c .o .h .a .list	6	ifdef CLANG
7	-ifdef CLANG
8	-CXX = clang++	7	-CXX = clang++
9	CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces	8	CXXWARNFLAGS = -Wall -pedantic -Wno-deprecated-register -Wno-missing-braces
10	-CC = clang	9	-CC = clang
11	-# 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
12	-# thread also need to create Position Independent Executable -> search online documentation	11	# thread also need to create Position Independent Executable -> search online documentation
13	-SANITIZE = address	12	SANITIZE = address
14	-#SANITIZE = undefined	13	@@ -49,7 +47,12 @@ DEL = del /q
15	-else
16	-CXXWARNFLAGS = -Wall -pedantic
17	-endif
18	ARFLAGS = rc
19	RANLIB = touch
20
21	@@ -48,7 +38,12 @@ DEL = del /q
22	COMPLIB=$(srcdir)\..\bin\scintilla.a	14	COMPLIB=$(srcdir)\..\bin\scintilla.a
23	else	15	else
24	DEL = rm -f	16	DEL = rm -f
Lines 32-47 Link Here
32	endif	24	endif
33		25
34	vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib	26	vpath %.h $(srcdir) $(srcdir)/../src $(srcdir)/../include $(srcdir)/../lexlib
35	@@ -101,7 +96,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintil	27	@@ -87,7 +90,7 @@ CXXTFLAGS:=--std=gnu++17 $(CTFLAGS) $(RE
		28	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
		29	MARSHALLER=scintilla-marshal.o
36		30
37	LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))))
38
39	-all: $(COMPLIB)	31	-all: $(COMPLIB)
40	+all: $(COMPLIB) $(LEXRLIB)	32	+all: $(COMPLIB) $(LEXRLIB)
41		33
42	clean:	34	clean:
43	$(DEL) .o $(COMPLIB) .plist	35	$(DEL) .o $(COMPLIB) .plist
44	@@ -122,9 +117,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De	36	@@ -123,9 +126,11 @@ $(COMPLIB): Accessor.o CharacterSet.o De
45	PropSetSimple.o PlatGTK.o \	37	PropSetSimple.o PlatGTK.o \
46	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \	38	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o ScintillaGTKAccessible.o CellBuffer.o CharacterCategory.o ViewStyle.o \
47	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \	39	RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \