Attachment #163231 for bug #204561

Lines 2-8 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= scite	4	PORTNAME= scite
5	PORTVERSION= 3.6.1	5	PORTVERSION= 3.6.2
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 22-28 Link Here
22		22
23	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk	23	WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
24		24
25	USES= desktop-file-utils gmake pkgconfig tar:tgz	25	USES= compiler:c++11-lib desktop-file-utils gmake pkgconfig tar:tgz
26	USE_GNOME= gtk20	26	USE_GNOME= gtk20
27	MAKEFILE= makefile	27	MAKEFILE= makefile
28		28

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (scite361.tgz) = bdffdc28c501dbb5e3dc6cbfe3808da2d574df983790c6ddfc2643040023a010	1	SHA256 (scite362.tgz) = 6530d0d86c72485b815663e3b2c2987d59779340a71632ed8bb97a43530737a3
2	SIZE (scite361.tgz) = 2347061	2	SIZE (scite362.tgz) = 2368491




--- makefile.orig	2015-09-22 01:37:15 UTC
+++ makefile
@@ -5,14 +5,6 @@
 # GNU make does not like \r\n line endings so should be saved to CVS in binary form.

-# thread also need to create Position Independent Executable -> search online documentation
-SANITIZE = address
-#SANITIZE = undefined
-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
-endif
 
 ifdef GTK3
 GTKVERSION=gtk+-3.0
@@ -24,7 +16,7 @@ endif
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
 CONFIGTHREADS:=

 ifndef prefix
 ifdef gnomeprefix
   prefix=$(gnomeprefix)
@@ -114,8 +106,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook
 ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
 MatchMarker.o StringHelpers.o \
 PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \
-	JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
-	$(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++

Return to bug 204561

Lines 1-4 Link Here

(-)files/patch-makefile (-6 / +6 lines)
1	--- makefile.orig 2014-08-09 23:52:11 UTC	1	--- makefile.orig 2015-09-22 01:37:15 UTC
2	+++ makefile	2	+++ makefile
3	@@ -5,14 +5,6 @@	3	@@ -5,14 +5,6 @@
4	# GNU make does not like \r\n line endings so should be saved to CVS in binary form.	4	# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
Lines 9-21 Link Here
9	-# thread also need to create Position Independent Executable -> search online documentation	9	-# thread also need to create Position Independent Executable -> search online documentation
10	-SANITIZE = address	10	-SANITIZE = address
11	-#SANITIZE = undefined	11	-#SANITIZE = undefined
12	-CXX = clang++ -fsanitize=$(SANITIZE) --std=c++0x -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	-endif	14	-endif
15		15
16	ifdef GTK3	16	ifdef GTK3
17	GTKVERSION=gtk+-3.0	17	GTKVERSION=gtk+-3.0
18	@@ -24,7 +16,7 @@	18	@@ -24,7 +16,7 @@ endif
19	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))	19	CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
20	CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)	20	CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
21	CONFIGTHREADS:=	21	CONFIGTHREADS:=
Lines 24-32 Link Here
24	ifndef prefix	24	ifndef prefix
25	ifdef gnomeprefix	25	ifdef gnomeprefix
26	prefix=$(gnomeprefix)	26	prefix=$(gnomeprefix)
27	@@ -113,8 +105,9 @@	27	@@ -114,8 +106,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook
28	FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o \	28	ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \
29	Exporters.o MatchMarker.o StringHelpers.o \	29	MatchMarker.o StringHelpers.o \
30	PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \	30	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)	31	- 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++	32	- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++