diff options
| -rw-r--r-- | editors/scite/Makefile | 2 | ||||
| -rw-r--r-- | editors/scite/distinfo | 2 | ||||
| -rw-r--r-- | editors/scite/files/patch-aa | 32 | ||||
| -rw-r--r-- | editors/scite/pkg-plist | 1 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/distinfo | 2 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/files/patch-aa | 12 | ||||
| -rw-r--r-- | x11-toolkits/scintilla/pkg-plist | 1 |
8 files changed, 32 insertions, 22 deletions
diff --git a/editors/scite/Makefile b/editors/scite/Makefile index 206e29546052..3fb1f8047c06 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -6,7 +6,7 @@ # PORTNAME= scite -PORTVERSION= 1.33 +PORTVERSION= 1.34 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ diff --git a/editors/scite/distinfo b/editors/scite/distinfo index 57ef6b3924ca..93ccc6c35ac4 100644 --- a/editors/scite/distinfo +++ b/editors/scite/distinfo @@ -1 +1 @@ -MD5 (scite133.tgz) = 16b979dc58ab5d23aea51cd32a0ce428 +MD5 (scite134.tgz) = e23ddd779fef4d715d066611027beaba diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa index 819eb6ffb9a2..771f0bf574ad 100644 --- a/editors/scite/files/patch-aa +++ b/editors/scite/files/patch-aa @@ -1,6 +1,9 @@ ---- makefile 2000/11/27 12:56:18 1.1 -+++ makefile 2000/11/27 13:21:13 -@@ -10,24 +10,24 @@ + +$FreeBSD$ + +--- makefile.orig Sun Nov 12 09:51:48 2000 ++++ makefile Wed Jan 10 15:11:52 2001 +@@ -10,27 +10,27 @@ # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is. # "h@h@" is printed here when gnome-config unavailable. Seems harmless. @@ -24,13 +27,16 @@ +vpath %.h ../src $(X11BASE)/include/scintilla vpath %.cxx ../src + #Comment / Uncomment the next line out if you want GTK single instance support + SINGLEINSTANCE= -DSINGLE_INSTANCE + #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= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" -W -Wall + CXXBASEFLAGS= -DGTK -DSCI_LEXER -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(SINGLEINSTANCE) -W -Wall ifdef DEBUG -@@ -37,7 +37,7 @@ +@@ -40,7 +40,7 @@ endif .cxx.o: @@ -39,18 +45,18 @@ all: $(PROG) -@@ -52,8 +52,8 @@ - ../../scintilla/gtk/LexConf.o \ - ../../scintilla/gtk/LexPerl.o +@@ -57,8 +57,8 @@ + ../../scintilla/gtk/LexVB.o --$(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o SciTEProps.o ../../scintilla/bin/scintilla.a $(LEXEROBJS) + $(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o \ +-SciTEProps.o ../../scintilla/bin/scintilla.a $(LEXEROBJS) - $(CC) `gtk-config --libs` -DGTK $^ -o $@ -+$(PROG): SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o SciTEProps.o # ../../scintilla/bin/scintilla.a $(LEXEROBJS) -+ $(CC) `$(GTK_CONFIG) --libs` -DGTK $^ -o $@ -L${X11BASE}/lib -lscintilla -lscintilla_lexers ++SciTEProps.o # ../../scintilla/bin/scintilla.a $(LEXEROBJS) ++ $(CC) `$(GTK_CONFIG) --libs` -DGTK $^ -o $@ -L$(X11BASE)/lib -lscintilla -lscintilla_lexers # SciTE-static no longer builds. Kept here in case of later need. - SciTE-static: SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o SciTEProps.o \
-@@ -78,12 +78,12 @@ + SciTE-static: SciTEGTK.o SciTEBase.o SciTEBuffers.o SciTEIO.o Exporters.o SciTEProps.o \ +@@ -85,12 +85,12 @@ # This is OK - just means no SciTE in the Gnome Applications menu # Dead: install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties install: diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist index f87a67f6aa7e..158bc69fcbc9 100644 --- a/editors/scite/pkg-plist +++ b/editors/scite/pkg-plist @@ -10,6 +10,7 @@ share/gnome/scite/html.properties share/gnome/scite/latex.properties share/gnome/scite/lua.properties share/gnome/scite/others.properties +share/gnome/scite/pascal.properties share/gnome/scite/perl.properties share/gnome/scite/python.properties share/gnome/scite/sql.properties diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile index 6c5bce221c8d..57378aedff2d 100644 --- a/x11-toolkits/scintilla/Makefile +++ b/x11-toolkits/scintilla/Makefile @@ -6,7 +6,7 @@ # PORTNAME= scintilla -PORTVERSION= 1.33 +PORTVERSION= 1.34 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.scintilla.org/ diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo index 57ef6b3924ca..93ccc6c35ac4 100644 --- a/x11-toolkits/scintilla/distinfo +++ b/x11-toolkits/scintilla/distinfo @@ -1 +1 @@ -MD5 (scite133.tgz) = 16b979dc58ab5d23aea51cd32a0ce428 +MD5 (scite134.tgz) = e23ddd779fef4d715d066611027beaba diff --git a/x11-toolkits/scintilla/files/patch-aa b/x11-toolkits/scintilla/files/patch-aa index e5ffa1723a3a..92d2fb57453c 100644 --- a/x11-toolkits/scintilla/files/patch-aa +++ b/x11-toolkits/scintilla/files/patch-aa @@ -1,5 +1,8 @@ ---- makefile 2000/11/27 09:54:21 1.1 -+++ makefile 2000/11/27 12:51:45 + +$FreeBSD$ + +--- makefile.orig Wed Nov 8 11:50:52 2000 ++++ makefile Wed Jan 10 14:54:45 2001 @@ -5,10 +5,11 @@ # GNU make does not like \r\n line endings so should be saved to CVS in binary form. @@ -15,14 +18,15 @@ vpath %.h ../src ../include vpath %.cxx ../src -@@ -25,19 +26,22 @@ +@@ -25,20 +26,23 @@ endif .cxx.o: - $(CC) `gtk-config --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@ + $(CC) -DPIC -fPIC -fpic `$(GTK_CONFIG) --cflags` $(INCLUDEDIRS) $(CXXFLAGS) -c $< -o $@ - LEXOBJS = LexCPP.o LexHTML.o LexLua.o LexOthers.o LexPerl.o LexPython.o LexSQL.o LexVB.o LexConf.o + LEXOBJS = LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o LexPascal.o \ + LexPerl.o LexPython.o LexSQL.o LexVB.o # The LEXOBJS have to be treated specially as the functions in them are not called from external code diff --git a/x11-toolkits/scintilla/pkg-plist b/x11-toolkits/scintilla/pkg-plist index 78f97b46004f..c8b281077517 100644 --- a/x11-toolkits/scintilla/pkg-plist +++ b/x11-toolkits/scintilla/pkg-plist @@ -13,4 +13,3 @@ lib/libscintilla.so.1 lib/libscintilla_lexers.so lib/libscintilla_lexers.so.1 @dirrm include/scintilla - |