Index: head/editors/lazarus/Makefile =================================================================== --- head/editors/lazarus/Makefile (revision 556263) +++ head/editors/lazarus/Makefile (revision 556264) @@ -1,178 +1,179 @@ # $FreeBSD$ PORTNAME= lazarus -PORTVERSION= 2.0.8 +PORTVERSION= 2.0.10 +DISTVERSIONSUFFIX= -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 (GTK2) CONFLICTS?= ${PORTNAME}-qt5-* BUILD_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ fpcres:lang/fpc-utils RUN_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ fpcres:lang/fpc-utils \ ${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc-source ONLY_FOR_ARCHS= i386 amd64 USES= desktop-file-utils fpc gettext gmake iconv shared-mime-info xorg 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 fppkg gtk2 ibase iconvenc mysql \ numlib odbc opengl openssl oracle pasjpeg postgres regexpr rtl-extra \ - sqlite x11 + rtl-generics sqlite x11 USE_XORG= x11 OPT?= "-Sgic " MAKE_ENV= OPT=${OPT} PLIST= ${WRKDIR}/pkg-plist WRKSRC?= ${WRKDIR}/${PORTNAME} DATADIR?= ${PREFIX}/share/${PORTNAME}-${PORTVERSION} OPTIONS_DEFINE= GDB GDB_DESC= Install a newest version of gdb OPTIONS_DEFAULT= GTK2 GDB .include LAZARUS_ARCH= ${ARCH:S,amd64,x86_64,} BUILDNAME= ${LAZARUS_ARCH}-${OPSYS:tl} LCL_PLATFORM?= gtk2 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 ${PKGNAMESUFFIX} == "-gtk2" USES+= gnome USE_GNOME= cairo gtk20 gdkpixbuf2 .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' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's|startlazarus|${PORTNAME}|g' ${WRKSRC}/install/${PORTNAME}.desktop do-build: @cd ${WRKSRC} && \ ${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 + ide/Makefile*.orig ide/Makefile*.bak lcl/interfaces/qt5/qtobjects.pas.orig 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} -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} @${ECHO_CMD} "share/applications/lazarus.desktop" >> ${PLIST} . for RESO in 128 16 256 32 48 64 @${ECHO_CMD} share/icons/hicolor/${RESO}x${RESO}/apps/lazarus.png >> ${PLIST} . endfor @cd ${WRKSRC}/images/mimetypes && \ ${FIND} * -type f -name "*.png" | ${SORT} | ${SED} -e 's|^|share/icons/hicolor/48x48/mimetypes/|' >> ${PLIST} @${ECHO_CMD} "share/icons/hicolor/scalable/apps/lazarus.svg" >> ${PLIST} @${ECHO_CMD} "share/mime/packages/lazarus.xml" >> ${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 .for RESO in 128 16 256 32 48 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps ${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}${RESO}x${RESO}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps/${PORTNAME}.png .endfor @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes @cd ${WRKSRC}/images/mimetypes && \ ${FIND} * -type f -name "*.png" -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes/{} \; @${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps @${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg @${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages @${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}-mime.xml ${STAGEDIR}${PREFIX}/share/mime/packages/${PORTNAME}.xml ${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 .include Index: head/editors/lazarus/distinfo =================================================================== --- head/editors/lazarus/distinfo (revision 556263) +++ head/editors/lazarus/distinfo (revision 556264) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587103144 -SHA256 (freepascal/lazarus-2.0.8.tar.gz) = 90b037280e5c63265bc25a63e6e78c9cb979fc4b45aa84606e3856b09ac791c5 -SIZE (freepascal/lazarus-2.0.8.tar.gz) = 65602475 +TIMESTAMP = 1601836014 +SHA256 (freepascal/lazarus-2.0.10-2.tar.gz) = 64d5626468dd24a3332b205f3abd0a581ab7de1b060a2d57e21864066cfd43b7 +SIZE (freepascal/lazarus-2.0.10-2.tar.gz) = 69626076 Index: head/editors/lazarus/files/patch-ide_lazbuild.lpr =================================================================== --- head/editors/lazarus/files/patch-ide_lazbuild.lpr (nonexistent) +++ head/editors/lazarus/files/patch-ide_lazbuild.lpr (revision 556264) @@ -0,0 +1,33 @@ +--- ide/lazbuild.lpr 2018-07-28 08:38:06.000000000 -0500 ++++ ide/lazbuild.lpr 2020-11-19 20:38:27.421396000 -0500 +@@ -372,7 +372,7 @@ + if not FileExistsUTF8(Filename) then + begin + // Check for packages if the specified name is a valid identifier +- if LazIsValidIdent(OriginalFileName) then begin ++ if PackageFileNameIsValid(OriginalFileName) then begin + if PackageAction=lpaAddPkgLinks then begin + Error(ErrorFileNotFound,'lpk file expected, but '+OriginalFilename+' found'); + Exit; +@@ -487,11 +487,10 @@ + XMLConfig.Free; + end; + // check Package Name +- if (Result.Name='') or (not LazIsValidIdent(Result.Name)) then begin ++ if (Result.Name='') or (not IsValidPkgName(Result.Name)) then + Error(ErrorPackageNameInvalid, + Format(lisPkgMangThePackageNameOfTheFileIsInvalid, + [Result.Name, LineEnding, Result.Filename])); +- end; + // check if Package with same name is already loaded + ConflictPkg:=PackageGraph.FindPackageWithName(Result.Name,nil); + if ConflictPkg<>nil then begin +@@ -1051,7 +1050,7 @@ + PkgFilename:=''; + if CompareFileExt(PackageNamesOrFiles[i],'.lpk')=0 then + PkgFilename:=ExpandFileNameUTF8(PackageNamesOrFiles[i]) +- else if LazIsValidIdent(PackageNamesOrFiles[i]) then begin ++ else if IsValidPkgName(PackageNamesOrFiles[i]) then begin + PackageLink:=TLazPackageLink(LazPackageLinks.FindLinkWithPkgName(PackageNamesOrFiles[i])); + if PackageLink=nil then + begin Property changes on: head/editors/lazarus/files/patch-ide_lazbuild.lpr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas =================================================================== --- head/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas (nonexistent) +++ head/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas (revision 556264) @@ -0,0 +1,14 @@ +--- lcl/interfaces/qt5/qtobjects.pas 2020-11-23 21:01:09.916716000 -0500 ++++ lcl/interfaces/qt5/qtobjects.pas 2020-11-23 21:02:33.484592000 -0500 +@@ -3115,8 +3115,9 @@ + SelFont := AFont; + if (AFont.FHandle <> nil) and (Widget <> nil) then + begin +- QFnt := QPainter_font(Widget); +- AssignQtFont(AFont.FHandle, QFnt); ++ QFnt := QFont_Create(AFont.FHandle); ++ QPainter_setFont(Widget, QFnt); ++ QFont_destroy(QFnt); + vFont.Angle := AFont.Angle; + end; + end; Property changes on: head/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property