Attachment #174408 for bug #212404

Lines 2-8 Link Here

(-)scite/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/editors/scite/Makefile 418359 2016-07-11 08:58:51Z madpilot $	2	# $FreeBSD: head/editors/scite/Makefile 418359 2016-07-11 08:58:51Z madpilot $
3		3
4	PORTNAME= scite	4	PORTNAME= scite
5	PORTVERSION= 3.6.6	5	PORTVERSION= 3.6.7
6	CATEGORIES= editors gnome	6	CATEGORIES= editors gnome
7	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}	7	MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
8	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}	8	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}

Lines 1-3 Link Here

(-)scite/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1464048149	1	TIMESTAMP = 1472947347
2	SHA256 (scite366.tgz) = 22218673f53bc587c1cb8d9ddc5c3058a9906c2a530d9270f31f943625e0dffa	2	SHA256 (scite367.tgz) = 851a681d2fefe02770d318c4c25401f423b6ea686f6cae3eed5257e27c86c49f
3	SIZE (scite366.tgz) = 2371062	3	SIZE (scite367.tgz) = 2331985

Lines 1-7 Link Here

(-)scite/files/patch-makefile (-7 / +9 lines)
1	--- makefile.orig 2015-09-22 01:37:15 UTC	1	--- makefile.orig 2016-08-30 04:39:12 UTC
2	+++ makefile	2	+++ makefile
3	@@ -5,14 +5,6 @@	3	@@ -7,16 +7,6 @@
4	# GNU make does not like \r\n line endings so should be saved to CVS in binary form.	4	srcdir ?= .
5		5
6	.SUFFIXES: .cxx .o .h .a .c	6	.SUFFIXES: .cxx .o .h .a .c
7	-ifdef CLANG	7	-ifdef CLANG
Lines 11-21 Link Here
11	-#SANITIZE = undefined	11	-#SANITIZE = undefined
12	-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register	12	-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
13	-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body	13	-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
		14	-else
		15	-MISLEADING=-Wno-misleading-indentation
14	-endif	16	-endif
15		17
16	ifdef GTK3	18	ifdef GTK3
17	GTKVERSION=gtk+-3.0	19	GTKVERSION=gtk+-3.0
18	@@ -24,7 +16,7 @@ endif	20	@@ -28,7 +18,7 @@ endif
19	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))	21	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
20	CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)	22	CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
21	CONFIGTHREADS:=	23	CONFIGTHREADS:=
Lines 24-37 Link Here
24	ifndef prefix	26	ifndef prefix
25	ifdef gnomeprefix	27	ifdef gnomeprefix
26	prefix=$(gnomeprefix)	28	prefix=$(gnomeprefix)
27	@@ -114,8 +106,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook	29	@@ -119,8 +109,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook
28	ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \	30	ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
29	MatchMarker.o StringHelpers.o \	31	MatchMarker.o StringHelpers.o \
30	PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \	32	PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
31	- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)	33	- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
32	- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++	34	- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
33	+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)	35	+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
34	+ $(CXX) -rdynamic -Wl,--version-script lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \	36	+ $(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
35	+ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)	37	+ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
36		38
37	# Automatically generate header dependencies with "make deps"	39	# Automatically generate header dependencies with "make deps"

Return to bug 212404