aboutsummaryrefslogtreecommitdiff
path: root/editors/scite
diff options
context:
space:
mode:
authorDennis Herrmann <dhn@FreeBSD.org>2011-07-04 18:25:07 +0000
committerDennis Herrmann <dhn@FreeBSD.org>2011-07-04 18:25:07 +0000
commitd8defea680e381c758518f2d34faeeed94a96dee (patch)
tree78c4d76d5feff7a883755cd0f7f18f8642a61183 /editors/scite
parent770bd0971825a2ea30b106a143b25bdf0febcb3e (diff)
downloadports-d8defea680e381c758518f2d34faeeed94a96dee.tar.gz
ports-d8defea680e381c758518f2d34faeeed94a96dee.zip
Notes
Diffstat (limited to 'editors/scite')
-rw-r--r--editors/scite/Makefile2
-rw-r--r--editors/scite/distinfo4
-rw-r--r--editors/scite/files/patch-aa25
-rw-r--r--editors/scite/pkg-plist1
4 files changed, 17 insertions, 15 deletions
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 7cd9bdec4c55..d6be91364af8 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= scite
-PORTVERSION= 2.25
+PORTVERSION= 2.27
CATEGORIES= editors gnome
MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 22d24ccaf674..679cea05e63c 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scite225.tgz) = e9f1c7d5909fca359cb2993eb82a07b3323d53bcd0d4ba1e8ff181a8d471061f
-SIZE (scite225.tgz) = 1843570
+SHA256 (scite227.tgz) = 9bf6e3515022cc12a3b24b158f54ae1a4730f104b65a6fcdb997f4f7a84b2c0c
+SIZE (scite227.tgz) = 1883989
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-aa
index 9d2dd891c20f..e4f3aab38b5f 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-aa
@@ -1,6 +1,6 @@
---- makefile.orig 2010-07-20 19:03:41.000000000 -0400
-+++ makefile 2010-07-31 09:20:16.000000000 -0400
-@@ -5,20 +5,20 @@
+--- makefile.orig 2011-06-13 20:55:05.000000000 -0400
++++ makefile 2011-07-03 21:16:59.000000000 -0400
+@@ -5,13 +5,13 @@
# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
.SUFFIXES: .cxx .o .h .a .c
@@ -20,16 +20,17 @@
+#endif
AR = ar
- # For the Gnome desktop stuff to work, prefix must point to where Gnome thinks it is.
- CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
- CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
+ ifdef GTK3
+@@ -24,7 +24,7 @@
+ CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
+ CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
CONFIGTHREADS:=
--gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
+-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
+gnomeprefix:=$(PREFIX)
ifndef prefix
ifdef gnomeprefix
prefix=$(gnomeprefix)
-@@ -61,12 +61,12 @@
+@@ -70,12 +70,12 @@
INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
$(LUA_CORE_OBJS): ../lua/src/*.c
@@ -45,10 +46,10 @@
+CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA
endif
- ifeq ($(shell uname), Darwin)
-@@ -87,8 +87,9 @@
-
- $(PROG): SciTEGTK.o GUIGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o \
+ CXXFLAGS:=$(CXXFLAGS) -Wno-long-long
+@@ -99,8 +99,9 @@
+ $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
+ FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index b4a6d268ddb9..dd983a2cd6a1 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -49,6 +49,7 @@ share/pixmaps/Sci48M.png
%%DATADIR%%/fortran.properties
%%DATADIR%%/freebasic.properties
%%DATADIR%%/gap.properties
+%%DATADIR%%/haskell.properties
%%DATADIR%%/html.properties
%%DATADIR%%/inno.properties
%%DATADIR%%/kix.properties