From 77dec805c2b7787dce41b748327d20c18756abd5 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Thu, 3 Feb 2005 20:07:07 +0000 Subject: Update to 0.62. --- editors/scite/Makefile | 30 +++++++++++++++++++++- editors/scite/distinfo | 4 +-- editors/scite/files/patch-SciTEGTK.cxx | 22 ---------------- editors/scite/files/patch-aa | 46 ++++++++++++++++++---------------- editors/scite/pkg-plist | 8 ++++++ 5 files changed, 63 insertions(+), 47 deletions(-) delete mode 100644 editors/scite/files/patch-SciTEGTK.cxx diff --git a/editors/scite/Makefile b/editors/scite/Makefile index 07163eba470b..ba71bfbf5fbf 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -6,7 +6,7 @@ # PORTNAME= scite -PORTVERSION= 1.59 +PORTVERSION= 1.62 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ @@ -26,6 +26,27 @@ USE_GMAKE= yes USE_GNOME= gnomehier MAKEFILE= makefile MAKE_ENV= CC="${CXX}" +EXTRA_PATCH_FILES= lua/include/lauxlib.h \ + lua/include/lua.h \ + lua/src/lobject.h \ + lua/src/lzio.h \ + lua/src/ltm.h \ + lua/src/lopcodes.c \ + lua/src/lopcodes.h \ + lua/src/lstate.c \ + lua/src/lstate.h \ + lua/src/ldo.h \ + lua/src/lmem.h \ + lua/src/lgc.h \ + lua/src/lgc.c \ + lua/src/lvm.h \ + lua/src/lstring.h \ + lua/src/ldo.c \ + lua/src/lfunc.c \ + lua/src/llex.h \ + lua/src/llex.c \ + lua/src/lparser.c \ + lua/src/lib/lauxlib.c OPTIONS= GTK2 "Turns on GTK-2.x support (Default is GTK-1)" off @@ -45,6 +66,13 @@ post-patch: @cd ${WRKSRC} && ${MV} SciTE.desktop SciTE.desktop.pre_tr \ && ${TR} -d "\r" < SciTE.desktop.pre_tr > SciTE.desktop @${ECHO_CMD} 'Categories=Application;Development;' >> ${WRKSRC}/SciTE.desktop +# deal with dos end-of-line symbols break build with gcc 2.95. +.for file in ${EXTRA_PATCH_FILES} + @${CP} ${WRKSRC}/../${file} \ + ${WRKSRC}/../${file}.orig + @/usr/bin/col < ${WRKSRC}/../${file}.orig \ + > ${WRKSRC}/../${file} +.endfor do-install: ${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin diff --git a/editors/scite/distinfo b/editors/scite/distinfo index 28cfda804e45..f11e2b7d7d3d 100644 --- a/editors/scite/distinfo +++ b/editors/scite/distinfo @@ -1,2 +1,2 @@ -MD5 (scite159.tgz) = 91e33588270ee9b3f5d629f085a4a200 -SIZE (scite159.tgz) = 922148 +MD5 (scite162.tgz) = 4d34c8b669f0a8e0ae862a8e56fd8d01 +SIZE (scite162.tgz) = 1140114 diff --git a/editors/scite/files/patch-SciTEGTK.cxx b/editors/scite/files/patch-SciTEGTK.cxx deleted file mode 100644 index 9206752a4ec0..000000000000 --- a/editors/scite/files/patch-SciTEGTK.cxx +++ /dev/null @@ -1,22 +0,0 @@ ---- SciTEGTK.cxx.orig Wed Apr 7 03:47:55 2004 -+++ SciTEGTK.cxx Wed Apr 7 03:48:14 2004 -@@ -1232,7 +1232,9 @@ - gtk_widget_show(comboDir); - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(comboDir)->entry), findInDir); - // Make a little wider than would happen automatically to show realistic paths -+#if GTK_MAJOR_VERSION >= 2 - gtk_entry_set_width_chars(GTK_ENTRY(GTK_COMBO(comboDir)->entry), 40); -+#endif - gtk_signal_connect(GTK_OBJECT(GTK_COMBO(comboDir)->entry), - "activate", GtkSignalFunc(FindInFilesSignal), this); - gtk_combo_disable_activate(GTK_COMBO(comboDir)); -@@ -1622,7 +1624,9 @@ - row, row + 1, optse, opts, 5, 5); - gtk_widget_show(comboFind); - gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(comboFind)->entry), findWhat.c_str()); -+#if GTK_MAJOR_VERSION >= 2 - gtk_entry_set_width_chars(GTK_ENTRY(GTK_COMBO(comboFind)->entry), 40); -+#endif - gtk_entry_select_region(GTK_ENTRY(GTK_COMBO(comboFind)->entry), 0, findWhat.length()); - gtk_signal_connect(GTK_OBJECT(GTK_COMBO(comboFind)->entry), - "activate", GtkSignalFunc(FRFindSignal), this); diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa index de01f45dfc23..f242d49f57f5 100644 --- a/editors/scite/files/patch-aa +++ b/editors/scite/files/patch-aa @@ -1,30 +1,31 @@ ---- makefile.orig Wed Dec 24 08:44:58 2003 -+++ makefile Sun Jan 11 19:47:08 2004 +--- makefile.orig Fri Aug 20 09:21:00 2004 ++++ makefile Thu Feb 3 19:14:13 2005 @@ -5,7 +5,7 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. - .SUFFIXES: .cxx .o .h .a + .SUFFIXES: .cxx .o .h .a .c -CC = g++ +CC ?= g++ AR = ar # If explicit setting of GTK1 or GTK2 then use that else look for -@@ -27,9 +27,9 @@ - CONFIGLIB=pkg-config --libs gtk+-2.0 gthread-2.0 +@@ -28,10 +28,10 @@ + CONFIGTHREADS= gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null) else -CONFIGFLAGS=gtk-config --cflags -CONFIGLIB=gtk-config --libs ++CONFIGFLAGS=pkg-config --cflags gtk+ ++CONFIGLIB=pkg-config --libs gtk+ + CONFIGTHREADS=glib-config --libs gthread -gnomeprefix:=$(shell gnome-config --prefix 2>/dev/null) -+CONFIGFLAGS=pkg-config --cflags gtk+ gthread -+CONFIGLIB=pkg-config --libs gtk+ gthread +gnomeprefix:=$(PREFIX) endif + ifndef prefix ifdef gnomeprefix - prefix=$(gnomeprefix) -@@ -43,17 +43,17 @@ +@@ -51,17 +51,17 @@ - PROG = ../bin/SciTE + all: $(PROG) -vpath %.h ../src ../../scintilla/include +vpath %.h ../src $(X11BASE)/include/scintilla @@ -33,25 +34,26 @@ #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 -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) + CXXBASEFLAGS=-W -Wall -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) ifdef DEBUG --CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) -+CXXFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) +-CXXTFLAGS=-DDEBUG -g $(CXXBASEFLAGS) ++CXXTFLAGS+=-DDEBUG -g $(CXXBASEFLAGS) else --CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) -+CXXFLAGS+=-DNDEBUG $(CXXBASEFLAGS) +-CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) ++CXXTFLAGS+=-DNDEBUG $(CXXBASEFLAGS) endif - ifeq ($(shell uname), Darwin) -@@ -75,8 +75,8 @@ - COMPLIB=../../scintilla/bin/scintilla.a + ifndef NO_LUA +@@ -102,8 +102,9 @@ $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \ --MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o $(COMPLIB) -- $(CC) `$(CONFIGLIB)` `glib-config --libs gthread` -DGTK $^ -o $@ -+MultiplexExtension.o DirectorExtension.o SciTEProps.o Utf8_16.o -+ $(CC) `$(CONFIGLIB)` -lscintilla -lscintilla_lexers -DGTK $^ -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 --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist index cc54f42cac17..03794672b053 100644 --- a/editors/scite/pkg-plist +++ b/editors/scite/pkg-plist @@ -10,17 +10,22 @@ share/gnome/pixmaps/Sci48M.png %%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 @@ -34,6 +39,7 @@ share/gnome/pixmaps/Sci48M.png %%DATADIR%%/forth.properties %%DATADIR%%/fortran.properties %%DATADIR%%/html.properties +%%DATADIR%%/kix.properties %%DATADIR%%/latex.properties %%DATADIR%%/lisp.properties %%DATADIR%%/lot.properties @@ -52,10 +58,12 @@ share/gnome/pixmaps/Sci48M.png %%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%% -- cgit v1.2.3