From 1d9116b58471fd371d6f8f13fc14f0f189979333 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 10 Apr 2013 11:30:50 +0000 Subject: update to 3.2.5 changes: misc fixes and improvements --- editors/scite/Makefile | 8 ++++---- editors/scite/PLIST | 6 +++++- editors/scite/distinfo | 10 +++++----- editors/scite/patches/patch-aa | 41 +++++++++++++++++++++++++++-------------- 4 files changed, 41 insertions(+), 24 deletions(-) (limited to 'editors/scite') diff --git a/editors/scite/Makefile b/editors/scite/Makefile index 710620cd416..7ef46c676b3 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2013/02/16 11:21:00 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2013/04/10 11:30:50 drochner Exp $ # -DISTNAME= scite229 -PKGNAME= scite-2.29 -PKGREVISION= 7 +DISTNAME= scite325 +PKGNAME= scite-3.2.5 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/} EXTRACT_SUFX= .tgz @@ -27,6 +26,7 @@ post-extract: .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +BUILDLINK_API_DEPENDS.scintilla+= scintilla>=3.2.4 .include "../../devel/scintilla/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/scite/PLIST b/editors/scite/PLIST index d06befd1355..7ff2233786c 100644 --- a/editors/scite/PLIST +++ b/editors/scite/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2012/01/12 11:39:38 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2013/04/10 11:30:51 drochner Exp $ bin/SciTE share/applications/SciTE.desktop share/pixmaps/Sci48M.png share/scite/CommandValues.html share/scite/Embedded.properties +share/scite/PaneAPI.html share/scite/PrintHi.png share/scite/SciTE.html share/scite/SciTE.properties @@ -28,6 +29,7 @@ share/scite/asm.properties share/scite/asn1.properties share/scite/au3.properties share/scite/ave.properties +share/scite/avs.properties share/scite/baan.properties share/scite/blitzbasic.properties share/scite/bullant.properties @@ -39,6 +41,7 @@ share/scite/cpp.properties share/scite/csound.properties share/scite/css.properties share/scite/d.properties +share/scite/ecl.properties share/scite/eiffel.properties share/scite/erlang.properties share/scite/escript.properties @@ -64,6 +67,7 @@ share/scite/nimrod.properties share/scite/nncrontab.properties share/scite/nsis.properties share/scite/opal.properties +share/scite/oscript.properties share/scite/others.properties share/scite/pascal.properties share/scite/perl.properties diff --git a/editors/scite/distinfo b/editors/scite/distinfo index 474f3adb0f5..f9b707ddb86 100644 --- a/editors/scite/distinfo +++ b/editors/scite/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2012/05/16 19:55:02 marino Exp $ +$NetBSD: distinfo,v 1.5 2013/04/10 11:30:51 drochner Exp $ -SHA1 (scite229.tgz) = 153cc063b77d7ad95d265327f76ff6b4ed91c108 -RMD160 (scite229.tgz) = 5afa506eb5848e4bc99ef597ac0c5f1988afdbf9 -Size (scite229.tgz) = 1883704 bytes -SHA1 (patch-aa) = d778a33314efdd098d22e5dc7ddb833066584720 +SHA1 (scite325.tgz) = 20f927c51d26347a27ab05231c82ff8759140674 +RMD160 (scite325.tgz) = 9ddd6f677a1ff27ecff5edc996c38e4aa213d15f +Size (scite325.tgz) = 1974782 bytes +SHA1 (patch-aa) = af56e927d5a2902229b7d95232d81dab67d55686 diff --git a/editors/scite/patches/patch-aa b/editors/scite/patches/patch-aa index 34c30097196..d7f5a661e72 100644 --- a/editors/scite/patches/patch-aa +++ b/editors/scite/patches/patch-aa @@ -1,22 +1,35 @@ -$NetBSD: patch-aa,v 1.3 2012/05/16 19:55:03 marino Exp $ +$NetBSD: patch-aa,v 1.4 2013/04/10 11:30:51 drochner Exp $ ---- gtk/makefile.orig 2011-09-16 09:14:07.000000000 +0000 +--- gtk/makefile.orig 2013-01-17 01:17:02.000000000 +0000 +++ gtk/makefile -@@ -22,7 +22,7 @@ endif - - # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is. - CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) --CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0) -+CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0 gmodule-2.0) - CONFIGTHREADS:= - gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null) - ifndef prefix -@@ -99,7 +99,7 @@ deps: - $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak +@@ -46,10 +46,10 @@ PROG = ../bin/SciTE + + all: $(PROG) + +-vpath %.h ../src ../../scintilla/include ++vpath %.h ../src $(prefix)/include/scintilla + vpath %.cxx ../src + +-INCLUDEDIRS=-I ../../scintilla/include -I ../src ++INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src + ifdef CHECK_DEPRECATED + DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED + endif +@@ -73,7 +73,7 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJ + + vpath %.c ../lua/src ../lua/src/lib + +-INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include ++INCLUDEDIRS=-I $(prefix)/include/scintilla -I ../src -I../lua/include + + .c.o: + $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@ +@@ -102,7 +102,7 @@ deps: + $(CC) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak # make should be run in ../../scintilla/gtk to compile all the lexers. -COMPLIB=../../scintilla/bin/scintilla.a +COMPLIB=$(prefix)/lib/scintilla.a $(PROG): SciTEGTK.o GUIGTK.o Widget.o \ - FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \ + FilePath.o SciTEBase.o FileWorker.o Cookie.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \ -- cgit v1.2.3