Date: Mon, 5 Apr 2010 07:51:19 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/145406: [MAINTAINER] x11-toolkits/scintilla: update to 2.10 Message-ID: <201004051151.o35BpJJt041359@kirby.cyberbotx.com> Resent-Message-ID: <201004051200.o35C0EVX075783@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 145406
>Category: ports
>Synopsis: [MAINTAINER] x11-toolkits/scintilla: update to 2.10
>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: Mon Apr 05 12:00:14 UTC 2010
>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: Sun Nov 15 18:45:09 EST 2009
>Description:
- Update to 2.10
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- scintilla-2.10.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/Makefile /kirby/shared/ports/scintilla/Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile 2010-03-28 13:58:58.000000000 -0400
+++ /kirby/shared/ports/scintilla/Makefile 2010-04-05 07:29:35.000000000 -0400
@@ -6,8 +6,7 @@
# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
PORTNAME= scintilla
-PORTVERSION= 2.03
-PORTREVISION= 1
+PORTVERSION= 2.10
CATEGORIES= x11-toolkits
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= scite${PORTVERSION:S/.//g}
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/distinfo /kirby/shared/ports/scintilla/distinfo
--- /usr/ports/x11-toolkits/scintilla/distinfo 2010-02-15 13:18:03.000000000 -0500
+++ /kirby/shared/ports/scintilla/distinfo 2010-04-05 07:30:13.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (scite203.tgz) = f70f237180a556e287c17423b6c45a24
-SHA256 (scite203.tgz) = e81395cbafbc11d5fa3677e4b9da03ac066f740aefe6f7479918a868935bd762
-SIZE (scite203.tgz) = 1850025
+MD5 (scite210.tgz) = 91644ec613dafa3e2a0add01c42d716d
+SHA256 (scite210.tgz) = 69af703c5b9652571e7e9c040145cfbdc6c8d4f28cf9e14be5461aad08ab52d7
+SIZE (scite210.tgz) = 1783858
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 2009-08-27 12:17:35.000000000 -0400
+++ /kirby/shared/ports/scintilla/files/patch-aa 2010-04-05 07:38:25.000000000 -0400
@@ -1,7 +1,7 @@
---- makefile.orig 2009-08-12 21:35:23.000000000 -0400
-+++ makefile 2009-08-21 01:58:12.000000000 -0400
-@@ -8,16 +8,17 @@
- # To force GTK+ 1 build, define GTK1 on the make command line.
+--- makefile.orig 2010-03-25 19:49:46.000000000 -0400
++++ makefile 2010-04-05 07:36:46.000000000 -0400
+@@ -7,9 +7,9 @@
+ # Also works with ming32-make on Windows.
.SUFFIXES: .cxx .c .o .h .a
-CC = g++
@@ -12,8 +12,9 @@
+AR = $(CXX) -shared
RANLIB = touch
- ifeq ($(shell uname),Darwin)
- RANLIB = ranlib
+ ifndef windir
+@@ -18,7 +18,8 @@
+ endif
endif
-COMPLIB=../bin/scintilla.a
@@ -22,7 +23,7 @@
vpath %.h ../src ../include
vpath %.cxx ../src
-@@ -32,33 +33,33 @@
+@@ -33,18 +34,18 @@
endif
ifdef DEBUG
@@ -33,27 +34,9 @@
+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 $<
@@ -64,8 +47,8 @@
#++Autogenerated -- run src/LexGen.py to regenerate
#**LEXOBJS=\\\n\(\*.o \)
-@@ -76,7 +77,7 @@
- LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
+@@ -63,7 +64,7 @@
+ LexVHDL.o LexYAML.o
#--Autogenerated -- end of automatically generated section
-all: $(COMPLIB)
@@ -73,7 +56,7 @@
clean:
rm -f *.o $(COMPLIB)
-@@ -89,9 +90,11 @@
+@@ -76,9 +77,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 Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \
--- scintilla-2.10.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004051151.o35BpJJt041359>