ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74,
take maintainership
Naram Qashat
cyberbotx at cyberbotx.com
Thu Aug 9 14:20:09 UTC 2007
The following reply was made to PR ports/115127; it has been noted by GNATS.
From: "Naram Qashat" <cyberbotx at cyberbotx.com>
To: <bug-followup at freebsd.org>,
"Jeremy Messenger" <mezz7 at cox.net>
Cc:
Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74, take maintainership
Date: Thu, 9 Aug 2007 10:12:15 -0400
This is a multi-part message in MIME format.
------=_NextPart_000_008B_01C7DA6D.C2DF8F30
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
I just now realized that 1) my copy/paste from Konsole killed all the tabs,
and 2) I don't think the e-mail would've kept the tabs, so ignore that last
e-mail (except for my question about SciTE's port), I'm attaching the new
patch instead, with the tabs intact.
Naram Qashat
----- Original Message -----
From: "Jeremy Messenger" <mezz7 at cox.net>
To: <bug-followup at freebsd.org>; <cyberbotx at cyberbotx.com>
Sent: Wednesday, August 08, 2007 9:47 PM
Subject: Re: ports/115127: [PATCH] x11-toolkits/scintilla: update to 1.74,
take maintainership
> There is a problem with if you switch the default of GTK. It might break
> other ports. Althought, some of them might be safe to be remove due to out
> of date or too old, so this method is simpler. If you are willing to do
> the more tasks and we shall reward you the maintainership.
>
> Cheers,
> Mezz
>
>
> --
> mezz7 at cox.net - mezz at FreeBSD.org
> FreeBSD GNOME Team - FreeBSD Multimedia Hat (ports, not src)
> http://www.FreeBSD.org/gnome/ - gnome at FreeBSD.org
> http://wiki.freebsd.org/multimedia - multimedia at FreeBSD.org
>
>
> --
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.5.476 / Virus Database: 269.11.10/943 - Release Date: 8/8/2007
5:38 PM
>
>
------=_NextPart_000_008B_01C7DA6D.C2DF8F30
Content-Type: application/octet-stream;
name="scintilla.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="scintilla.diff"
diff -ruN --exclude=3DCVS /usr/ports/x11-toolkits/scintilla/Makefile =
/kirby/shared/scintilla/Makefile=0A=
--- /usr/ports/x11-toolkits/scintilla/Makefile Sun May 20 17:04:12 2007=0A=
+++ /kirby/shared/scintilla/Makefile Thu Aug 9 10:00:28 2007=0A=
@@ -6,8 +6,7 @@=0A=
# $MCom: ports/x11-toolkits/scintilla/Makefile,v 1.3 2006/09/17 =
21:58:56 marcus Exp $=0A=
=0A=
PORTNAME=3D scintilla=0A=
-PORTVERSION=3D 1.73=0A=
-PORTREVISION=3D 1=0A=
+PORTVERSION=3D 1.74=0A=
CATEGORIES=3D x11-toolkits=0A=
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} \=0A=
http://www.scintilla.org/=0A=
@@ -15,7 +14,7 @@=0A=
DISTNAME=3D scite${PORTVERSION:S/.//g}=0A=
EXTRACT_SUFX=3D .tgz=0A=
=0A=
-MAINTAINER=3D gnome at FreeBSD.org=0A=
+MAINTAINER=3D cyberbotx at cyberbotx.com=0A=
COMMENT=3D A full-featured free source code editing component for GTK+=0A=
=0A=
WRKSRC=3D ${WRKDIR}/${PORTNAME}/gtk=0A=
diff -ruN --exclude=3DCVS /usr/ports/x11-toolkits/scintilla/distinfo =
/kirby/shared/scintilla/distinfo=0A=
--- /usr/ports/x11-toolkits/scintilla/distinfo Sun Apr 29 10:23:42 2007=0A=
+++ /kirby/shared/scintilla/distinfo Wed Aug 1 09:09:43 2007=0A=
@@ -1,3 +1,3 @@=0A=
-MD5 (scite173.tgz) =3D 0e8e4139b5f5db445b3da9ff070d9d3a=0A=
-SHA256 (scite173.tgz) =3D =
1dde09224162f3dadd440ba08beb1f425c997e73559e2107f4fc4bfd52a779c4=0A=
-SIZE (scite173.tgz) =3D 1343699=0A=
+MD5 (scite174.tgz) =3D 09ad25f1fa6dab3feec41dba2480047f=0A=
+SHA256 (scite174.tgz) =3D =
10640a1c4bde4b1f5726085c95f7a139a044853911ebeaffa58f42aa26359e01=0A=
+SIZE (scite174.tgz) =3D 1460459=0A=
diff -ruN --exclude=3DCVS =
/usr/ports/x11-toolkits/scintilla/files/patch-aa =
/kirby/shared/scintilla/files/patch-aa=0A=
--- /usr/ports/x11-toolkits/scintilla/files/patch-aa Sun Oct 16 16:01:22 =
2005=0A=
+++ /kirby/shared/scintilla/files/patch-aa Wed Aug 1 09:18:12 2007=0A=
@@ -1,5 +1,5 @@=0A=
---- makefile.orig Fri Oct 15 19:41:26 2004=0A=
-+++ makefile Sun Oct 16 02:51:33 2005=0A=
+--- makefile.orig Mon Jun 11 23:57:30 2007=0A=
++++ makefile Wed Aug 1 09:17:48 2007=0A=
@@ -8,16 +8,17 @@=0A=
# To force GTK+ 1 build, define GTK1 on the make command line.=0A=
=0A=
@@ -29,42 +29,42 @@=0A=
+CXXFLAGS+=3D-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS)=0A=
else=0A=
-CXXFLAGS=3D-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)=0A=
-+CXXFLAGS+=3D-DNDEBUG $(CXXBASEFLAGS) $(THREADFLAGS)=0A=
++CXXFLAGS+=3D-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS)=0A=
endif=0A=
=0A=
# If explicit setting of GTK1 or GTK2 then use that else look for=0A=
# pkg-config which is an OK indication that GTK2 is available=0A=
ifdef GTK2=0A=
--CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0=0A=
+-CONFIGFLAGS=3D$(shell pkg-config --cflags gtk+-2.0)=0A=
+CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0 gthread-2.0=0A=
MARSHALLER=3Dscintilla-marshal.o=0A=
else=0A=
ifdef GTK1=0A=
--CONFIGFLAGS=3Dgtk-config --cflags=0A=
+-CONFIGFLAGS=3D$(shell gtk-config --cflags)=0A=
+CONFIGFLAGS=3Dpkg-config --cflags gtk+ gthread=0A=
else=0A=
ifneq (,$(findstring /,$(shell whereis pkg-config)))=0A=
--CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0=0A=
+-CONFIGFLAGS=3D$(shell pkg-config --cflags gtk+-2.0)=0A=
+CONFIGFLAGS=3Dpkg-config --cflags gtk+-2.0 gthread-2.0=0A=
MARSHALLER=3Dscintilla-marshal.o=0A=
else=0A=
--CONFIGFLAGS=3Dgtk-config --cflags=0A=
-+CONFIGFLAGS=3Dgtk-config --cflags gtk+ gthread=0A=
+-CONFIGFLAGS=3D$(shell gtk-config --cflags)=0A=
++CONFIGFLAGS=3Dpkg-config --cflags gtk+ gthread=0A=
endif=0A=
endif=0A=
endif=0A=
=0A=
.cxx.o:=0A=
-- $(CC) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<=0A=
+- $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $<=0A=
+ $(CC) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -c $<=0A=
.c.o:=0A=
-- $(CCOMP) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<=0A=
+- $(CCOMP) $(CONFIGFLAGS) $(CXXFLAGS) -w -c $<=0A=
+ $(CCOMP) $(PICFLAGS) `$(CONFIGFLAGS)` $(CXXFLAGS) -w -c $<=0A=
=0A=
#++Autogenerated -- run src/LexGen.py to regenerate=0A=
#**LEXOBJS=3D\\\n\(\*.o \)=0A=
-@@ -72,7 +73,7 @@=0A=
- LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o=0A=
+@@ -75,22 +76,24 @@=0A=
+ LexVHDL.o LexYAML.o=0A=
#--Autogenerated -- end of automatically generated section=0A=
=0A=
-all: $(COMPLIB)=0A=
@@ -72,15 +72,20 @@=0A=
=0A=
clean:=0A=
rm -f *.o $(COMPLIB)=0A=
-@@ -83,10 +84,11 @@=0A=
- $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o =
StyleContext.o Document.o CallTip.o \=0A=
+ =0A=
+ deps:=0A=
+- $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e =
's/\/usr.* //' | grep [a-zA-Z] >deps.mak=0A=
++ $(CC) -MM `$(CONFIGFLAGS)` $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e =
's/\/usr.* //' | grep [a-zA-Z] >deps.mak=0A=
+ =0A=
+ $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o =
StyleContext.o \=0A=
+ CharClassify.o Decoration.o Document.o CallTip.o \=0A=
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o =
PlatGTK.o \=0A=
- KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \=0A=
-- RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \=0A=
+ KeyMap.o LineMarker.o PositionCache.o ScintillaGTK.o CellBuffer.o =
ViewStyle.o \=0A=
+ RESearch.o RunStyles.o Style.o Indicator.o AutoComplete.o =
UniConversion.o XPM.o \=0A=
- $(MARSHALLER) $(LEXOBJS)=0A=
- $(AR) rc $@ $^=0A=
- $(RANLIB) $@=0A=
-+ RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o =
$(MARSHALLER)=0A=
++ $(MARSHALLER)=0A=
+ $(AR) `$(CONFIGFLAGS:cflags=3Dlibs)` -o $@ $^=0A=
+=0A=
+$(LEXRLIB): $(LEXOBJS)=0A=
------=_NextPart_000_008B_01C7DA6D.C2DF8F30--
More information about the freebsd-gnome
mailing list