Date: Mon, 12 Jan 2004 22:00:32 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/61252: Update port: x11-toolkits/scintilla to 1.58 Message-ID: <20040112220032.5d0fd14a.tkato@prontomail.com> Resent-Message-ID: <200401121310.i0CDAE4T010157@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61252
>Category: ports
>Synopsis: Update port: x11-toolkits/scintilla to 1.58
>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: Mon Jan 12 05:10:14 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Update to version 1.58
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-toolkits/scintilla/Makefile x11-toolkits/scintilla/Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile Fri Dec 5 17:25:33 2003
+++ x11-toolkits/scintilla/Makefile Sun Jan 11 19:17:05 2004
@@ -6,7 +6,7 @@
#
PORTNAME= scintilla
-PORTVERSION= 1.57
+PORTVERSION= 1.58
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
diff -urN /usr/ports/x11-toolkits/scintilla/distinfo x11-toolkits/scintilla/distinfo
--- /usr/ports/x11-toolkits/scintilla/distinfo Fri Dec 5 17:25:33 2003
+++ x11-toolkits/scintilla/distinfo Sun Jan 11 19:17:09 2004
@@ -1 +1 @@
-MD5 (scite157.tgz) = d8d18de553555437791996daed9ff7ec
+MD5 (scite158.tgz) = 0f704b40f07aba44205621a19245847c
diff -urN /usr/ports/x11-toolkits/scintilla/files/patch-aa x11-toolkits/scintilla/files/patch-aa
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa Thu Oct 9 11:34:08 2003
+++ x11-toolkits/scintilla/files/patch-aa Sun Jan 11 19:50:51 2004
@@ -1,6 +1,6 @@
---- makefile.orig Sun Sep 21 11:19:30 2003
-+++ makefile Tue Oct 7 10:52:28 2003
-@@ -8,8 +8,8 @@
+--- makefile.orig Wed Dec 24 08:45:12 2003
++++ makefile Sun Jan 11 19:50:44 2004
+@@ -8,15 +8,16 @@
# To force GTK+ 1 build, define GTK1 on the make command line.
.SUFFIXES: .cxx .o .h .a
@@ -10,8 +10,7 @@
+AR = $(CC) -shared
RANLIB = touch
- ifeq ($(OSTYPE),darwin)
-@@ -18,7 +18,8 @@
+ ifeq ($(shell uname),Darwin)
RANLIB = ranlib
endif
@@ -21,12 +20,12 @@
vpath %.h ../src ../include
vpath %.cxx ../src
-@@ -33,29 +34,29 @@
+@@ -31,29 +32,29 @@
endif
ifdef DEBUG
-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS+=-DDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)
@@ -42,12 +41,12 @@
-CONFIGFLAGS=gtk-config --cflags
+CONFIGFLAGS=pkg-config --cflags gtk+ gthread
else
- ifneq (,$(findstring /,$(shell whereis -b pkg-config)))
+ ifneq (,$(findstring /,$(shell whereis pkg-config)))
-CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
else
-CONFIGFLAGS=gtk-config --cflags
-+CONFIGFLAGS=gtk-config --cflags gthread
++CONFIGFLAGS=gtk-config --cflags gtk+ gthread
endif
endif
endif
@@ -58,24 +57,27 @@
#++Autogenerated -- run src/LexGen.py to regenerate
#**LEXOBJS=\\\n\(\*.o \)
-@@ -69,7 +70,7 @@
+@@ -66,7 +67,7 @@
+ LexYAML.o
+ #--Autogenerated -- end of automatically generated section
- # The LEXOBJS have to be treated specially as the functions in them are not called from external code
-
--all: $(COMPLIB) $(LEXOBJS)
+-all: $(COMPLIB)
+all: $(COMPLIB) $(LEXRLIB)
clean:
rm -f *.o $(COMPLIB)
-@@ -81,8 +82,10 @@
+@@ -77,10 +78,11 @@
+ $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
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
+- RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
+- $(LEXOBJS)
- $(AR) rc $@ $^
- $(RANLIB) $@
++ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
+
-+ $(LEXRLIB): $(LEXOBJS)
++$(LEXRLIB): $(LEXOBJS)
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
# Automatically generate header dependencies with "make deps"
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040112220032.5d0fd14a.tkato>