diff options
| author | marcus <marcus@FreeBSD.org> | 2003-10-08 17:34:08 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-10-08 17:34:08 +0000 |
| commit | fe903c79b7c5b871c459276d4b46f72ba83e8856 (patch) | |
| tree | 151472f1965d443cde847d21d14d688f49732e30 /x11-toolkits | |
| parent | cf68aa2e859db712cd4a5f1f376e0c995d4a6e00 (diff) | |
| download | FreeBSD-ports-fe903c79b7c5b871c459276d4b46f72ba83e8856.zip FreeBSD-ports-fe903c79b7c5b871c459276d4b46f72ba83e8856.tar.gz | |
Fix pkg-config handling introduced in the last commit.
PR: 57706
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index 24f549a..4cff404 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -1,5 +1,5 @@ ---- makefile.orig Sun Sep 21 02:19:30 2003 -+++ makefile Mon Oct 6 18:02:43 2003 +--- makefile.orig Sun Sep 21 11:19:30 2003 ++++ makefile Tue Oct 7 10:52:28 2003 @@ -8,8 +8,8 @@ # To force GTK+ 1 build, define GTK1 on the make command line. @@ -21,7 +21,7 @@ vpath %.h ../src ../include vpath %.cxx ../src -@@ -33,29 +34,33 @@ +@@ -33,29 +34,29 @@ endif ifdef DEBUG @@ -35,20 +35,19 @@ # 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=pkg-config --cflags gtk+-2.0 -+MORELIBS=pkg-config --libs gthread-2.0 +-CONFIGFLAGS=pkg-config --cflags gtk+-2.0 ++CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0 else ifdef GTK1 -CONFIGFLAGS=gtk-config --cflags -+CONFIGFLAGS=pkg-config --cflags gtk+ -+MORELIBS=pkg-config --libs gthread ++CONFIGFLAGS=pkg-config --cflags gtk+ gthread else ifneq (,$(findstring /,$(shell whereis -b pkg-config))) - CONFIGFLAGS=pkg-config --cflags gtk+-2.0 -+MORELIBS=pkg-config --libs gthread-2.0 +-CONFIGFLAGS=pkg-config --cflags gtk+-2.0 ++CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0 else - CONFIGFLAGS=gtk-config --cflags -+MORELIBS=pkg-config --libs gthread +-CONFIGFLAGS=gtk-config --cflags ++CONFIGFLAGS=gtk-config --cflags gthread endif endif endif @@ -59,7 +58,7 @@ #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\*.o \) -@@ -69,7 +74,7 @@ +@@ -69,7 +70,7 @@ # The LEXOBJS have to be treated specially as the functions in them are not called from external code @@ -68,16 +67,16 @@ clean: rm -f *.o $(COMPLIB) -@@ -81,8 +86,10 @@ +@@ -81,8 +82,10 @@ ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \ KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o - $(AR) rc $@ $^ - $(RANLIB) $@ -+ $(AR) `$(CONFIGFLAGS:cflags=libs)` `${MORELIBS}` -o $@ $^ ++ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ + + $(LEXRLIB): $(LEXOBJS) -+ $(AR) `$(CONFIGFLAGS:cflags=libs)` `${MORELIBS}` -o $@ $^ ++ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^ # Automatically generate header dependencies with "make deps" include deps.mak |
