3 files changed, 13 insertions, 92 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 31d1ade1ec51..0d934ef1ec29 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	scite
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -10,6 +10,11 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Full-featured SCIntilla based text editor for GTK/GNOME
 
+LICENSE=	SCINTILLA
+LICENSE_NAME=	License for Scintilla and SciTE
+LICENSE_FILE=	${WRKSRC}/../License.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 LIB_DEPENDS=	libscintilla.so:${PORTSDIR}/x11-toolkits/scintilla
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
@@ -22,7 +27,8 @@ USES=		desktop-file-utils gmake pkgconfig tar:tgz
 USE_GNOME=	gtk20
 MAKEFILE=	makefile
 
-PORTDOCS=	*
+PORTDATA=	*.properties
+PORTDOCS=	*.html *.jpg *.png
 
 .include <bsd.port.options.mk>
 
@@ -31,7 +37,7 @@ post-patch:
 .if ${PORT_OPTIONS:MFULL_BUFFER_MENU}
 	@${REINPLACE_CMD} -e 's|30, "/Buffers|props.GetInt("buffers") > 30 ? props.GetInt("buffers") - 10 : 30, "/Buffers|g' ${WRKSRC}/SciTEGTK.cxx
 .endif
-	@${REINPLACE_CMD} -e 's|netscape "file://$$(SciteDefaultHome)|xdg-open "file://${DOCSDIR}|' \
+	@${REINPLACE_CMD} -e 's|$$(SciteDefaultHome)|${DOCSDIR}|' \
 		${WRKSRC}/../src/SciTEGlobal.properties
 
 do-install:
@@ -39,13 +45,7 @@ do-install:
 	${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} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${STAGEDIR}${DOCSDIR}
-.endif
+	(cd ${WRKSRC}/../src && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
+	(cd ${WRKSRC}/../doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 45327911ae49..b759c2a97168 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581
-SIZE (scite351.tgz) = 2272014
+SHA256 (scite352.tgz) = d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836
+SIZE (scite352.tgz) = 2277393
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index c568ccd02512..b142548e06af 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -2,82 +2,3 @@ bin/SciTE
 man/man1/scite.1.gz
 share/applications/SciTE.desktop
 share/pixmaps/Sci48M.png
-%%DATADIR%%/Embedded.properties
-%%DATADIR%%/SciTE.properties
-%%DATADIR%%/SciTEGlobal.properties
-%%DATADIR%%/abaqus.properties
-%%DATADIR%%/abbrev.properties
-%%DATADIR%%/ada.properties
-%%DATADIR%%/asl.properties
-%%DATADIR%%/asm.properties
-%%DATADIR%%/asn1.properties
-%%DATADIR%%/au3.properties
-%%DATADIR%%/ave.properties
-%%DATADIR%%/avs.properties
-%%DATADIR%%/baan.properties
-%%DATADIR%%/blitzbasic.properties
-%%DATADIR%%/bullant.properties
-%%DATADIR%%/caml.properties
-%%DATADIR%%/cmake.properties
-%%DATADIR%%/cobol.properties
-%%DATADIR%%/conf.properties
-%%DATADIR%%/cpp.properties
-%%DATADIR%%/csound.properties
-%%DATADIR%%/css.properties
-%%DATADIR%%/d.properties
-%%DATADIR%%/ecl.properties
-%%DATADIR%%/eiffel.properties
-%%DATADIR%%/erlang.properties
-%%DATADIR%%/escript.properties
-%%DATADIR%%/flagship.properties
-%%DATADIR%%/forth.properties
-%%DATADIR%%/fortran.properties
-%%DATADIR%%/freebasic.properties
-%%DATADIR%%/gap.properties
-%%DATADIR%%/haskell.properties
-%%DATADIR%%/html.properties
-%%DATADIR%%/inno.properties
-%%DATADIR%%/kix.properties
-%%DATADIR%%/latex.properties
-%%DATADIR%%/lisp.properties
-%%DATADIR%%/lot.properties
-%%DATADIR%%/lout.properties
-%%DATADIR%%/lua.properties
-%%DATADIR%%/matlab.properties
-%%DATADIR%%/metapost.properties
-%%DATADIR%%/mmixal.properties
-%%DATADIR%%/modula3.properties
-%%DATADIR%%/nimrod.properties
-%%DATADIR%%/nncrontab.properties
-%%DATADIR%%/nsis.properties
-%%DATADIR%%/opal.properties
-%%DATADIR%%/oscript.properties
-%%DATADIR%%/others.properties
-%%DATADIR%%/pascal.properties
-%%DATADIR%%/perl.properties
-%%DATADIR%%/pov.properties
-%%DATADIR%%/powerpro.properties
-%%DATADIR%%/powershell.properties
-%%DATADIR%%/ps.properties
-%%DATADIR%%/purebasic.properties
-%%DATADIR%%/python.properties
-%%DATADIR%%/r.properties
-%%DATADIR%%/rebol.properties
-%%DATADIR%%/registry.properties
-%%DATADIR%%/ruby.properties
-%%DATADIR%%/rust.properties
-%%DATADIR%%/scriptol.properties
-%%DATADIR%%/smalltalk.properties
-%%DATADIR%%/sorcins.properties
-%%DATADIR%%/specman.properties
-%%DATADIR%%/spice.properties
-%%DATADIR%%/sql.properties
-%%DATADIR%%/tacl.properties
-%%DATADIR%%/tal.properties
-%%DATADIR%%/tcl.properties
-%%DATADIR%%/tex.properties
-%%DATADIR%%/txt2tags.properties
-%%DATADIR%%/vb.properties
-%%DATADIR%%/verilog.properties
-%%DATADIR%%/vhdl.properties
-%%DATADIR%%/yaml.properties