2 files changed, 22 insertions, 22 deletions

diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 6dda425ee4b4..0cf888c5b125 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -24,6 +24,7 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
+MAKE_ENV=	CC="${CC}" CXX="${CXX}"
 
 .if defined(WITH_GTK2)
 USE_GNOME=	gtk20
@@ -43,6 +44,10 @@ MAKE_ARGS+=	PICFLAGS=-DPIC
 MAKE_ARGS+=	PICFLAGS="-DPIC -fPIC -fpic"
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(CC)|g ; \
+		s| -Os||g' ${WRKSRC}/makefile
+
 do-install:
 	${MKDIR} ${PREFIX}/include/scintilla
 	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa
index 34a970d0f75a..d5ba37ddbfa0 100644
--- a/x11-toolkits/scintilla/files/patch-aa
+++ b/x11-toolkits/scintilla/files/patch-aa
@@ -1,14 +1,15 @@
---- makefile.orig	Fri Aug 10 15:26:43 2007
-+++ makefile	Fri Aug 10 15:31:26 2007
+--- makefile.orig	2007-06-11 22:57:30.000000000 -0500
++++ makefile	2007-08-21 17:21:51.000000000 -0500
 @@ -8,16 +8,17 @@
  # To force GTK+ 1 build, define GTK1 on the make command line.
  
  .SUFFIXES: .cxx .c .o .h .a
 -CC = g++
-+CC ?= g++
- CCOMP = gcc
+-CCOMP = gcc
 -AR = ar
-+AR = $(CC) -shared
++#CC = g++
++#CCOMP = gcc
++AR = $(CXX) -shared
  RANLIB = touch
  
  ifeq ($(shell uname),Darwin)
@@ -29,41 +30,41 @@
 +CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
  else
 -CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS+=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
  endif
  
  # If explicit setting of GTK1 or GTK2 then use that else look for
  # pkg-config which is an OK indication that GTK2 is available
  ifdef GTK2
 -CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
-+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
++CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
  MARSHALLER=scintilla-marshal.o
  else
  ifdef GTK1
 -CONFIGFLAGS=$(shell gtk-config --cflags)
-+CONFIGFLAGS=pkg-config --cflags gtk+ gthread
++CONFIGFLAGS=$(shell pkg-config --cflags gtk+ gthread)
  else
  ifneq (,$(findstring /,$(shell whereis pkg-config)))
 -CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
-+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
++CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
  MARSHALLER=scintilla-marshal.o
  else
 -CONFIGFLAGS=$(shell gtk-config --cflags)
-+CONFIGFLAGS=pkg-config --cflags gtk+ gthread
++CONFIGFLAGS=$(shell pkg-config --cflags gtk+ gthread)
  endif
  endif
  endif
  
  .cxx.o:
 -	$(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
-+	$(CC) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
++	$(CC) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
  .c.o:
 -	$(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
-+	$(CCOMP) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
++	$(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
  
  #++Autogenerated -- run src/LexGen.py to regenerate
  #**LEXOBJS=\\\n\(\*.o \)
-@@ -75,22 +76,24 @@
+@@ -75,7 +76,7 @@
  LexVHDL.o LexYAML.o
  #--Autogenerated -- end of automatically generated section
  
@@ -72,13 +73,7 @@
  
  clean:
  	rm -f *.o $(COMPLIB)
- 
- deps:
--	$(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
-+	$(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
- 
- $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
- 	CharClassify.o Decoration.o Document.o CallTip.o \
+@@ -88,9 +89,11 @@
  	ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
  	KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o ViewStyle.o \
  	RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
@@ -86,10 +81,10 @@
 -	$(AR) rc $@ $^
 -	$(RANLIB) $@
 +	$(MARSHALLER)
-+	$(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
++	$(AR) $(CONFIGFLAGS:cflags=libs) -o $@ $^
 +
 +$(LEXRLIB): $(LEXOBJS)
-+	$(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
++	$(AR) $(CONFIGFLAGS:cflags=libs) -o $@ $^
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak