Date: Sun, 25 Jun 2006 07:19:51 +0200 From: Mark <15874d@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/99442: [patch] Update ports editors/scite and x11-toolkits/scintilla Message-ID: <e0a510440606242219l4e72135aw3f72be228992362@mail.gmail.com> Resent-Message-ID: <200606250520.k5P5KJR8027995@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99442
>Category: ports
>Synopsis: [patch] Update ports editors/scite and x11-toolkits/scintilla
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 25 05:20:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Mark Schellhase
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD 6.1-STABLE FreeBSD 6.1-STABLE #5: Tue May 16 11:09:33
CEST 2006 mark@Ekkaia:/usr/obj/usr/src/sys/EKKAIA i386
>Description:
The attached patches update the port editors/scite and its dependency
x11-toolkits/scintilla from version 1.62 to the current version 1.70
>How-To-Repeat:
>Fix:
--- scite-1.70.diff begins here ---
diff -ruN /usr/ports/editors/scite/Makefile ./scite-new/Makefile
--- /usr/ports/editors/scite/Makefile Tue Mar 7 16:41:37 2006
+++ ./scite-new/Makefile Sat Jun 24 08:53:07 2006
@@ -1,4 +1,4 @@
-# New ports collection makefile for: skite
+# New ports collection makefile for: scite
# Date created: 27 November 2000
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
@@ -6,8 +6,7 @@
#
PORTNAME= scite
-PORTVERSION= 1.62
-PORTREVISION= 2
+PORTVERSION= 1.70
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
diff -ruN /usr/ports/editors/scite/distinfo ./scite-new/distinfo
--- /usr/ports/editors/scite/distinfo Fri Jan 20 18:45:17 2006
+++ ./scite-new/distinfo Sat Jun 24 08:55:11 2006
@@ -1,3 +1,3 @@
-MD5 (scite162.tgz) = 4d34c8b669f0a8e0ae862a8e56fd8d01
-SHA256 (scite162.tgz) =
c2469ad27dbcbdedcd50752310837a938b84c5895d2b6191d26fdc47fcbc7720
-SIZE (scite162.tgz) = 1140114
+MD5 (scite170.tgz) = bf7509820b23438e272d7526e1058bff
+SHA256 (scite170.tgz) =
7c786ddc00799e6f4f30a2b475a776fc49563087853f585f986f098e07797bf5
+SIZE (scite170.tgz) = 1298313
diff -ruN /usr/ports/editors/scite/files/patch-aa ./scite-new/files/patch-aa
--- /usr/ports/editors/scite/files/patch-aa Thu Feb 3 21:07:07 2005
+++ ./scite-new/files/patch-aa Sat Jun 24 09:11:31 2006
@@ -1,5 +1,5 @@
---- makefile.orig Fri Aug 20 09:21:00 2004
-+++ makefile Thu Feb 3 19:14:13 2005
+--- makefile.bak Mon Feb 13 07:27:08 2006
++++ makefile Sat Jun 24 09:06:54 2006
@@ -5,7 +5,7 @@
# GNU make does not like \r\n line endings so should be saved to CVS
in binary form.
@@ -34,7 +34,7 @@
#CXXFLAGS= -g -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
-Wwrite-strings
-INCLUDEDIRS=-I ../../scintilla/include -I ../src
+INCLUDEDIRS=-I $(X11BASE)/include/scintilla -I ../src
- CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS)
+ CXXBASEFLAGS=-W -Wall -pedantic -Os -DGTK -DSCI_LEXER
-DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\"
$(INCLUDEDIRS)
ifdef DEBUG
-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS)
@@ -45,15 +45,16 @@
endif
ifndef NO_LUA
-@@ -102,8 +102,9 @@
+@@ -102,9 +102,9 @@
- $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \
+ $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o
Exporters.o \
MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
- $(COMPLIB) $(LUA_OBJS)
- $(CC) `$(CONFIGTHREADS)` -DGTK $^ -o $@ `$(CONFIGLIB)`
+-
+ $(LUA_OBJS)
+ $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers \
+ `$(CONFIGTHREADS)` -DGTK $^ -o $@
-
# Automatically generate header dependencies with "make deps"
include deps.mak
+
diff -ruN /usr/ports/editors/scite/pkg-plist ./scite-new/pkg-plist
--- /usr/ports/editors/scite/pkg-plist Thu Feb 3 21:07:07 2005
+++ ./scite-new/pkg-plist Sat Jun 24 10:33:53 2006
@@ -1,69 +1,79 @@
bin/SciTE
share/gnome/applications/SciTE.desktop
-share/gnome/pixmaps/Sci48M.png
-%%DATADIR%%/Embedded.properties
-%%DATADIR%%/PrintHi.png
-%%DATADIR%%/SciBreak2.jpg
-%%DATADIR%%/SciTE.html
-%%DATADIR%%/SciTE.properties
-%%DATADIR%%/SciTEDirector.html
-%%DATADIR%%/SciTEDoc.html
-%%DATADIR%%/SciTEDownload.html
-%%DATADIR%%/SciTEExtension.html
-%%DATADIR%%/SciTEExternalLexer.html
-%%DATADIR%%/SciTEExtras.html
-%%DATADIR%%/SciTEFAQ.html
-%%DATADIR%%/SciTEGlobal.properties
-%%DATADIR%%/SciTEIco.png
-%%DATADIR%%/SciTEImage.html
-%%DATADIR%%/SciTELexer.html
-%%DATADIR%%/SciTELua.html
-%%DATADIR%%/SciTERegEx.html
-%%DATADIR%%/SciTETranslation.html
-%%DATADIR%%/SciTEWord.jpg
-%%DATADIR%%/abbrev.properties
-%%DATADIR%%/ada.properties
-%%DATADIR%%/asn1.properties
-%%DATADIR%%/asm.properties
-%%DATADIR%%/au3.properties
-%%DATADIR%%/ave.properties
-%%DATADIR%%/baan.properties
-%%DATADIR%%/bullant.properties
-%%DATADIR%%/conf.properties
-%%DATADIR%%/cpp.properties
-%%DATADIR%%/css.properties
-%%DATADIR%%/demo.png
-%%DATADIR%%/eiffel.properties
-%%DATADIR%%/erlang.properties
-%%DATADIR%%/escript.properties
-%%DATADIR%%/forth.properties
-%%DATADIR%%/fortran.properties
-%%DATADIR%%/html.properties
-%%DATADIR%%/kix.properties
-%%DATADIR%%/latex.properties
-%%DATADIR%%/lisp.properties
-%%DATADIR%%/lot.properties
-%%DATADIR%%/lout.properties
-%%DATADIR%%/lua.properties
-%%DATADIR%%/matlab.properties
-%%DATADIR%%/metapost.properties
-%%DATADIR%%/mmixal.properties
-%%DATADIR%%/nncrontab.properties
-%%DATADIR%%/nsis.properties
-%%DATADIR%%/others.properties
-%%DATADIR%%/pascal.properties
-%%DATADIR%%/perl.properties
-%%DATADIR%%/pov.properties
-%%DATADIR%%/ps.properties
-%%DATADIR%%/python.properties
-%%DATADIR%%/ruby.properties
-%%DATADIR%%/scriptol.properties
-%%DATADIR%%/specman.properties
-%%DATADIR%%/sql.properties
-%%DATADIR%%/tcl.properties
-%%DATADIR%%/tex.properties
-%%DATADIR%%/vb.properties
-%%DATADIR%%/verilog.properties
-%%DATADIR%%/vhdl.properties
-%%DATADIR%%/yaml.properties
-@dirrm %%DATADIR%%
+share/scite/Embedded.properties
+share/scite/PrintHi.png
+share/scite/SciBreak2.jpg
+share/scite/SciTE.html
+share/scite/SciTE.properties
+share/scite/SciTEDirector.html
+share/scite/SciTEDoc.html
+share/scite/SciTEDownload.html
+share/scite/SciTEExtension.html
+share/scite/SciTEExternalLexer.html
+share/scite/SciTEExtras.html
+share/scite/SciTEFAQ.html
+share/scite/SciTEGlobal.properties
+share/scite/SciTEIco.png
+share/scite/SciTEImage.html
+share/scite/SciTELexer.html
+share/scite/SciTELua.html
+share/scite/SciTERegEx.html
+share/scite/SciTEWord.jpg
+share/scite/abbrev.properties
+share/scite/ada.properties
+share/scite/asm.properties
+share/scite/asn1.properties
+share/scite/au3.properties
+share/scite/ave.properties
+share/scite/baan.properties
+share/scite/blitzbasic.properties
+share/scite/bullant.properties
+share/scite/caml.properties
+share/scite/conf.properties
+share/scite/cpp.properties
+share/scite/csound.properties
+share/scite/css.properties
+share/scite/demo.png
+share/scite/eiffel.properties
+share/scite/erlang.properties
+share/scite/escript.properties
+share/scite/flagship.properties
+share/scite/forth.properties
+share/scite/fortran.properties
+share/scite/freebasic.properties
+share/scite/html.properties
+share/scite/inno.properties
+share/scite/kix.properties
+share/scite/latex.properties
+share/scite/lisp.properties
+share/scite/lot.properties
+share/scite/lout.properties
+share/scite/lua.properties
+share/scite/matlab.properties
+share/scite/metapost.properties
+share/scite/mmixal.properties
+share/scite/nncrontab.properties
+share/scite/nsis.properties
+share/scite/opal.properties
+share/scite/others.properties
+share/scite/pascal.properties
+share/scite/perl.properties
+share/scite/pov.properties
+share/scite/ps.properties
+share/scite/purebasic.properties
+share/scite/python.properties
+share/scite/rebol.properties
+share/scite/ruby.properties
+share/scite/scriptol.properties
+share/scite/smalltalk.properties
+share/scite/specman.properties
+share/scite/spice.properties
+share/scite/sql.properties
+share/scite/tcl.properties
+share/scite/tex.properties
+share/scite/vb.properties
+share/scite/verilog.properties
+share/scite/vhdl.properties
+share/scite/yaml.properties
+@dirrm share/scite
+
--- scite-1.70.diff ends here ---
--- scintilla-1.70.diff begins here ---
diff -ruN /usr/ports/x11-toolkits/scintilla/Makefile ./scintilla-new/Makefile
--- /usr/ports/x11-toolkits/scintilla/Makefile Sat Jun 24 10:36:47 2006
+++ ./scintilla-new/Makefile Sat Jun 24 08:53:30 2006
@@ -6,8 +6,7 @@
#
PORTNAME= scintilla
-PORTVERSION= 1.62
-PORTREVISION= 2
+PORTVERSION= 1.70
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://www.scintilla.org/
diff -ruN /usr/ports/x11-toolkits/scintilla/distinfo ./scintilla-new/distinfo
--- /usr/ports/x11-toolkits/scintilla/distinfo Sat Jun 24 10:36:47 2006
+++ ./scintilla-new/distinfo Sat Jun 24 08:55:00 2006
@@ -1,3 +1,3 @@
-MD5 (scite162.tgz) = 4d34c8b669f0a8e0ae862a8e56fd8d01
-SHA256 (scite162.tgz) =
c2469ad27dbcbdedcd50752310837a938b84c5895d2b6191d26fdc47fcbc7720
-SIZE (scite162.tgz) = 1140114
+MD5 (scite170.tgz) = bf7509820b23438e272d7526e1058bff
+SHA256 (scite170.tgz) =
7c786ddc00799e6f4f30a2b475a776fc49563087853f585f986f098e07797bf5
+SIZE (scite170.tgz) = 1298313
--- scintilla-1.70.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e0a510440606242219l4e72135aw3f72be228992362>