From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 7 07:20:23 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 56D4F16A4B3 for ; Tue, 7 Oct 2003 07:20:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0518F43FF2 for ; Tue, 7 Oct 2003 07:20:11 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h97EKBFY058677 for ; Tue, 7 Oct 2003 07:20:11 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h97EKBRU058676; Tue, 7 Oct 2003 07:20:11 -0700 (PDT) (envelope-from gnats) Resent-Date: Tue, 7 Oct 2003 07:20:11 -0700 (PDT) Resent-Message-Id: <200310071420.h97EKBRU058676@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 51DC916A4C1 for ; Tue, 7 Oct 2003 07:16:24 -0700 (PDT) Received: from hfep08.dion.ne.jp (hfep08.dion.ne.jp [203.181.105.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id E368D43F85 for ; Tue, 7 Oct 2003 07:16:22 -0700 (PDT) (envelope-from tkato@prontomail.com) Received: from localhost ([61.204.120.169]) by hfep08.dion.ne.jp with SMTP id <20031007141619661.SFR@hfep08.dion.ne.jp> for ; Tue, 7 Oct 2003 23:16:19 +0900 Message-Id: <20031007231520.59255083.tkato@prontomail.com> Date: Tue, 7 Oct 2003 23:15:20 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/57706: Update port: x11-toolkits/scintilla X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Oct 2003 14:20:23 -0000 >Number: 57706 >Category: ports >Synopsis: Update port: x11-toolkits/scintilla >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Oct 07 07:20:11 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE-p10 i386 >Organization: >Environment: >Description: - Fix handling pkg-config >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-toolkits/scintilla/files/patch-aa x11-toolkits/scintilla/files/patch-aa --- /usr/ports/x11-toolkits/scintilla/files/patch-aa Tue Oct 7 10:48:51 2003 +++ x11-toolkits/scintilla/files/patch-aa Tue Oct 7 10:53:15 2003 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: