Update to 3.0.0, switch to GTK+3 now that scite supports it. SciTE

doesn't appear to use gettext, so remove the gettext module.
Respect CC and CFLAGS when building.

OK ajacoutot@ on an earlier version

editors/scite/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2011/09/16 09:48:09 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2011/11/15 19:17:09 jeremy Exp $
 
 COMMENT=		flexible and small GTK+ editor
 
-VERSION=		2.22
+VERSION=		3.0.0
-DISTNAME=		scite${VERSION:S/.//}
+DISTNAME=		scite${VERSION:S/.//g}
 PKGNAME=		scite-${VERSION}
-REVISION=		1
 CATEGORIES=		editors x11
 
 HOMEPAGE=		http://www.scintilla.org/SciTE.html
@@ -18,20 +17,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	may not sell
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += c cairo gdk-3 gdk_pixbuf-2.0 glib-2.0 gobject-2.0 gthread-2.0
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB += gtk-3 pthread scintilla scintilla_lexers stdc++
-WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png pthread pthread-stubs stdc++ xcb z
-WANTLIB += gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += scintilla>=7 scintilla_lexers>=7
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scintilla/}
 EXTRACT_SUFX=		.tgz
 
-MODULES=	        devel/gettext
+LIB_DEPENDS=		x11/gtk+3 \
-
-LIB_DEPENDS=		x11/gtk+2 \
 			editors/scintilla
 
 USE_GMAKE=		Yes
@@ -39,7 +31,8 @@ NO_REGRESS=		Yes
 WRKDIST=		${WRKDIR}/scite
 WRKSRC=			${WRKDIST}/gtk
 MAKE_FILE=		makefile
-MAKE_ENV=		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV=		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+			CC="${CC}" CFLAGS="${CFLAGS}" GTK3=1
 
 post-extract:
 	perl -pi -e 's|\x0d||' ${WRKSRC}/*.cxx ${WRKDIST}/src/*.cxx

editors/scite/distinfo

@@ -1,5 +1,5 @@
-MD5 (scite222.tgz) = +MxSD+LZ//hZiQduK4tznA==
+MD5 (scite300.tgz) = Ni+eXcn1wLiWoxNXn6TZNg==
-RMD160 (scite222.tgz) = gSsb52qi6yTsXmei2mT0zt9FBnM=
+RMD160 (scite300.tgz) = iuS4OgOZsrm2MiIQVkBIF/6IYxc=
-SHA1 (scite222.tgz) = CbH8L2k8GTT5AodnG6Xw6bQlhiA=
+SHA1 (scite300.tgz) = l7Jhb32Ao6zOmE3upbi1G4+7+Vg=
-SHA256 (scite222.tgz) = lbkEMYQUxZEKHhyMDGMbdhVj24PMdc1akkTaFWtZKo4=
+SHA256 (scite300.tgz) = Wy9wVYRVpTIp3Y1qKE0ddWg5nvNOE1Kx8a9CRQ+ZzhE=
-SIZE (scite222.tgz) = 1816710
+SIZE (scite300.tgz) = 1811007

editors/scite/patches/patch-gtk_makefile

@@ -1,12 +1,26 @@
-$OpenBSD: patch-gtk_makefile,v 1.5 2010/10/03 18:09:01 jeremy Exp $
+$OpenBSD: patch-gtk_makefile,v 1.6 2011/11/15 19:17:09 jeremy Exp $
---- gtk/makefile.orig	Sun Aug 29 05:55:22 2010
+--- gtk/makefile.orig	Fri Sep 16 11:14:07 2011
-+++ gtk/makefile	Sat Oct  2 19:46:19 2010
++++ gtk/makefile	Tue Nov 15 19:30:57 2011
-@@ -18,20 +18,21 @@ AR = ar
+@@ -5,13 +5,6 @@
- CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
+ # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
- CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
+ 
+ .SUFFIXES: .cxx .o .h .a .c
+-ifdef CLANG
+-CC = clang
+-CCOMP = clang
+-else
+-CC = g++
+-CCOMP = gcc
+-endif
+ AR = ar
+ 
+ ifdef GTK3
+@@ -24,20 +17,21 @@ endif
+ 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:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
++#gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
  ifndef prefix
  ifdef gnomeprefix
    prefix=$(gnomeprefix)
@@ -26,13 +40,15 @@ $OpenBSD: patch-gtk_makefile,v 1.5 2010/10/03 18:09:01 jeremy Exp $
  
  PROG	= ../bin/SciTE
  
-@@ -40,17 +41,19 @@ all: $(PROG)
+@@ -46,19 +40,21 @@ all: $(PROG)
  vpath %.h ../src ../../scintilla/include
  vpath %.cxx ../src
  
 -INCLUDEDIRS=-I ../../scintilla/include -I ../src
 +INCLUDEDIRS=-I ${prefix}/include/scintilla -I ../src -I ${prefix}/include
- #~ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+ ifdef CHECK_DEPRECATED
+ DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
+ endif
 -CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
 +CXXBASEFLAGS=-W -Wall -Wno-char-subscripts -pedantic -Dunix -DGTK -DSCI_LEXER -DPIXMAP_PATH=\"$(pixmapdir)\" -DSYSCONF_PATH=\"$(SYSCONF_PATH)\" $(INCLUDEDIRS) $(DEPRECATED)
  
@@ -51,25 +67,20 @@ $OpenBSD: patch-gtk_makefile,v 1.5 2010/10/03 18:09:01 jeremy Exp $
  LUA_CORE_OBJS = lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
  		lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o \
  		ltable.o ltm.o lundump.o lvm.o lzio.o
-@@ -60,14 +63,14 @@ LUA_LIB_OBJS =	lauxlib.o lbaselib.o ldblib.o liolib.o 
+@@ -70,10 +66,10 @@ LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_O
  
- LUA_OBJS = LuaExtension.o $(LUA_CORE_OBJS) $(LUA_LIB_OBJS)
+ vpath %.c ../lua/src ../lua/src/lib
  
 -INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
 +INCLUDEDIRS+=-I../lua/include
- $(LUA_CORE_OBJS): ../lua/src/*.c
- 	$(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
- $(LUA_LIB_OBJS): ../lua/src/lib/*.c
- 	$(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
--CXXFLAGS=$(CXXTFLAGS)
-+CXXFLAGS+=$(CXXTFLAGS)
- else
--CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
-+CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA
- endif
  
- ifeq ($(shell uname), Darwin)
+ .c.o:
-@@ -75,22 +78,19 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
+-	$(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c $< -o $@
+ 
+ else
+ CXXFLAGS+=-DNO_LUA
+@@ -90,22 +86,19 @@ CXXFLAGS:=$(CXXFLAGS) -Dunix
  endif
  
  .cxx.o:
@@ -87,17 +98,17 @@ $OpenBSD: patch-gtk_makefile,v 1.5 2010/10/03 18:09:01 jeremy Exp $
 -COMPLIB=../../scintilla/bin/scintilla.a
 -
  $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
--FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.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 \
-+	FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.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++
+-	$(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
-+	$(CXX) $(CONFIGTHREADS) $(LIBS) -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -lstdc++
++	$(CXX) `$(CONFIGTHREADS)` $(LIBS) -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) $(LIBDL) -lstdc++
  
  # Automatically generate header dependencies with "make deps"
  include deps.mak
-@@ -99,18 +99,16 @@ include deps.mak
+@@ -114,19 +107,18 @@ include deps.mak
  # This is OK - just means no SciTE in the Gnome Applications menu
  # Dead:	install -D SciTEGTK.properties $(SYSCONF_PATH)/SciTEGlobal.properties
  install:
@@ -114,11 +125,12 @@ $OpenBSD: patch-gtk_makefile,v 1.5 2010/10/03 18:09:01 jeremy Exp $
 -	do \
 -		$(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
 -	done
--
+ 
  ifdef gnomeprefix
- 	$(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications $(DESTDIR)$(pixmapdir)
--	$(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ 	$(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
-+	$(INSTALL) -m 444 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+-	$(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++	$(INSTALL) -m 444 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
  endif
  
  uninstall:

editors/scite/patches/patch-src_Embedded_properties

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Embedded_properties,v 1.4 2010/10/03 18:09:01 jeremy Exp $
+$OpenBSD: patch-src_Embedded_properties,v 1.5 2011/11/15 19:17:09 jeremy Exp $
---- src/Embedded.properties.orig	Fri Jul 23 03:46:19 2010
+--- src/Embedded.properties.orig	Tue Nov  1 10:44:35 2011
-+++ src/Embedded.properties	Sat Oct  2 19:38:57 2010
++++ src/Embedded.properties	Tue Nov 15 02:33:40 2011
-@@ -85,7 +85,7 @@ if PLAT_WIN
+@@ -89,7 +89,7 @@ if PLAT_WIN
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"
--	command.scite.help=netscape "file://$(SciteDefaultHome)/SciTEDoc.html"
+-	command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
-+	command.scite.help=firefox "file://__DOCDIR__/SciTEDoc.html"
++	command.scite.help=xdg-open "file://__DOCDIR__/SciTEDoc.html"
  
  code.page=0
  if PLAT_GTK

editors/scite/patches/patch-src_SciTEGlobal_properties

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_SciTEGlobal_properties,v 1.4 2010/10/03 18:09:01 jeremy Exp $
+$OpenBSD: patch-src_SciTEGlobal_properties,v 1.5 2011/11/15 19:17:09 jeremy Exp $
---- src/SciTEGlobal.properties.orig	Fri Jul 30 19:56:35 2010
+--- src/SciTEGlobal.properties.orig	Tue Nov 15 02:37:08 2011
-+++ src/SciTEGlobal.properties	Sat Oct  2 19:38:57 2010
++++ src/SciTEGlobal.properties	Tue Nov 15 02:37:24 2011
-@@ -239,7 +239,7 @@ if PLAT_WIN
+@@ -253,7 +253,7 @@ if PLAT_WIN
  	command.scite.help.subsystem=2
  if PLAT_GTK
  	command.print.*=a2ps "$(FileNameExt)"
--	command.scite.help=netscape "file://$(SciteDefaultHome)/SciTEDoc.html"
+-	command.scite.help=xdg-open "file://$(SciteDefaultHome)/SciTEDoc.html"
-+	command.scite.help=firefox "file://__DOCDIR__/SciTEDoc.html"
++	command.scite.help=xdg-open "file://__DOCDIR__/SciTEDoc.html"
  
  # Internationalisation
  # Japanese input code page 932 and ShiftJIS character set 128

editors/scite/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2010/10/03 18:09:01 jeremy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2011/11/15 19:17:09 jeremy Exp $
 @bin bin/SciTE
 share/doc/scite/
 share/doc/scite/CommandValues.html
@@ -47,6 +47,7 @@ share/scite/forth.properties
 share/scite/fortran.properties
 share/scite/freebasic.properties
 share/scite/gap.properties
+share/scite/haskell.properties
 share/scite/html.properties
 share/scite/inno.properties
 share/scite/kix.properties
@@ -58,6 +59,7 @@ share/scite/lua.properties
 share/scite/matlab.properties
 share/scite/metapost.properties
 share/scite/mmixal.properties
+share/scite/modula3.properties
 share/scite/nimrod.properties
 share/scite/nncrontab.properties
 share/scite/nsis.properties