Bug 195675

Summary:

[PATCH] x11-toolkits/scintilla & editors/scite: Update to v3.5.2

Product:

Ports & Packages

Reporter:

lightside <lightside>

Component:

Individual Port(s)

Assignee:

Dmitry Marakasov <amdmi3>

Status:

Closed FIXED

Severity:

Affects Some People

CC:

amdmi3, cyberbotx

Priority:

---

Flags:

cyberbotx: maintainer-feedback+

Version:

Latest

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
Proposed patch for x11-toolkits/scintilla (since 370597 revision)	none
Proposed patch for editors/scite (since 370597 revision)	none
The poudriere testport log for x11-toolkits/scintilla (FreeBSD 10 amd64)	none
The poudriere testport log for editors/scite (FreeBSD 10 amd64)	none
Proposed patch for editors/scite (since 370597 revision)	none
The poudriere testport log for editors/scite (FreeBSD 10 i386)	none
The poudriere testport log for editors/scite (FreeBSD 9.3 amd64)	none
The poudriere testport log for editors/scite (FreeBSD 8.4 amd64)	none

Description lightside 2014-12-04 12:53:39 UTC

Created attachment 150182 [details]
Proposed patch for x11-toolkits/scintilla (since 370597 revision)

Patch to update x11-toolkits/scintilla and editors/scite ports from 3.5.1 to 3.5.2 version.

Look following link for changes:
http://www.scintilla.org/ScintillaHistory.html

x11-toolkits/scintilla:
- Added license information
- Fixed files/patch-makefile

editors/scite:
- Added license information
- Changed pkg-plist and port's Makefile to use PORTDATA for variable *.properties files
- Replaced some INSTALL_DATA commands with COPYTREE_SHARE commands. Changed PORTDOCS accordingly

Comment 1 Bugzilla Automation freebsd_committer

2014-12-04 12:53:39 UTC

Maintainer CC'd

Comment 2 lightside 2014-12-04 12:54:56 UTC

Created attachment 150183 [details]
Proposed patch for editors/scite (since 370597 revision)

Comment 3 lightside 2014-12-04 12:56:13 UTC

Created attachment 150184 [details]
The poudriere testport log for x11-toolkits/scintilla (FreeBSD 10 amd64)

Comment 4 lightside 2014-12-04 12:56:52 UTC

Created attachment 150185 [details]
The poudriere testport log for editors/scite (FreeBSD 10 amd64)

Comment 5 Naram Qashat 2014-12-04 19:07:32 UTC

Updates look good to me, thanks.

Comment 6 lightside 2014-12-04 19:27:59 UTC

Created attachment 150190 [details]
Proposed patch for editors/scite (since 370597 revision)

Hello, Naram Qashat.

Thanks for review.

Comment about attached patch:
- Added parentheses to cd related commands

Comment 7 lightside 2014-12-04 19:28:46 UTC

Comment on attachment 150183 [details]
Proposed patch for editors/scite (since 370597 revision)

>diff -ruN scite.orig/Makefile scite/Makefile
>--- scite.orig/Makefile	2014-10-10 20:24:00.000000000 +0400
>+++ scite/Makefile	2014-12-04 15:24:14.000000000 +0400
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/editors/scite/Makefile 370597 2014-10-10 16:24:00Z madpilot $
> 
> 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 @@
> 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 @@
> USE_GNOME=	gtk20
> MAKEFILE=	makefile
> 
>-PORTDOCS=	*
>+PORTDATA=	*.properties
>+PORTDOCS=	*.html *.jpg *.png
> 
> .include <bsd.port.options.mk>
> 
>@@ -31,7 +37,7 @@
> .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 @@
> 	${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 -ruN scite.orig/distinfo scite/distinfo
>--- scite.orig/distinfo	2014-10-10 20:24:00.000000000 +0400
>+++ scite/distinfo	2014-12-04 14:16:35.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (scite351.tgz) = a068dce0d7bf4a42dd30adfc997acb62724cc7f1b393ece5fe2ef46eaf6de581
>-SIZE (scite351.tgz) = 2272014
>+SHA256 (scite352.tgz) = d1b9a12f1b8ea80f28564a1695146a59b4a03099c8ca8693e3a9ce02bb0a2836
>+SIZE (scite352.tgz) = 2277393
>diff -ruN scite.orig/pkg-plist scite/pkg-plist
>--- scite.orig/pkg-plist	2014-10-10 20:24:00.000000000 +0400
>+++ scite/pkg-plist	2014-11-07 12:23:34.000000000 +0400
>@@ -2,82 +2,3 @@
> 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

Comment 8 lightside 2014-12-04 19:47:50 UTC

Please delete comment #7.
It was accidental comment after using "Edit Attachment As Comment" button, instead of just obsolete previous patch.

Sorry for inconvenience.

Comment 9 lightside 2014-12-05 11:40:24 UTC

Created attachment 150220 [details]
The poudriere testport log for editors/scite (FreeBSD 10 i386)

Comment 10 lightside 2014-12-05 11:40:51 UTC

Created attachment 150221 [details]
The poudriere testport log for editors/scite (FreeBSD 9.3 amd64)

Comment 11 lightside 2014-12-05 11:41:32 UTC

Created attachment 150222 [details]
The poudriere testport log for editors/scite (FreeBSD 8.4 amd64)

Comment 12 commit-hook freebsd_committer

2014-12-05 12:36:52 UTC

A commit references this bug:

Author: amdmi3
Date: Fri Dec  5 12:36:05 UTC 2014
New revision: 374011
URL: https://svnweb.freebsd.org/changeset/ports/374011

Log:
  - Update to 3.5.2
  - Add license information
  - Simplify installation

  PR:		195675
  Submitted by:	lightside@gmx.com
  Approved by:	cyberbotx@cyberbotx.com (maintainer)

Changes:
  head/editors/scite/Makefile
  head/editors/scite/distinfo
  head/editors/scite/pkg-plist

Comment 13 commit-hook freebsd_committer

2014-12-05 12:36:53 UTC

A commit references this bug:

Author: amdmi3
Date: Fri Dec  5 12:36:05 UTC 2014
New revision: 374012
URL: https://svnweb.freebsd.org/changeset/ports/374012

Log:
  - Update to 3.5.2
  - Add license information

  PR:		195675
  Submitted by:	lightside@gmx.com
  Approved by:	cyberbotx@cyberbotx.com (maintainer)

Changes:
  head/x11-toolkits/scintilla/Makefile
  head/x11-toolkits/scintilla/distinfo
  head/x11-toolkits/scintilla/files/patch-makefile