git: c1ce749c295e - main - editors/lazarus*: Include new lazarus ports into mk files

[Jose Alonso Cardenas Marquez]

The branch main has been updated by acm:

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

commit c1ce749c295e9cfc2aaf6add22e2541ef303a622
Author:     Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
AuthorDate: 2021-08-26 23:13:07 +0000
Commit:     Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
CommitDate: 2021-08-26 23:21:46 +0000

    editors/lazarus*: Include new lazarus ports into mk files
    
    - Add WANT_LAZARUS_DEVEL option if you want built apps using lazarus trunk
      version from ports. This variable can be added to /etc/make.conf. Otherwise,
      stable version of lazarus will be used.
    - WANT_LAZARUS_DEVEL will use editors/lazarus-devel or editors/lazarus-qt5-devel
      ports instead of editors/lazarus or lazarus-qt5 ones
---
 Mk/Uses/lazarus.mk         | 10 ++++++++--
 Mk/bsd.default-versions.mk |  8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk
index b01f35d66d87..a60b620f6a3e 100644
--- a/Mk/Uses/lazarus.mk
+++ b/Mk/Uses/lazarus.mk
@@ -94,6 +94,12 @@ FLAVOR=		${FLAVORS:[1]}
 
 LAZARUS_PKGNAMESUFFIX=	-${FLAVOR}
 
+.if !defined(WANT_LAZARUS_DEVEL)
+LAZARUS_DEVELSUFFIX=	#
+.else
+LAZARUS_DEVELSUFFIX=	-devel
+.endif
+
 .if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
 BUILD_DEPENDS+=	${MKINSTDIR}/gtk2.fpm:x11-toolkits/fpc-gtk2
 LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
@@ -102,13 +108,13 @@ LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
 		libpango-1.0.so:x11-toolkits/pango \
 		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
 LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus${LAZARUS_DEVELSUFFIX}
 .endif
 
 .if ${lazarus_ARGS:Mqt5} || ${FLAVOR} == qt5
 LIB_DEPENDS+=	libQt5Pas.so:x11-toolkits/qt5pas
 LCL_PLATFORM=	qt5
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5${LAZARUS_DEVELSUFFIX}
 .endif
 
 LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 1ee4d5d7bb84..2ab75db248e5 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -60,8 +60,12 @@ GHOSTSCRIPT_DEFAULT?=	agpl
 IMAGEMAGICK_DEFAULT?=	7
 # Possible values: 7, 8, 11, 12, 13, 14, 15, 16
 JAVA_DEFAULT?=		8
-# Possible values: 2.0.12
-LAZARUS_DEFAULT?=	2.0.12
+# Possible values: 2.0.12, 2.3.0
+.if !defined(WANT_LAZARUS_DEVEL)
+LAZARUS_DEFAULT?=       2.0.12
+.else
+LAZARUS_DEFAULT?=       2.3.0
+.endif
 # Possible values: rust, legacy
 .if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le:Npowerpc)
 LIBRSVG2_DEFAULT?=	rust