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

--- makefile.orig	2013-10-13 23:38:06.000000000 +0200
+++ makefile	2014-01-27 15:50:05.858185668 +0100
@@ -5,13 +5,6 @@
 # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
 
 .SUFFIXES: .cxx .o .h .a .c
-ifdef CLANG
-CC = clang -fsanitize=address --std=c++0x
-CCOMP = clang -fsanitize=address -Wno-empty-body
-else
-CC = g++
-CCOMP = gcc
-endif
 AR = ar
 
 ifdef GTK3
@@ -24,7 +17,7 @@
 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)
@@ -116,8 +109,9 @@
 $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
 FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.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)
-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lm -lstdc++
+	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
+	$(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \
+	-o $@ $^ -lscintilla -lscintilla_lexers -Wl,--as-needed $(CONFIGLIB)
 
 # Automatically generate header dependencies with "make deps"
 include deps.mak
- 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			`--- makefile.orig 2013-10-13 23:38:06.000000000 +0200`
			`+++ makefile 2014-01-27 15:50:05.858185668 +0100`
Update to 3.2.5 PR: ports/176458 Submitted by: Naram Qashat (maintainer) 2013-02-27 12:47:50 +01:00			`@@ -5,13 +5,6 @@`
- Update to version 1.55 PR: 57354 Submitted by: Ports Fury 2003-10-01 12:44:26 +02:00			`# GNU make does not like \r\n line endings so should be saved to CVS in binary form.`
- 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`
Update to 3.3.3. PR: ports/179851 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2013-06-22 22:09:24 +02:00			`-CC = clang -fsanitize=address --std=c++0x`
			`-CCOMP = clang -fsanitize=address -Wno-empty-body`
- Update to 2.12 PR: ports/147299 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2010-06-02 16:05:46 +02:00			`-else`
- Update to version 1.55 PR: 57354 Submitted by: Ports Fury 2003-10-01 12:44:26 +02:00			`-CC = g++`
- Update to 2.12 PR: ports/147299 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2010-06-02 16:05:46 +02:00			`-CCOMP = gcc`
			`-endif`
- Update to version 1.55 PR: 57354 Submitted by: Ports Fury 2003-10-01 12:44:26 +02:00			`AR = ar`
- 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`
Update to 3.2.5 PR: ports/176458 Submitted by: Naram Qashat (maintainer) 2013-02-27 12:47:50 +01:00			`@@ -24,7 +17,7 @@`
- 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.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			`@@ -116,8 +109,9 @@`
- Update to 2.27 PR: ports/158627 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer) 2011-07-04 20:25:07 +02:00			`$(PROG): SciTEGTK.o GUIGTK.o Widget.o \`
- 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			`FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.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.2.5 PR: ports/176458 Submitted by: Naram Qashat (maintainer) 2013-02-27 12:47:50 +01:00			- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script 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)`
Fix linking and builds with recent versions of gcc; small clean-up PR: 160599 Approved by: Naram Qashat (maintainer) 2011-09-13 13:32:32 +02:00			`+ $(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \`
Fix a linking problem on 9.0 Reported by: pav Approved by: N. Qashat (maintainer) 2011-09-27 22:06:58 +02:00			`+ -o $@ $^ -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`