6 files changed, 30 insertions, 30 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index f1d9a9cd6562..edcd2e55c2a7 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scite
-PORTVERSION=	3.3.5
+PORTVERSION=	3.3.9
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -19,14 +19,12 @@ FULL_BUFFER_MENU_DESC=	Show all files in buffer menu
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
-USES=		gmake pkgconfig
+USES=		desktop-file-utils gmake pkgconfig
 USE_GNOME=	gtk20
 MAKEFILE=	makefile
 
-MAN1=		scite.1
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -39,17 +37,17 @@ post-patch:
 		${WRKSRC}/../src/SciTEGlobal.properties
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/pixmaps
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/../bin/SciTE ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/../doc/scite.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${STAGEDIR}${PREFIX}/share/pixmaps
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${STAGEDIR}${DATADIR}
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 70f1da111ad7..9a66d570bc23 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89
-SIZE (scite335.tgz) = 2099170
+SHA256 (scite339.tgz) = cd7bdfdf8cd870893375519405510417145ec0a9790ed7209f21d552d36c0775
+SIZE (scite339.tgz) = 2229269
diff --git a/editors/scite/files/patch-aa b/editors/scite/files/patch-makefile
index aa5686728a11..6406833ddcae 100644
--- a/editors/scite/files/patch-aa
+++ b/editors/scite/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig	2013-06-22 15:49:44.000000000 -0400
-+++ makefile	2013-06-22 15:53:14.000000000 -0400
+--- makefile.orig	2013-10-13 23:38:06.000000000 +0200
++++ makefile	2014-01-27 15:50:05.858185668 +0100
 @@ -5,13 +5,6 @@
  # GNU make does not like \r\n line endings so should be saved to CVS in binary form.
  
@@ -23,10 +23,10 @@
  ifndef prefix
  ifdef gnomeprefix
    prefix=$(gnomeprefix)
-@@ -113,8 +106,9 @@
+@@ -116,8 +109,9 @@
  $(PROG): SciTEGTK.o GUIGTK.o Widget.o \
  FilePath.o SciTEBase.o FileWorker.o Cookie.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 \
+ PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleDefinition.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) $(LIBDL) -lm -lstdc++
 +	JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index adcd131aba00..ea394f1598f7 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -1,4 +1,5 @@
 bin/SciTE
+man/man1/scite.1.gz
 share/applications/SciTE.desktop
 share/pixmaps/Sci48M.png
 %%DATADIR%%/Embedded.properties
@@ -7,6 +8,7 @@ share/pixmaps/Sci48M.png
 %%DATADIR%%/abaqus.properties
 %%DATADIR%%/abbrev.properties
 %%DATADIR%%/ada.properties
+%%DATADIR%%/asl.properties
 %%DATADIR%%/asm.properties
 %%DATADIR%%/asn1.properties
 %%DATADIR%%/au3.properties
@@ -62,6 +64,7 @@ share/pixmaps/Sci48M.png
 %%DATADIR%%/r.properties
 %%DATADIR%%/rebol.properties
 %%DATADIR%%/ruby.properties
+%%DATADIR%%/rust.properties
 %%DATADIR%%/scriptol.properties
 %%DATADIR%%/smalltalk.properties
 %%DATADIR%%/sorcins.properties
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index 560b46ed38ba..c9c7f19fa6c9 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scintilla
-PORTVERSION=	3.3.5
+PORTVERSION=	3.3.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	scite${PORTVERSION:S/.//g}
@@ -20,7 +20,6 @@ USE_GNOME=	gtk20
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-DPIC ${PICFLAG}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
@@ -43,11 +42,11 @@ post-patch:
 		${WRKSRC}/makefile
 
 do-install:
-	${MKDIR} ${PREFIX}/include/scintilla
-	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${PREFIX}/include/scintilla
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libscintilla.so.2 ${PREFIX}/lib/libscintilla.so
-	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${PREFIX}/lib
-	${LN} -sf ${PREFIX}/lib/libscintilla_lexers.so.2 ${PREFIX}/lib/libscintilla_lexers.so
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/scintilla
+	${INSTALL_DATA} ${WRKSRC}/../include/*.h ${STAGEDIR}${PREFIX}/include/scintilla
+	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla.so.2 ${STAGEDIR}${PREFIX}/lib
+	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla.so.2 libscintilla.so)
+	${INSTALL_PROGRAM} ${WRKSRC}/../bin/libscintilla_lexers.so.2 ${STAGEDIR}${PREFIX}/lib
+	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libscintilla_lexers.so.2 libscintilla_lexers.so)
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/scintilla/distinfo b/x11-toolkits/scintilla/distinfo
index 70f1da111ad7..9a66d570bc23 100644
--- a/x11-toolkits/scintilla/distinfo
+++ b/x11-toolkits/scintilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scite335.tgz) = 5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89
-SIZE (scite335.tgz) = 2099170
+SHA256 (scite339.tgz) = cd7bdfdf8cd870893375519405510417145ec0a9790ed7209f21d552d36c0775
+SIZE (scite339.tgz) = 2229269