From nobody Fri Nov 10 20:15:12 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SRqnD6pkpz50DQs; Fri, 10 Nov 2023 20:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SRqnD6LGtz4ZYg; Fri, 10 Nov 2023 20:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699647312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dE2ei0htye1gRhxOieQ7pIGUZfcZt7VRv2Hm2fPYm8g=; b=hMaqU5MgWS3k6zpzu4/M2pxUAbgRevRXunWiACGq7rHz8ImzMCwNtZITfvoOTKQXsP5Kc0 SnSPr8yQUzqAx1J8TmDoCBcaDgT7h5f8MNaB8A1ZAckm0xIFJ1d+kNbX2RqRa1DGqi8xIG RisqOjZs98WdsSLphnVfVvJrvaw5a2+F033JRDEsefg9KhhCild5vmghj4F9uYr8Q6QT6A k430HN6N55836RedJ5LgvfCThfq4qjljfQbpX7d6446RLkyXYHU+adO868936/TdYwfoeT xzs2Os1n+nHkwpLCkdi4CCx9zjzMqN3pRHnwZpdSwhd1NE3tfZTPKKrkpLFnpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699647312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dE2ei0htye1gRhxOieQ7pIGUZfcZt7VRv2Hm2fPYm8g=; b=uaS0BOqdG9E8TbGiChy/ZqBT3j5wt9mug8vyE0/HbD9Z+Vf/wO5HeywnFE42QrnfYHsrjY oKYXy0tNvhSQ5YRd495ysPw6OW2I7v3d4oLr2F/BrLIF/v66VnRFs8oZxqPCzerzqqibJS 7bE2V9xT6mrwh8sIegGAFvAWTQZXXIj/1sGOEtjXbFbp6jybhlKKxZP1u7beGVErJjdaEu KW9iTpJKNOOf+xEF9rP49ZdMuRR3y15fjC6wnOBGorDc1WqGpyDlgZvqE2cCskdMilrz/i +LBtHee5yGjlv6djUqb9my1ubaduZo2TzqOeZj9w29N6Fk4H0SYNbC0yX5/Fow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699647312; a=rsa-sha256; cv=none; b=AoPCZTtxJV4Fqd2Rf36xLyWOysS94+vuLXU7+3gkkJ2BV6Fd40nv6W2EpHN0dEDD0D5wRx R50Q+rfmKhXHezozSgMMIX6IAhnyRK4xNMNow4PQPvigkgEVj0LL6XjY+iAt+RlD489mjV dJEwvofnAvZEPrQ4mkfJXFjzGnRTJ1ms1i6uiKG9HFvhLXgRWFxlEgzF621ZmQ4Q6wZrzK 2ywE1WBdMuaToiLTPzn3D4fcK0G9JpJ2ke1DXCf4yWC3MqUtopWKP0zeerJIZCnbVaELke F+hTFunB+VGFeFVNZTBJ7JUiy2mzBMMJoAggijpW1YwIus0/Sp1h0kqIJ8PD5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SRqnD5Pb4z1BBB; Fri, 10 Nov 2023 20:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AAKFCYC035697; Fri, 10 Nov 2023 20:15:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AAKFCdW035694; Fri, 10 Nov 2023 20:15:12 GMT (envelope-from git) Date: Fri, 10 Nov 2023 20:15:12 GMT Message-Id: <202311102015.3AAKFCdW035694@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 0b5104aa249f - 2023Q4 - editors/lazarus-*-devel: Update to 3.0.0.20231028 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 0b5104aa249fefa3765b614db8fec39b4c2837cd Auto-Submitted: auto-generated The branch 2023Q4 has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b5104aa249fefa3765b614db8fec39b4c2837cd commit 0b5104aa249fefa3765b614db8fec39b4c2837cd Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-10-29 17:46:47 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-11-10 20:15:03 +0000 editors/lazarus-*-devel: Update to 3.0.0.20231028 - Update pkg-message.in file - Add -p to ${INSTALL_DATA} to preserves the access and modification times. It avoids issues with checksum changes and it improves compile time when lazarus ide is rebuild by users. - Update CONFLICTS (cherry picked from commit c626e9b7f55e7351efe5f2016f3ddd06c37e08d9) --- editors/lazarus-devel/Makefile | 28 +++++++++++++++------------- editors/lazarus-devel/distinfo | 6 +++--- editors/lazarus-devel/files/pkg-message.in | 13 ++++++++----- editors/lazarus-qt5-devel/Makefile | 2 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/editors/lazarus-devel/Makefile b/editors/lazarus-devel/Makefile index ab2d90fda05b..81f113241fdc 100644 --- a/editors/lazarus-devel/Makefile +++ b/editors/lazarus-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= lazarus -PORTVERSION= 2.3.0 +DISTVERSION= 3.0.0.20231028 PKGNAMESUFFIX?= -gtk2-devel -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES= editors devel DIST_SUBDIR= freepascal @@ -9,7 +9,7 @@ MAINTAINER?= acm@FreeBSD.org COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2 devel) WWW= https://www.lazarus-ide.org/ -CONFLICTS?= ${PORTNAME}-qt5-* ${PORTNAME}-gtk2-2* +CONFLICTS?= lazarus-gtk2 lazarus-qt5 lazarus-qt5-devel lazarus-qt6-devel BUILD_DEPENDS?= ${LOCALBASE}/bin/as:devel/binutils \ fpcres:lang/fpc-utils @@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= i386 amd64 USE_GITLAB= yes GL_ACCOUNT= freepascal.org/lazarus GL_PROJECT= ${PORTNAME} -GL_TAGNAME= 8d4b429879fc99ee4652c966015e19e2cb1131d8 +GL_COMMIT= da69f50a82ed2c57fdecc26023f75431bffe3d42 USES= desktop-file-utils fpc:run gettext gmake iconv shared-mime-info xorg USE_FPC?= chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \ @@ -36,7 +36,7 @@ OPT?= "-Sgic " MAKE_ENV= OPT=${OPT} PLIST= ${WRKDIR}/pkg-plist #WRKSRC?= ${WRKDIR}/${PORTNAME} -DATADIR?= ${PREFIX}/share/${PORTNAME}-${PORTVERSION} +DATADIR?= ${PREFIX}/share/${PORTNAME}-${LAZARUS_BASE} OPTIONS_DEFINE= GDB GDB_DESC= Install a newest version of gdb @@ -45,6 +45,7 @@ OPTIONS_DEFAULT= GDB .include LAZARUS_ARCH= ${ARCH:S,amd64,x86_64,} +LAZARUS_BASE= 3.0.0 BUILDNAME= ${LAZARUS_ARCH}-${OPSYS:tl} LCL_PLATFORM?= gtk2 @@ -79,13 +80,14 @@ post-patch: 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 lcl/interfaces/qt5/qtobjects.pas.orig + ide/Makefile*.orig ide/Makefile*.bak lcl/interfaces/qt5/qtobjects.pas.orig \ + .git* + @cd ${WRKSRC} && \ + ${FIND} . -name ".gitignore" -exec ${RM} "{}" \; pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper @@ -135,24 +137,24 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE} @cd ${WRKSRC}/${DIRE} && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \ - ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; + ${FIND} * -type f -exec ${INSTALL_DATA} -p {} "${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 +.for FILE in lazarus lazbuild startlazarus ${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 + @${LN} -sf ${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 + @${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples .for RESO in 128 16 256 32 48 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps @@ -177,6 +179,6 @@ do-install: .for FILE in ${MAN1S} ${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1 .endfor - ${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild + ${LN} -sf ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild .include diff --git a/editors/lazarus-devel/distinfo b/editors/lazarus-devel/distinfo index 9940d2fd918b..7eae0648f22a 100644 --- a/editors/lazarus-devel/distinfo +++ b/editors/lazarus-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679285267 -SHA256 (freepascal/freepascal.org/lazarus-lazarus-8d4b429879fc99ee4652c966015e19e2cb1131d8_GL0.tar.gz) = 4be74d6421296ed76309ef09a6471ae2064c05130373012bfcc1beb6a83d78ff -SIZE (freepascal/freepascal.org/lazarus-lazarus-8d4b429879fc99ee4652c966015e19e2cb1131d8_GL0.tar.gz) = 57272154 +TIMESTAMP = 1698534530 +SHA256 (freepascal/freepascal.org/lazarus-lazarus-da69f50a82ed2c57fdecc26023f75431bffe3d42_GL0.tar.gz) = 2976846d842e5812bd225c33a34fc21562e044d22064c6dc7edf45db87784985 +SIZE (freepascal/freepascal.org/lazarus-lazarus-da69f50a82ed2c57fdecc26023f75431bffe3d42_GL0.tar.gz) = 56191429 diff --git a/editors/lazarus-devel/files/pkg-message.in b/editors/lazarus-devel/files/pkg-message.in index c0eeec2ddd9a..75ba689d4185 100644 --- a/editors/lazarus-devel/files/pkg-message.in +++ b/editors/lazarus-devel/files/pkg-message.in @@ -19,27 +19,30 @@ The Lazarus RAD devel was installed 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 +5) 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 + editors/lazarus-devel editors/lazarus-qt5 + editors/lazarus-qt5-devel + editors/lazarus-qt6-devel - You can added those ports if you want support for gtk2 or qt5 + You can added those ports if you want support for gtk2, qt5 or qt6 interfaces. Please look at net-p2p/transmission-remote-gui like a example of how use it -6) If you want built apps using trunk version of lazarus, you must add the +6) If you want built apps using devel version of lazarus, you must add the following into /etc/make.conf file WANT_LAZARUS_DEVEL= yes - It is neccesary for use devel version of lazarus (gtk2 or qt5) + It is neccesary for use devel version of lazarus (gtk2, qt5 or qt6) editors/lazarus-devel editors/lazarus-qt5-devel + editors/lazarus-qt6-devel 7) Enjoy it ;) EOM diff --git a/editors/lazarus-qt5-devel/Makefile b/editors/lazarus-qt5-devel/Makefile index 981398114ed0..92cad89c3d2e 100644 --- a/editors/lazarus-qt5-devel/Makefile +++ b/editors/lazarus-qt5-devel/Makefile @@ -2,7 +2,7 @@ PKGNAMESUFFIX?= -qt5-devel COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT5 devel) -CONFLICTS= ${PORTNAME}-gtk2-* ${PORTNAME}-qt5-2* +CONFLICTS= lazarus-gtk2 lazarus-gtk2-devel lazarus-qt5 lazarus-qt6-devel LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas