4 files changed, 47 insertions, 28 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index ecbff6e39923..a9eff4186336 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	scite
-PORTVERSION=	1.75
+PORTVERSION=	1.76
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.scintilla.org/
@@ -26,11 +26,13 @@ USE_GNOME=	gtk20
 MAKEFILE=	makefile
 MAKE_ENV=	CC="${CC}" CXX="${CXX}"
 
+SUB_FILES=	pkg-message
+
 MAN1=		scite.1
 
-.if defined(PACKAGE_BUILDING)
-IGNORE=		x11-toolkits/scintilla does not build with GTK+2 support by default
-.endif
+#.if defined(PACKAGE_BUILDING)
+#IGNORE=		x11-toolkits/scintilla does not build with GTK+2 support by default
+#.endif
 
 pre-configure:
 	@if [ -n "`${PKG_INFO} -E 'scintilla-[0-9]*' 2> /dev/null`" ]; then \
@@ -53,9 +55,15 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/SciTE.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/pixmaps
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/*.png ${DOCSDIR}
+.endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index 221fb48bccc1..7aabb2934bf1 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,3 +1,3 @@
-MD5 (scite175.tgz) = 18a4525c4962f1cdbd298a379cc865b7
-SHA256 (scite175.tgz) = 87498d73a18b75024771b74319b6e1a64be90e2a4d689b21f26997c0dba0cfc6
-SIZE (scite175.tgz) = 1489736
+MD5 (scite176.tgz) = c33461643c62c80420376de37125092b
+SHA256 (scite176.tgz) = cea1f932cea33e93f018ac6929f1d18edd6cfe8fdcac73b05da4e721987285a0
+SIZE (scite176.tgz) = 1497197
diff --git a/editors/scite/files/pkg-message.in b/editors/scite/files/pkg-message.in
new file mode 100644
index 000000000000..7ef7e2ae62e3
--- /dev/null
+++ b/editors/scite/files/pkg-message.in
@@ -0,0 +1,9 @@
+
+===============================================================================
+Note: As of version 1.76 of this port, SciTE's documentation has been moved
+      from %%DATADIR%% to %%DOCSDIR%%.
+      This will cause the "SciTE Help" option in the help menu to point to the
+      wrong location.  You will need to manually edit your
+      SciTEGlobal.properties file if you still wish to utilize that option.
+===============================================================================
+
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 5b1d5cd0a753..028f960c3112 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -1,26 +1,27 @@
 bin/SciTE
 share/applications/SciTE.desktop
 share/pixmaps/Sci48M.png
-%%DATADIR%%/CommandValues.html
+%%PORTDOCS%%%%DOCSDIR%%/CommandValues.html
+%%PORTDOCS%%%%DOCSDIR%%/PrintHi.png
+%%PORTDOCS%%%%DOCSDIR%%/SciBreak2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/SciTE.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEDirector.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEDoc.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEDownload.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEExtension.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEExternalLexer.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEFAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEIco.png
+%%PORTDOCS%%%%DOCSDIR%%/SciTEImage.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTELexer.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTELua.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTERegEx.html
+%%PORTDOCS%%%%DOCSDIR%%/SciTEWord.jpg
+%%PORTDOCS%%%%DOCSDIR%%/demo.png
 %%DATADIR%%/Embedded.properties
-%%DATADIR%%/PrintHi.png
-%%DATADIR%%/SciBreak2.jpg
-%%DATADIR%%/SciTE.html
 %%DATADIR%%/SciTE.properties
-%%DATADIR%%/SciTEDirector.html
-%%DATADIR%%/SciTEDoc.html
-%%DATADIR%%/SciTEDownload.html
-%%DATADIR%%/SciTEExtension.html
-%%DATADIR%%/SciTEExternalLexer.html
-%%DATADIR%%/SciTEExtras.html
-%%DATADIR%%/SciTEFAQ.html
 %%DATADIR%%/SciTEGlobal.properties
-%%DATADIR%%/SciTEIco.png
-%%DATADIR%%/SciTEImage.html
-%%DATADIR%%/SciTELexer.html
-%%DATADIR%%/SciTELua.html
-%%DATADIR%%/SciTERegEx.html
-%%DATADIR%%/SciTEWord.jpg
 %%DATADIR%%/abaqus.properties
 %%DATADIR%%/abbrev.properties
 %%DATADIR%%/ada.properties
@@ -38,7 +39,6 @@ share/pixmaps/Sci48M.png
 %%DATADIR%%/csound.properties
 %%DATADIR%%/css.properties
 %%DATADIR%%/d.properties
-%%DATADIR%%/demo.png
 %%DATADIR%%/eiffel.properties
 %%DATADIR%%/erlang.properties
 %%DATADIR%%/escript.properties
@@ -65,6 +65,7 @@ share/pixmaps/Sci48M.png
 %%DATADIR%%/pascal.properties
 %%DATADIR%%/perl.properties
 %%DATADIR%%/pov.properties
+%%DATADIR%%/powershell.properties
 %%DATADIR%%/ps.properties
 %%DATADIR%%/purebasic.properties
 %%DATADIR%%/python.properties
@@ -83,4 +84,5 @@ share/pixmaps/Sci48M.png
 %%DATADIR%%/vhdl.properties
 %%DATADIR%%/yaml.properties
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications