Date: Wed, 1 Aug 2007 17:53:22 -0400 (EDT) From: Naram Qashat <cyberbotx@cyberbotx.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gnome@FreeBSD.org Subject: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74, take maintainership Message-ID: <20070801215322.D24E7C9FC@kirby.cyberbotx.com> Resent-Message-ID: <200708012200.l71M02BY070596@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115127
>Category: ports
>Synopsis: [PATCH] x11-toolkits/scintilla: update to 1.74, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 01 22:00:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Naram Qashat
>Release: FreeBSD 6.2-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 6.2-RELEASE-p5 FreeBSD 6.2-RELEASE-p5 #9: Fri Jun 15 22:26:29 EDT 2007
>Description:
- Update to 1.74
- Take maintainership
- Force use of GTK2 because SciTE depends on Scintilla and SciTE refuses to compile with GTK1
Port maintainer (gnome@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
P.S. If I'm not allowed to take maintainership of this, that's fine, but I would
like to take maintainership of both this and editors/scite (will be submitting
a seperate PR for SciTE).
>How-To-Repeat:
>Fix:
--- scintilla-1.74.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/Makefile /kirby/shared/scintilla/Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile Sun May 20 17:04:12 2007
+++ /kirby/shared/scintilla/Makefile Wed Aug 1 15:15:03 2007
@@ -6,8 +6,7 @@
# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 21:58:56 marcus Exp $
PORTNAME= scintilla
-PORTVERSION= 1.73
-PORTREVISION= 1
+PORTVERSION= 1.74
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
@@ -15,7 +14,7 @@
DISTNAME= scite${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
-MAINTAINER= gnome@FreeBSD.org
+MAINTAINER= cyberbotx@cyberbotx.com
COMMENT= A full-featured free source code editing component for GTK+
WRKSRC= ${WRKDIR}/${PORTNAME}/gtk
@@ -25,14 +24,7 @@
USE_ICONV= yes
MAKEFILE= makefile
USE_LDCONFIG= yes
-
-.if defined(WITH_GTK2)
USE_GNOME= gtk20
-PKGNAMESUFFIX:= -gtk2
-.else
-USE_GNOME= gtk12
-MAKE_ARGS+= GTK1=yes
-.endif
.include <bsd.port.pre.mk>
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/distinfo /kirby/shared/scintilla/distinfo
--- /usr/ports/x11-toolkits/scintilla/distinfo Sun Apr 29 10:23:42 2007
+++ /kirby/shared/scintilla/distinfo Wed Aug 1 09:09:43 2007
@@ -1,3 +1,3 @@
-MD5 (scite173.tgz) = 0e8e4139b5f5db445b3da9ff070d9d3a
-SHA256 (scite173.tgz) = 1dde09224162f3dadd440ba08beb1f425c997e73559e2107f4fc4bfd52a779c4
-SIZE (scite173.tgz) = 1343699
+MD5 (scite174.tgz) = 09ad25f1fa6dab3feec41dba2480047f
+SHA256 (scite174.tgz) = 10640a1c4bde4b1f5726085c95f7a139a044853911ebeaffa58f42aa26359e01
+SIZE (scite174.tgz) = 1460459
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/scintilla/files/patch-aa /kirby/shared/scintilla/files/patch-aa
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa Sun Oct 16 16:01:22 2005
+++ /kirby/shared/scintilla/files/patch-aa Wed Aug 1 09:18:12 2007
@@ -1,5 +1,5 @@
---- makefile.orig Fri Oct 15 19:41:26 2004
-+++ makefile Sun Oct 16 02:51:33 2005
+--- makefile.orig Mon Jun 11 23:57:30 2007
++++ makefile Wed Aug 1 09:17:48 2007
@@ -8,16 +8,17 @@
# To force GTK+ 1 build, define GTK1 on the make command line.
@@ -29,42 +29,42 @@
+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)
else
-CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)
-+CXXFLAGS+=-DNDEBUG $(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=pkg-config --cflags gtk+-2.0
+-CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
MARSHALLER=scintilla-marshal.o
else
ifdef GTK1
--CONFIGFLAGS=gtk-config --cflags
+-CONFIGFLAGS=$(shell gtk-config --cflags)
+CONFIGFLAGS=pkg-config --cflags gtk+ gthread
else
ifneq (,$(findstring /,$(shell whereis pkg-config)))
--CONFIGFLAGS=pkg-config --cflags gtk+-2.0
+-CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
+CONFIGFLAGS=pkg-config --cflags gtk+-2.0 gthread-2.0
MARSHALLER=scintilla-marshal.o
else
--CONFIGFLAGS=gtk-config --cflags
-+CONFIGFLAGS=gtk-config --cflags gtk+ gthread
+-CONFIGFLAGS=$(shell gtk-config --cflags)
++CONFIGFLAGS=pkg-config --cflags gtk+ gthread
endif
endif
endif
.cxx.o:
-- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
+- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<
+ $(CC) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<
.c.o:
-- $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
+- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<
+ $(CCOMP) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<
#++Autogenerated -- run src/LexGen.py to regenerate
#**LEXOBJS=\\\n\(\*.o \)
-@@ -72,7 +73,7 @@
- LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o
+@@ -75,22 +76,24 @@
+ LexVHDL.o LexYAML.o
#--Autogenerated -- end of automatically generated section
-all: $(COMPLIB)
@@ -72,15 +72,20 @@
clean:
rm -f *.o $(COMPLIB)
-@@ -83,10 +84,11 @@
- $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
+
+ deps:
+- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
++ $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak
+
+ $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \
+ CharClassify.o Decoration.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 \
+ 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) $@
-+ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o $(MARSHALLER)
++ $(MARSHALLER)
+ $(AR) `$(CONFIGFLAGS:cflags=libs)` -o $@ $^
+
+$(LEXRLIB): $(LEXOBJS)
--- scintilla-1.74.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?20070801215322.D24E7C9FC>