Index: head/editors/lazarus/Makefile.common =================================================================== --- head/editors/lazarus/Makefile.common (revision 470844) +++ head/editors/lazarus/Makefile.common (nonexistent) @@ -1,104 +0,0 @@ -# $FreeBSD: ports/editors/lazarus/Makefile.common,v 1.3 2012/12/12 21:08:13 svnexp Exp $ - -EXTRACT_AFTER_ARGS= ${LCLDIR} ${PORTNAME}/packager/registration \ - ${PORTNAME}/components/lazutils ${PORTNAME}/components/ideintf \ - ${PORTNAME}/images ${PORTNAME}/components/synedit \ - ${PORTNAME}/components/lazcontrols - -.if ${PKGNAMESUFFIX} == "-lcl-nogui" -EXTRACT_AFTER_ARGS+= ${PORTNAME}/components/debuggerintf \ - ${PORTNAME}/components/lazdebuggergdbmi -.endif - -PATCHDIR= ${.CURDIR}/files -FILESDIR= ${.CURDIR}/files -PLIST_SUB+= BUILDNAME=${BUILDNAME} - -LCLDIR= ${PORTNAME}/lcl - -WRKSRC= ${WRKDIR}/${LCLDIR} - -.if ${PKGNAMESUFFIX} != "-lcl-units" -BUILDSRC= ${WRKSRC}/interfaces -.else -BUILDSRC= ${WRKSRC} -.endif - -.if ${PKGNAMESUFFIX} != "-lcl-units" -pre-build: - @${MKDIR} ${WRKSRC}/units/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME} - @${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME} - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}/* ${WRKDIR}/${LCLDIR}/units/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/ - @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/ -.endif - -do-build: - @cd ${WRKDIR}/${PORTNAME}/packager/registration && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/lazutils && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/ideintf && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/synedit && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} -.if ${PKGNAMESUFFIX} == "-lcl-nogui" - @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} -.endif - @cd ${BUILDSRC} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} - -pre-install: - @${RM} ${PLIST} - - @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} -.if ${PKGNAMESUFFIX} == "-lcl-nogui" - @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/ && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/debuggerintf/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST} - @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/ && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazdebuggergdbmi/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST} -.endif - @cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} - @cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} - @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} - -do-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE} -.if ${PKGNAMESUFFIX} == "-lcl-nogui" - @${MKDIR} ${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME} - @${MKDIR} ${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME} -.endif - @${MKDIR} ${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} - @${MKDIR} ${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} - @${MKDIR} ${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} - - @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; -.if ${PKGNAMESUFFIX} == "-lcl-nogui" - @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME}/{}" \; - @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME}/{}" \; -.endif - @cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; - @cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; - @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}/{}" \; Property changes on: head/editors/lazarus/Makefile.common ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/lazarus/Makefile =================================================================== --- head/editors/lazarus/Makefile (revision 470844) +++ head/editors/lazarus/Makefile (revision 470845) @@ -1,194 +1,144 @@ -# Created by: Shaun Amott # $FreeBSD$ PORTNAME= lazarus -PORTVERSION= 1.8.0 +PORTVERSION= 1.8.2 +PKGNAMESUFFIX?= -gtk2 PORTREVISION?= 0 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ LOCAL/acm/freepascal DIST_SUBDIR= freepascal MAINTAINER?= acm@FreeBSD.org -COMMENT?= Portable Delphi-like IDE for the FreePascal compiler +COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2) -BUILD_DEPENDS?= # -RUN_DEPENDS?= # +CONFLICTS?= ${PORTNAME}-qt4-* ${PORTNAME}-qt5-* +BUILD_DEPENDS?= fpcres:lang/fpc-utils +RUN_DEPENDS?= fpcres:lang/fpc-utils + ONLY_FOR_ARCHS= i386 amd64 -USES= fpc gmake -USE_GNOME= # -USE_FPC?= cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \ +USES= fpc gettext gmake iconv +USE_FPC?= chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \ fcl-registry fcl-res fcl-web fcl-xml gtk2 ibase iconvenc mysql \ numlib odbc openssl oracle pasjpeg postgres regexpr rtl-extra \ sqlite x11 USE_XORG= x11 OPT?= "-Sgic " MAKE_ENV= OPT=${OPT} PLIST= ${WRKDIR}/pkg-plist WRKSRC?= ${WRKDIR}/${PORTNAME} DATADIR?= ${PREFIX}/share/${PORTNAME}-${PORTVERSION} -.if !defined(PKGNAMESUFFIX) OPTIONS_DEFINE= GDB -OPTIONS_SINGLE= LCL -OPTIONS_SINGLE_LCL= GTK2 QT4 QT5 - GDB_DESC= Install a newest version of gdb -GTK2_DESC= Use gtk20 interface -QT4_DESC= Use qt4 interface -QT5_DESC= Use qt5 interface - OPTIONS_DEFAULT= GTK2 GDB -.endif .include LAZARUS_ARCH= ${ARCH:S,amd64,x86_64,} BUILDNAME= ${LAZARUS_ARCH}-${OPSYS:tl} -LCL_UNITS_DIR= ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME} +LCL_PLATFORM?= gtk2 -.if !defined(PKGNAMESUFFIX) -BUILD_DEPENDS+= fpcres:lang/fpc-utils \ - ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \ - ${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui -RUN_DEPENDS+= fpcres:lang/fpc-utils \ - ${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \ - ${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui - -USES+= gettext iconv -USE_FPC+= chm - MAN1S= lazarus-ide.1 lazbuild.1 startlazarus.1 SUB_FILES= pkg-message SUB_LIST+= PORTSDIR="${PORTSDIR}" .if ${PORT_OPTIONS:MGDB} RUN_DEPENDS+= ${LOCALBASE}/bin/gdb:devel/gdb .endif -.if ${PORT_OPTIONS:MGTK2} +.if ${PKGNAMESUFFIX} == "-gtk2" +USES+= gnome USE_GNOME= cairo gtk20 gdkpixbuf2 -LCL_PLATFORM= gtk2 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 -RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2 .endif -.if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= libQt4Pas.so:x11-toolkits/qt4pas -LCL_PLATFORM= qt -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt -.endif - -.if ${PORT_OPTIONS:MQT5} -LIB_DEPENDS+= libQt5Pas.so:x11-toolkits/qt5pas -LCL_PLATFORM= qt5 -BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 -RUN_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5 -.endif - post-extract: @${MKDIR} ${WRKDIR}/man1 @${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/install/man/man1/lazbuild.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/install/man/man1/startlazarus.1 ${WRKDIR}/man1/ @${MV} ${WRKSRC}/examples ${WRKDIR}/examples @${MV} ${WRKSRC}/docs ${WRKDIR}/docs post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|tools: lcl|tools:|g' -e '3267d' -e '3269d' -e '3270d' -e '3271d' -e '3272d' -e '3273d' ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${MAKEFILE} -pre-build: - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib ${WRKSRC}/components/debuggerintf/lib - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib - @${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib ${WRKSRC}/components/lazdebuggergdbmi/lib - do-build: @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM} + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} bigide LCL_PLATFORM=${LCL_PLATFORM} @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM} post-build: @cd ${WRKSRC} && \ ${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \ - ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \ - components/synedit/units components/lazcontrols/lib + ide/Makefile*.orig ide/Makefile*.bak pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper @${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/lazarus-wrapper @${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper @${RM} ${PLIST} - @${RM} ${WRKSRC}/lcl/units @${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \ ${WRKSRC}/lazarus.app/Contents/MacOS \ ${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS . for FILE in bin/lazarus bin/lazbuild @${ECHO_CMD} ${FILE} >> ${PLIST} . endfor . for m in ${MAN1S} @${ECHO_CMD} man/man1/${m}.gz >> ${PLIST} . endfor @${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST} @cd ${WRKDIR}/docs && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST} @${ECHO_CMD} "%%DATADIR%%/examples" >> ${PLIST} @cd ${WRKDIR}/examples && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%EXAMPLESDIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%EXAMPLESDIR%%/|' >> ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ ${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} do-install: .for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \ packager tools units @${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE} @cd ${WRKSRC}/${DIRE} && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; .endfor @${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \ ${STAGEDIR}${DATADIR}/tools/updatepofiles .for FILE in lazarus startlazarus lazbuild ${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR} .endfor @cd ${WRKDIR}/docs && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \; @${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/docs @cd ${WRKDIR}/examples && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${EXAMPLESDIR}/{}" \; @${LN} -s ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples ${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/Makefile* ${WRKSRC}/fpmake* ${STAGEDIR}${DATADIR} .for FILE in ${MAN1S} ${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1 .endfor ${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild - -.else -.include "${MASTERDIR}/Makefile.common" -.endif .include Index: head/editors/lazarus/distinfo =================================================================== --- head/editors/lazarus/distinfo (revision 470844) +++ head/editors/lazarus/distinfo (revision 470845) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513100874 -SHA256 (freepascal/lazarus-1.8.0.tar.gz) = 320888ba1af17295b8d3993d50c31780d137e363e05797e3575eee90f3b3a844 -SIZE (freepascal/lazarus-1.8.0.tar.gz) = 62114372 +TIMESTAMP = 1520354258 +SHA256 (freepascal/lazarus-1.8.2.tar.gz) = 252861f86b7e49487fa925195b78e8ab6a68528d3e6059cf68630fb5bc6d5219 +SIZE (freepascal/lazarus-1.8.2.tar.gz) = 62935678 Index: head/editors/lazarus/files/patch-components-synedit_synedit.pp =================================================================== --- head/editors/lazarus/files/patch-components-synedit_synedit.pp (revision 470844) +++ head/editors/lazarus/files/patch-components-synedit_synedit.pp (nonexistent) @@ -1,20 +0,0 @@ ---- components/synedit/synedit.pp 2018-01-30 13:41:54.904942000 -0500 -+++ components/synedit/synedit.pp 2018-01-30 13:40:23.811860000 -0500 -@@ -8945,7 +8945,7 @@ - while not Highlighter.GetEol do begin - Start := Highlighter.GetTokenPos + 1; - Token := Highlighter.GetToken; -- if (PosX >= Start) and (PosX <= Start + Length(Token)) then begin -+ if (PosX >= Start) and (PosX < Start + Length(Token)) then begin - Attri := Highlighter.GetTokenAttribute; - TokenType := Highlighter.GetTokenKind; - exit(True); -@@ -8990,7 +8990,7 @@ - //TokenType := Highlighter.GetTokenKind; - Attri := Highlighter.GetTokenAttribute; - //DebugLn([' TCustomSynEdit.CaretAtIdentOrString: Start=', Start, ', Token=', Token]); -- if (PosX >= Start) and (PosX <= Start + Length(Token)) then -+ if (PosX >= Start) and (PosX < Start + Length(Token)) then - begin - AtIdent := Attri = Highlighter.IdentifierAttribute; - NearString := (Attri = Highlighter.StringAttribute) Property changes on: head/editors/lazarus/files/patch-components-synedit_synedit.pp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/editors/lazarus/files/patch-Makefile =================================================================== --- head/editors/lazarus/files/patch-Makefile (revision 470844) +++ head/editors/lazarus/files/patch-Makefile (revision 470845) @@ -1,20 +1,11 @@ ---- Makefile 2014-03-23 19:30:47.000000000 -0500 -+++ Makefile 2014-03-25 19:19:37.000000000 -0500 -@@ -294,7 +294,7 @@ +--- Makefile.orig 2018-02-25 03:49:41.000000000 -0500 ++++ Makefile 2018-03-06 15:24:00.905598000 -0500 +@@ -339,7 +339,7 @@ LAZARUS_INSTALL_DIR=C:\lazarus endif ifneq ($(findstring $(OS_TARGET),freebsd),) -LAZARUS_INSTALL_DIR=/usr/local/lazarus +LAZARUS_INSTALL_DIR=%%DATADIR%% endif ifneq ($(findstring $(OS_TARGET),win32 win64),) IDEVERSION=$(shell .\tools\install\get_lazarus_version.bat) -@@ -2848,7 +2848,7 @@ - examples: - $(MAKE) -C examples - all: lazbuild lcl basecomponents ide starter --bigide: lazbuild lcl basecomponents bigidecomponents idebig starter lhelp -+bigide: lazbuild bigidecomponents idebig starter lhelp - cleanide: - $(MAKE) -C ide cleanide - cleanlaz: cleanide Index: head/editors/lazarus/files/pkg-message.in =================================================================== --- head/editors/lazarus/files/pkg-message.in (revision 470844) +++ head/editors/lazarus/files/pkg-message.in (revision 470845) @@ -1,38 +1,37 @@ ############################################################################### The Lazarus RAD was installed 1) You can run it using: # lazarus 2) The first time that lazarus is running, you should set the path to fpc source directory at lazarus configuration environment. Also it could be setting later. 3) You can obtain freepascal source code from: %%PORTSDIR%%/distfiles/freepascal It could be extracted to your home directory. 4) You can use %%LOCALBASE%%/bin/gdb debugger instead of gdb installed debugger installed from base system. Lazarus works better with this version. 5) The lazbuild.cfg file has been removed, it is not necessary anymore. Now we can use the following ports for aplications that depend of lazarus and these can be built with an interface different than lazarus has compiled by default: - editors/lazarus-lcl-nogui - editors/lazarus-lcl-gtk2 - editors/lazarus-lcl-qt - editors/lazarus-lcl-qt5 + editors/lazarus + editors/lazarus-qt4 + editors/lazarus-qt5 - You can added those ports if you want support for nogui, gtk2, qt or qt5 + You can added those ports if you want support for gtk2, qt4 or qt5 interfaces. Please look at net-p2p/transmission-remote-gui like a example of how use it 6) Enjoy it ;) ###############################################################################