freebsd-ports/editors/scite/files/patch-makefile

--- makefile.orig	2016-08-30 04:39:12 UTC
+++ makefile
@@ -7,16 +7,6 @@
 srcdir ?= .
 
 .SUFFIXES: .cxx .o .h .a .c
-ifdef 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
-#SANITIZE = undefined
-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register
-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body
-else
-MISLEADING=-Wno-misleading-indentation
-endif
 
 ifdef GTK3
 GTKVERSION=gtk+-3.0
@@ -28,7 +18,7 @@ endif
 CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
 CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)
 CONFIGTHREADS:=
-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
+gnomeprefix:=$(PREFIX)
 ifndef prefix
 ifdef gnomeprefix
   prefix=$(gnomeprefix)
@@ -119,8 +109,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 $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
+	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
+	$(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \
+	$(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
 
 # Automatically generate header dependencies with "make deps"
 include deps.mak
- Update to 3.6.7 PR: 212404 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer) 2016-09-07 18:39:18 +02:00			`--- makefile.orig 2016-08-30 04:39:12 UTC`
- Update scintilla and scite to 3.5.1 - Remove dirrms PR: 193781 Submitted by: Naram Qashat <cyberbotx at cyberbotx.com> (maintainer) 2014-10-10 18:24:00 +02:00			`+++ makefile`
- Update to 3.6.7 PR: 212404 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer) 2016-09-07 18:39:18 +02:00			`@@ -7,16 +7,6 @@`
			`srcdir ?= .`
- Update to 1.74, only build with GTK+2 since GTK+1 is broke. - Passing the maintainership to the submitter. - Respect CC/CXX/CFLAGS/CXXFLAGS. - Remove IGNORE check on amd64, need someone to test it to see if it's fixed or not. If not, then it can be add back. - Block create package since scintilla builds with GTK+1 by default. It will not build unless you enable scintilla with GTK+2 support. - Removed DEPRECATED/EXPIRATION_DATE. PR: ports/115188 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> 2007-08-22 05:36:05 +02:00
Update to 0.62. 2005-02-03 21:07:07 +01:00			`.SUFFIXES: .cxx .o .h .a .c`
- Update to 2.12 PR: ports/147299 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2010-06-02 16:05:46 +02:00			`-ifdef CLANG`
scite and scintilla: Upgrade version 3.4.1 => 3.4.4 PR: 190754 Submitted by: maintainer (Naram Qashat) 2014-08-08 21:47:35 +02:00			`-# 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`
			`-#SANITIZE = undefined`
- Update to 3.6.2 PR: 204561 Submitted by: cyberbotx@cyberbotx.com (maintainer) 2015-11-23 20:35:50 +01:00			`-CXX = clang++ -fsanitize=$(SANITIZE) -Wno-deprecated-register`
scite and scintilla: Upgrade version 3.4.1 => 3.4.4 PR: 190754 Submitted by: maintainer (Naram Qashat) 2014-08-08 21:47:35 +02:00			`-CC = clang -fsanitize=$(SANITIZE) -Wno-empty-body`
- Update to 3.6.7 PR: 212404 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer) 2016-09-07 18:39:18 +02:00			`-else`
			`-MISLEADING=-Wno-misleading-indentation`
