ports/136286: [MAINTAINER] x11-toolkits/scintilla: update to 1.79
Naram Qashat
cyberbotx at cyberbotx.com
Fri Jul 3 15:20:11 UTC 2009
>Number: 136286
>Category: ports
>Synopsis: [MAINTAINER] x11-toolkits/scintilla: update to 1.79
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 03 15:20:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Naram Qashat
>Release: FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 7.2-STABLE FreeBSD 7.2-STABLE #0: Wed Jun 3 04:24:13 EDT
>Description:
- Update to 1.79
Added file(s):
- files/patch-makefile
Removed file(s):
- files/patch-aa
- files/patch-gcc41
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- scintilla-1.79.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/Makefile /kirby/shared/ports/scintilla/Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile 2009-05-09 17:56:25.000000000 -0400
+++ /kirby/shared/ports/scintilla/Makefile 2009-07-03 11:08:33.000000000 -0400
@@ -6,7 +6,7 @@
# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
PORTNAME= scintilla
-PORTVERSION= 1.78
+PORTVERSION= 1.79
CATEGORIES= x11-toolkits
MASTER_SITES= SF \
http://www.scintilla.org/
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/distinfo /kirby/shared/ports/scintilla/distinfo
--- /usr/ports/x11-toolkits/scintilla/distinfo 2009-05-09 17:56:25.000000000 -0400
+++ /kirby/shared/ports/scintilla/distinfo 2009-07-03 11:08:40.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (scite178.tgz) = 7c62a8f75ef69a7cb143e22bf29456fa
-SHA256 (scite178.tgz) = e7a99b2111e7156e9568737e31950879f250f8facba94012a6ac5351107022e9
-SIZE (scite178.tgz) = 1568994
+MD5 (scite179.tgz) = 02a0d68f0c33c01c9a2c9d69c295acea
+SHA256 (scite179.tgz) = ebd7105b892b68ec4f9190ffcd4a98226e84a73d2e9cbd29653d52692de3cbf9
+SIZE (scite179.tgz) = 1719588
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/files/patch-aa /kirby/shared/ports/scintilla/files/patch-aa
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa 2007-08-21 23:25:29.000000000 -0400
+++ /kirby/shared/ports/scintilla/files/patch-aa 1969-12-31 19:00:00.000000000 -0500
@@ -1,90 +0,0 @@
---- 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++
--CCOMP = gcc
--AR = ar
-+#CC = g++
-+#CCOMP = gcc
-+AR = $(CXX) -shared
- RANLIB = touch
-
- ifeq ($(shell uname),Darwin)
- RANLIB = ranlib
- endif
-
--COMPLIB=../bin/scintilla.a
-+COMPLIB=../bin/libscintilla.so.1
-+LEXRLIB=../bin/libscintilla_lexers.so.1
-
- vpath %.h ../src ../include
- vpath %.cxx ../src
-@@ -32,33 +33,33 @@
- endif
-
- ifdef DEBUG
--CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
- else
--CXXFLAGS=-DNDEBUG -Os $(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=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
- MARSHALLER=scintilla-marshal.o
- else
- ifdef GTK1
--CONFIGFLAGS=$(shell gtk-config --cflags)
-+CONFIGFLAGS=$(shell pkg-config --cflags gtk+ gthread)
- else
- ifneq (,$(findstring /,$(shell whereis pkg-config)))
--CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
-+CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
- MARSHALLER=scintilla-marshal.o
- else
--CONFIGFLAGS=$(shell gtk-config --cflags)
-+CONFIGFLAGS=$(shell pkg-config --cflags gtk+ gthread)
- endif
- endif
- endif
-
- .cxx.o:
-- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
-+ $(CC) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
- .c.o:
-- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
-+ $(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
-
- #++Autogenerated -- run src/LexGen.py to regenerate
- #**LEXOBJS=\\\n\(\*.o \)
-@@ -75,7 +76,7 @@
- LexVHDL.o LexYAML.o
- #--Autogenerated -- end of automatically generated section
-
--all: $(COMPLIB)
-+all: $(COMPLIB) $(LEXRLIB)
-
- clean:
- rm -f *.o $(COMPLIB)
-@@ -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 \
-- $(MARSHALLER) $(LEXOBJS)
-- $(AR) rc $@ $^
-- $(RANLIB) $@
-+ $(MARSHALLER)
-+ $(AR) $(CONFIGFLAGS:cflags=libs) -o $@ $^
-+
-+$(LEXRLIB): $(LEXOBJS)
-+ $(AR) $(CONFIGFLAGS:cflags=libs) -o $@ $^
-
- # Automatically generate header dependencies with "make deps"
- include deps.mak
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/files/patch-gcc41 /kirby/shared/ports/scintilla/files/patch-gcc41
--- /usr/ports/x11-toolkits/scintilla/files/patch-gcc41 2007-01-30 19:48:04.000000000 -0500
+++ /kirby/shared/ports/scintilla/files/patch-gcc41 1969-12-31 19:00:00.000000000 -0500
@@ -1,20 +0,0 @@
---- ScintillaGTK.cxx.orig Wed Jan 3 03:17:01 2007
-+++ ScintillaGTK.cxx Wed Jan 31 01:30:49 2007
-@@ -2603,7 +2603,7 @@
- "command",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE(object_class),
-- GTK_SIGNAL_OFFSET(ScintillaClass, command),
-+ ((size_t) ((gchar*) &((ScintillaClass*) 0)->command)),
- SIG_MARSHAL,
- GTK_TYPE_NONE,
- 2, MARSHAL_ARGUMENTS);
-@@ -2612,7 +2612,7 @@
- SCINTILLA_NOTIFY,
- GTK_RUN_LAST,
- GTK_CLASS_TYPE(object_class),
-- GTK_SIGNAL_OFFSET(ScintillaClass, notify),
-+ ((size_t) ((gchar*) &((ScintillaClass*) 0)->notify)),
- SIG_MARSHAL,
- GTK_TYPE_NONE,
- 2, MARSHAL_ARGUMENTS);
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/files/patch-makefile /kirby/shared/ports/scintilla/files/patch-makefile
--- /usr/ports/x11-toolkits/scintilla/files/patch-makefile 1969-12-31 19:00:00.000000000 -0500
+++ /kirby/shared/ports/scintilla/files/patch-makefile 2007-08-21 22:57:57.000000000 -0400
@@ -0,0 +1,90 @@
+--- 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++
+-CCOMP = gcc
+-AR = ar
++#CC = g++
++#CCOMP = gcc
++AR = $(CXX) -shared
+ RANLIB = touch
+
+ ifeq ($(shell uname),Darwin)
+ RANLIB = ranlib
+ endif
+
+-COMPLIB=../bin/scintilla.a
++COMPLIB=../bin/libscintilla.so.1
++LEXRLIB=../bin/libscintilla_lexers.so.1
+
+ vpath %.h ../src ../include
+ vpath %.cxx ../src
+@@ -32,33 +33,33 @@
+ endif
+
+ ifdef DEBUG
+-CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
++CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
+ else
+-CXXFLAGS=-DNDEBUG -Os $(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=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
+ MARSHALLER=scintilla-marshal.o
+ else
+ ifdef GTK1
+-CONFIGFLAGS=$(shell gtk-config --cflags)
++CONFIGFLAGS=$(shell pkg-config --cflags gtk+ gthread)
+ else
+ ifneq (,$(findstring /,$(shell whereis pkg-config)))
+-CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
++CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
+ MARSHALLER=scintilla-marshal.o
+ else
+-CONFIGFLAGS=$(shell gtk-config --cflags)
++CONFIGFLAGS=$(shell pkg-config --cflags gtk+ gthread)
+ endif
+ endif
+ endif
+
+ .cxx.o:
+- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
++ $(CC) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
+ .c.o:
+- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
++ $(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
+
+ #++Autogenerated -- run src/LexGen.py to regenerate
+ #**LEXOBJS=\\\n\(\*.o \)
+@@ -75,7 +76,7 @@
+ LexVHDL.o LexYAML.o
+ #--Autogenerated -- end of automatically generated section
+
+-all: $(COMPLIB)
++all: $(COMPLIB) $(LEXRLIB)
+
+ clean:
+ rm -f *.o $(COMPLIB)
+@@ -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 \
+- $(MARSHALLER) $(LEXOBJS)
+- $(AR) rc $@ $^
+- $(RANLIB) $@
++ $(MARSHALLER)
++ $(AR) $(CONFIGFLAGS:cflags=libs) -o $@ $^
++
++$(LEXRLIB): $(LEXOBJS)
++ $(AR) $(CONFIGFLAGS:cflags=libs) -o $@ $^
+
+ # Automatically generate header dependencies with "make deps"
+ include deps.mak
--- scintilla-1.79.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list