Attachment 82644 Details for Bug 118223 – scite-1.75.patch

[patch] scite-1.75.patch

scite-1.75.patch (text/plain), 3.93 KB, created by Naram Qashat on 2007-11-23 17:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2007-11-23 17:10:01 UTC

Size: 3.93 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/editors/scite/Makefile /kirby/shared/ports/scite/Makefile
>--- /usr/ports/editors/scite/Makefile	Wed Aug 22 06:21:28 2007
>+++ /kirby/shared/ports/scite/Makefile	Fri Nov 23 11:03:25 2007
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	scite
>-PORTVERSION=	1.74
>+PORTVERSION=	1.75
> CATEGORIES=	editors gnome
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		http://www.scintilla.org/
>diff -ruN --exclude=CVS /usr/ports/editors/scite/distinfo /kirby/shared/ports/scite/distinfo
>--- /usr/ports/editors/scite/distinfo	Wed Aug 22 06:21:28 2007
>+++ /kirby/shared/ports/scite/distinfo	Fri Nov 23 11:03:32 2007
>@@ -1,3 +1,3 @@
>-MD5 (scite174.tgz) = 09ad25f1fa6dab3feec41dba2480047f
>-SHA256 (scite174.tgz) = 10640a1c4bde4b1f5726085c95f7a139a044853911ebeaffa58f42aa26359e01
>-SIZE (scite174.tgz) = 1460459
>+MD5 (scite175.tgz) = 18a4525c4962f1cdbd298a379cc865b7
>+SHA256 (scite175.tgz) = 87498d73a18b75024771b74319b6e1a64be90e2a4d689b21f26997c0dba0cfc6
>+SIZE (scite175.tgz) = 1489736
>diff -ruN --exclude=CVS /usr/ports/editors/scite/files/patch-aa /kirby/shared/ports/scite/files/patch-aa
>--- /usr/ports/editors/scite/files/patch-aa	Wed Aug 22 06:21:28 2007
>+++ /kirby/shared/ports/scite/files/patch-aa	Fri Nov 23 11:29:36 2007
>@@ -1,5 +1,5 @@
>---- makefile.orig	2007-06-14 19:37:56.000000000 -0500
>-+++ makefile	2007-08-21 11:16:18.000000000 -0500
>+--- makefile.old	Fri Nov 23 11:14:23 2007
>++++ makefile	Fri Nov 23 11:16:22 2007
> @@ -5,7 +5,7 @@
>  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
>  
>@@ -9,23 +9,15 @@
>  AR = ar
>  
>  # If explicit setting of GTK1 or GTK2 then use that else look for
>-@@ -26,12 +26,12 @@
>+@@ -26,7 +26,7 @@
>  CONFIGFLAGS=$(shell pkg-config --cflags gtk+-2.0)
>  CONFIGLIB=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
>  CONFIGTHREADS=
> -gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
> +gnomeprefix:=$(PREFIX)
>  else
>--CONFIGFLAGS=$(shell gtk-config --cflags)
>--CONFIGLIB=$(shell gtk-config --libs)
>-+CONFIGFLAGS=$(shell pkg-config --cflags gtk+)
>-+CONFIGLIB=$(shell pkg-config --libs gtk+)
>- CONFIGTHREADS=$(shell glib-config --libs gthread)
>--gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null)
>-+gnomeprefix:=$(PREFIX)
>- endif
>- ifndef prefix
>- ifdef gnomeprefix
>+ CONFIGFLAGS=$(shell gtk-config --cflags)
>+ CONFIGLIB=$(shell gtk-config --libs)
> @@ -76,12 +76,12 @@
>  
>  INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
>@@ -45,13 +37,13 @@
>  ifeq ($(shell uname), Darwin)
> @@ -102,8 +102,9 @@
>  
>- $(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)
>+ $(PROG): SciTEGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \
>+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o \
>+-	JobQueue.o GTKMutex.o $(COMPLIB) $(LUA_OBJS)
>+-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB)
>++	JobQueue.o GTKMutex.o $(LUA_OBJS)
> +	$(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers \
>-+	$(CONFIGTHREADS) -DGTK $^ -o $@
>++	-rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@
>  
>  # Automatically generate header dependencies with "make deps"
>  include deps.mak
>diff -ruN --exclude=CVS /usr/ports/editors/scite/pkg-plist /kirby/shared/ports/scite/pkg-plist
>--- /usr/ports/editors/scite/pkg-plist	Wed Aug 22 06:21:28 2007
>+++ /kirby/shared/ports/scite/pkg-plist	Fri Nov 23 11:24:38 2007
>@@ -21,6 +21,7 @@
> %%DATADIR%%/SciTELua.html
> %%DATADIR%%/SciTERegEx.html
> %%DATADIR%%/SciTEWord.jpg
>+%%DATADIR%%/abaqus.properties
> %%DATADIR%%/abbrev.properties
> %%DATADIR%%/ada.properties
> %%DATADIR%%/asm.properties
>@@ -67,6 +68,7 @@
> %%DATADIR%%/ps.properties
> %%DATADIR%%/purebasic.properties
> %%DATADIR%%/python.properties
>+%%DATADIR%%/r.properties
> %%DATADIR%%/rebol.properties
> %%DATADIR%%/ruby.properties
> %%DATADIR%%/scriptol.properties

Actions: View | Diff

Attachments on bug 118223: 82644