Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Oct 2023 17:52:45 GMT
From:      Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c626e9b7f55e - main - editors/lazarus-*-devel: Update to 3.0.0.20231028
Message-ID:  <202310291752.39THqj9t027530@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c626e9b7f55e7351efe5f2016f3ddd06c37e08d9

commit c626e9b7f55e7351efe5f2016f3ddd06c37e08d9
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-10-29 17:46:47 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-10-29 17:52:20 +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
---
 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 <bsd.port.options.mk>
 
 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 <bsd.port.mk>
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310291752.39THqj9t027530>