ports/160599: [PATCH]editors/scite: fix linking, build with recent versions of gcc, trim patch

[bf]

>Number:         160599
>Category:       ports
>Synopsis:       [PATCH]editors/scite: fix linking, build with recent versions of gcc, trim patch
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 09 20:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        
>Organization:
-
>Environment:
>Description:
--correct link line by respecting {CXX,LD}FLAGS (needed for some flags) and adding shared libraries in proper order, which is desirable when using --as-needed

--add a header inclusion that is necessary to build the port with recent versions of gcc after a refactoring of c++ headers in libstdc++ -- it has include guards, so there should be no penalty for other compilers

--trim patch by removing rather than commenting-out lines (the removed lines are still in the patch body for reference)

No PORTREVISION bump because rebuilds will be enforced by the bump in the related PR ports/160598 
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: files/patch-aa
===================================================================
RCS file: /home/pcvs/ports/editors/scite/files/patch-aa,v
retrieving revision 1.23
diff -u -r1.23 patch-aa
--- files/patch-aa	5 Sep 2011 15:35:46 -0000	1.23
+++ files/patch-aa	7 Sep 2011 02:02:53 -0000
@@ -1,6 +1,6 @@
 --- makefile.orig	2011-07-31 22:49:29.000000000 -0400
-+++ makefile	2011-09-03 16:25:52.000000000 -0400
-@@ -5,13 +5,13 @@
++++ makefile	2011-09-06 22:02:21.000000000 -0400
+@@ -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
@@ -11,17 +11,10 @@
 -CC = g++
 -CCOMP = gcc
 -endif
-+#ifdef CLANG
-+#CC = clang
-+#CCOMP = clang
-+#else
-+#CC = g++
-+#CCOMP = gcc
-+#endif
  AR = ar
  
  ifdef GTK3
-@@ -24,7 +24,7 @@
+@@ -24,7 +17,7 @@
  CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
  CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
  CONFIGTHREADS:=
@@ -30,15 +23,15 @@
  ifndef prefix
  ifdef gnomeprefix
    prefix=$(gnomeprefix)
-@@ -102,8 +102,9 @@
+@@ -102,8 +95,9 @@
  $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
  FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
  PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.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) -lstdc++
 +	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
-+	$(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers -lstdc++ \
-+	-rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@
++	$(CC) -DGTK $(CXXFLAGS) -rdynamic -Wl,--version-script lua.vers $(LDFLAGS) \
++	-o $@ $^ -Wl,--as-needed -lscintilla -lscintilla_lexers $(CONFIGLIB)
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
Index: files/patch-src__FilePath.h
===================================================================
RCS file: files/patch-src__FilePath.h
diff -N files/patch-src__FilePath.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src__FilePath.h	7 Sep 2011 01:44:29 -0000
@@ -0,0 +1,10 @@
+--- ../src/FilePath.h.orig	2011-07-31 22:49:30.000000000 -0400
++++ ../src/FilePath.h	2011-09-06 21:43:03.000000000 -0400
+@@ -13,6 +13,7 @@
+ extern const GUI::gui_char fileWrite[];
+ 
+ #if defined(__unix__)
++#include <cstdio>
+ #include <limits.h>
+ #ifdef PATH_MAX
+ #define MAX_PATH PATH_MAX


>Release-Note:
>Audit-Trail:
>Unformatted: