- Update to 3.2.2.

- Trim Makefile header.

PR:		ports/172443
Submitted by:	Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
Feature safe:	yes

3 files changed, 18 insertions, 32 deletions

diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index d5746bfb7229..8e5451a700e7 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	scite
-# Date created:				27 November 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	scite
-PORTVERSION=	3.2.1
+PORTVERSION=	3.2.2
 CATEGORIES=	editors gnome
 MASTER_SITES=	SF/scintilla/SciTE/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
@@ -15,9 +11,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Full-featured SCIntilla based text editor for GTK/GNOME
 
-LIB_DEPENDS=	scintilla.2:${PORTSDIR}/x11-toolkits/scintilla
+LIB_DEPENDS=	scintilla:${PORTSDIR}/x11-toolkits/scintilla
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
+OPTIONS_DEFINE=	DOCS FULL_BUFFER_MENU
+FULL_BUFFER_MENU_DESC=	Show all files in buffer menu
+
 WRKSRC=		${WRKDIR}/${PORTNAME}/gtk
 
 USE_GMAKE=	yes
@@ -27,10 +26,18 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		scite.1
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	*
+.else
+PORTDOCS=
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|[(]CC[)]|(CXX)|g ; s|[(]CCOMP[)]|(CC)|g ; \
 		s| -Os||g' ${WRKSRC}/makefile
-.if defined(WITH_FULL_BUFFER_MENU)
+.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}|' \
@@ -45,7 +52,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/Sci48M.png ${PREFIX}/share/pixmaps
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../src/*.properties ${DATADIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/*.jpg ${DOCSDIR}
diff --git a/editors/scite/distinfo b/editors/scite/distinfo
index d60b41286562..ede46b3a3476 100644
--- a/editors/scite/distinfo
+++ b/editors/scite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scite321.tgz) = f95c89074fd73a22b783b5582d3b23cdbd4b7eb38ab407721a702c4a1bcb678c
-SIZE (scite321.tgz) = 2043490
+SHA256 (scite322.tgz) = 9f17fe2a5dc294bd1077bf64f713bb06733eec271bab770841e55474e6c781c8
+SIZE (scite322.tgz) = 2048866
diff --git a/editors/scite/pkg-plist b/editors/scite/pkg-plist
index 1f95d670be99..0e90169ae52a 100644
--- a/editors/scite/pkg-plist
+++ b/editors/scite/pkg-plist
@@ -1,26 +1,6 @@
 bin/SciTE
 share/applications/SciTE.desktop
 share/pixmaps/Sci48M.png
-%%PORTDOCS%%%%DOCSDIR%%/CommandValues.html
-%%PORTDOCS%%%%DOCSDIR%%/PaneAPI.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%%/ScriptLexer.html
-%%PORTDOCS%%%%DOCSDIR%%/demo.png
 %%DATADIR%%/Embedded.properties
 %%DATADIR%%/SciTE.properties
 %%DATADIR%%/SciTEGlobal.properties
@@ -98,5 +78,4 @@ share/pixmaps/Sci48M.png
 %%DATADIR%%/vhdl.properties
 %%DATADIR%%/yaml.properties
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications