Date: Sun, 3 Jul 2011 21:21:26 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/158626: [MAINTAINER] x11-toolkits/scintilla: update to 2.27 Message-ID: <20110704012126.D9AD22843E@kirby.cyberbotx.com> Resent-Message-ID: <201107040130.p641UBCm023611@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158626
>Category: ports
>Synopsis: [MAINTAINER] x11-toolkits/scintilla: update to 2.27
>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 Jul 04 01:30:10 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Naram Qashat
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 8.2-RELEASE FreeBSD 8.2-RELEASE #3: Sun Feb 27 08:58:31 EST 2011
>Description:
- Update to 2.27
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- scintilla-2.27.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/Makefile /kirby/shared/ports/scintilla/Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile 2011-05-04 19:15:51.000000000 -0400
+++ /kirby/shared/ports/scintilla/Makefile 2011-07-03 21:04:37.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= 2.25
+PORTVERSION= 2.27
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 2011-05-04 19:15:51.000000000 -0400
+++ /kirby/shared/ports/scintilla/distinfo 2011-07-03 21:04:45.000000000 -0400
@@ -1,2 +1,2 @@
-SHA256 (scite225.tgz) = e9f1c7d5909fca359cb2993eb82a07b3323d53bcd0d4ba1e8ff181a8d471061f
-SIZE (scite225.tgz) = 1843570
+SHA256 (scite227.tgz) = 9bf6e3515022cc12a3b24b158f54ae1a4730f104b65a6fcdb997f4f7a84b2c0c
+SIZE (scite227.tgz) = 1883989
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 2011-05-04 19:15:51.000000000 -0400
+++ /kirby/shared/ports/scintilla/files/patch-aa 2011-07-03 21:09:29.000000000 -0400
@@ -1,5 +1,5 @@
---- makefile.orig 2011-03-17 18:41:24.000000000 -0400
-+++ makefile 2011-05-01 19:57:17.000000000 -0400
+--- makefile.orig 2011-05-02 05:11:17.000000000 -0400
++++ makefile 2011-07-03 21:09:17.000000000 -0400
@@ -7,14 +7,14 @@
# Also works with ming32-make on Windows.
@@ -22,8 +22,8 @@
+AR = $(CXX) -shared
RANLIB = touch
- # Environment variable windir always defined on Win32
-@@ -30,7 +30,8 @@
+ ifdef GTK3
+@@ -36,7 +36,8 @@
COMPLIB=..\bin\scintilla.a
else
DEL = rm -f
@@ -33,7 +33,7 @@
endif
vpath %.h ../src ../include ../lexlib
-@@ -47,22 +48,22 @@
+@@ -55,24 +56,24 @@
endif
ifdef DEBUG
@@ -44,7 +44,9 @@
+CXXFLAGS+=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
endif
--CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+ CFLAGS:=$(CXXFLAGS)
+
+-CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0 gthread-2.0)
MARSHALLER=scintilla-marshal.o
@@ -52,8 +54,8 @@
- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
+ $(CC) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
.c.o:
-- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
-+ $(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
+- $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
++ $(CCOMP) $(PICFLAGS) $(CONFIGFLAGS) $(CFLAGS) -w -c $<
LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx))))
@@ -62,7 +64,7 @@
clean:
$(DEL) *.o $(COMPLIB)
-@@ -75,9 +76,11 @@
+@@ -85,9 +86,11 @@
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.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.27.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?20110704012126.D9AD22843E>