- Update to 2.12 PR: ports/147299 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2010-06-02 16:05:46 +02:00			`-endif`
- Update to 1.74, only build with GTK+2 since GTK+1 is broke. - Passing the maintainership to the submitter. - Respect CC/CXX/CFLAGS/CXXFLAGS. - Remove IGNORE check on amd64, need someone to test it to see if it's fixed or not. If not, then it can be add back. - Block create package since scintilla builds with GTK+1 by default. It will not build unless you enable scintilla with GTK+2 support. - Removed DEPRECATED/EXPIRATION_DATE. PR: ports/115188 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> 2007-08-22 05:36:05 +02:00
- Update to 2.27 PR: ports/158627 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2011-07-04 20:25:07 +02:00			`ifdef GTK3`
scite and scintilla: Upgrade version 3.4.1 => 3.4.4 PR: 190754 Submitted by: maintainer (Naram Qashat) 2014-08-08 21:47:35 +02:00			`GTKVERSION=gtk+-3.0`
- Update to 3.6.7 PR: 212404 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer) 2016-09-07 18:39:18 +02:00			`@@ -28,7 +18,7 @@ endif`
- Update to 2.27 PR: ports/158627 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2011-07-04 20:25:07 +02:00			`CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))`
- Update to 3.2.1 PR: ports/170565 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) Approved by: tabthorpe (mentor) 2012-08-13 21:41:49 +02:00			`CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-no-export-2.0)`
- Update to 2.01 - Fix MASTER_SITES PR: 138016 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2009-08-26 22:33:10 +02:00			`CONFIGTHREADS:=`
- Update to 2.27 PR: ports/158627 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2011-07-04 20:25:07 +02:00			`-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)`
- Update to 1.74, only build with GTK+2 since GTK+1 is broke. - Passing the maintainership to the submitter. - Respect CC/CXX/CFLAGS/CXXFLAGS. - Remove IGNORE check on amd64, need someone to test it to see if it's fixed or not. If not, then it can be add back. - Block create package since scintilla builds with GTK+1 by default. It will not build unless you enable scintilla with GTK+2 support. - Removed DEPRECATED/EXPIRATION_DATE. PR: ports/115188 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> 2007-08-22 05:36:05 +02:00			`+gnomeprefix:=$(PREFIX)`
- Update to 2.12 PR: ports/147299 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2010-06-02 16:05:46 +02:00			`ifndef prefix`
			`ifdef gnomeprefix`
			`prefix=$(gnomeprefix)`
- Update to 3.6.7 PR: 212404 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer) 2016-09-07 18:39:18 +02:00			`@@ -119,8 +109,9 @@ FilePath.o SciTEBase.o FileWorker.o Cook`
- Update to 3.6.2 PR: 204561 Submitted by: cyberbotx@cyberbotx.com (maintainer) 2015-11-23 20:35:50 +01:00			`ExportHTML.o ExportPDF.o ExportRTF.o ExportTEX.o ExportXML.o \`
			`MatchMarker.o StringHelpers.o \`
- Update to 3.3.9 - Convert to staging PR: ports/186175 Submitted by: me Approved by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2014-03-05 02:23:16 +01:00			`PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.o StyleWriter.o Utf8_16.o \`
- Update to 1.77 PR: 128228 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2008-10-24 16:22:40 +02:00			`- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)`
- Update to 3.6.7 PR: 212404 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer) 2016-09-07 18:39:18 +02:00			- $(CXX) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script $(srcdir)/lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
- Update to 1.77 PR: 128228 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2008-10-24 16:22:40 +02:00			`+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)`
- Update to 3.6.7 PR: 212404 Submitted by: lightside@gmx.com Approved by: cyberbotx@cyberbotx.com (maintainer) 2016-09-07 18:39:18 +02:00			`+ $(CXX) -rdynamic -Wl,--version-script $(srcdir)/lua.vers -DGTK $(CXXFLAGS) $^ -o $@ \`
scite and scintilla: Upgrade version 3.4.1 => 3.4.4 PR: 190754 Submitted by: maintainer (Naram Qashat) 2014-08-08 21:47:35 +02:00			`+ $(LDFLAGS) -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)`
- Update to 1.74, only build with GTK+2 since GTK+1 is broke. - Passing the maintainership to the submitter. - Respect CC/CXX/CFLAGS/CXXFLAGS. - Remove IGNORE check on amd64, need someone to test it to see if it's fixed or not. If not, then it can be add back. - Block create package since scintilla builds with GTK+1 by default. It will not build unless you enable scintilla with GTK+2 support. - Removed DEPRECATED/EXPIRATION_DATE. PR: ports/115188 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> 2007-08-22 05:36:05 +02:00
- Update to version 1.58 PR: 61245 Submitted by: Ports Fury 2004-01-12 15:19:07 +01:00			`# Automatically generate header dependencies with "make deps"`
			`include deps.mak`