*/*: Bump PORTREVISON because lazarus was updated to 3.0.0

freebsd · Dec 23, 2023 · 370d96d · 370d96d
1 parent 6b60a1b
commit 370d96d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 17 deletions.
diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	zcad
 PORTVERSION=	0.9.8.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	cad
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -22,6 +22,7 @@ DOS2UNIX_GLOB=	*.pas *.lpi
 BUILD_WRKSRC=	${WRKSRC}/cad_source
 INSTALL_WRKSRC=	${WRKSRC}/cad
 
+LAZARUS_NO_FLAVORS=	qt6
 LAZARUS_PROJECT_FILES=	anchordocking/anchordocking.lpk \
 			fpvectorial/fpvectorialpkg.lpk \
 			lclextensions/lclextensions_package.lpk \

diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	cqrlog
 PORTVERSION=	2.5.2
-PORTREVISION=	5
+PORTREVISION=	7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -35,8 +35,9 @@ NO_LAZBUILD=	yes
 LAZBUILD_ARGS=	-d --pcp=.
 DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/
 
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5 ${PORTNAME}-qt6
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt6
+qt6_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
 
 post-extract:
 	@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
@@ -56,6 +57,8 @@ post-patch:
 		${WRKSRC}/src/fTRXControl.pas ${WRKSRC}/src/fPreferences.lfm
 	${REINPLACE_CMD} -e s!%%DATADIR%%!${DATADIR}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
+	${REINPLACE_CMD} -e 's|ifdef LCLQT5|if defined\(LCLQT5\) or defined\(LCLQT6\)|g' \
+		${WRKSRC}/src/lnet/lib/lclnet.pas
 
 post-build:
 	@${RM} ${WRKSRC}/help/cwd.html.*

diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	picpas
 PORTVERSION=	0.9.0
-PORTREVISION=	11
+PORTREVISION=	12
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -39,6 +39,7 @@ post-patch:
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/Source/Globales.pas
 	${REINPLACE_CMD} 's|0.8.7|${PORTVERSION}|g' ${WRKSRC}/version.txt
 	${REINPLACE_CMD} '81d' ${WRKSRC}/Source/FrameSyntaxTree.lfm
+	${REINPLACE_CMD} 's|FileUtil|FileUtil, LazFileUtils|g' ${WRKSRC}/Source/FormConfig.pas
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/PicPas-freebsd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	WinFF
 PORTVERSION=	1.5.5
-PORTREVISION=	31
+PORTREVISION=	32
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/thierry
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -29,7 +29,6 @@ DESKTOP_ENTRIES=	"${PORTNAME}"	\
 			"AudioVideo;"	\
 			true
 
-LAZARUS_NO_FLAVORS=	qt5
 LAZARUS_PROJECT_FILES=	winff.lpr
 LAZBUILD_ARGS=		-d
 

diff --git a/net-p2p/awgg/Makefile b/net-p2p/awgg/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	awgg
 DISTVERSION=	0.6.0.6034-beta
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -15,8 +15,9 @@ RUN_DEPENDS=	aria2c:www/aria2 \
 		curl:ftp/curl \
 		yt-dlp:www/yt-dlp
 
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5 ${PORTNAME}-qt6
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt6
+qt6_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
 
 USES=		fpc gnome lazarus:flavors xorg
 USE_XORG=	x11

diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	transmission-remote-gui
 PORTVERSION=	5.18.0
-PORTREVISION=	17
+PORTREVISION=	18
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -35,8 +35,9 @@ LAZARUS_PROJECT_FILES=	transgui.lpi
 LAZBUILD_ARGS=		-d
 PROJECT_NAME=		transgui
 
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5 ${PORTNAME}-qt6
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt6
+qt6_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/restranslator.pas

diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	emkatic
 PORTVERSION=	0.41
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	russian emulators
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	SF/${PORTNAME}/eMKatic%20Source
@@ -23,8 +23,9 @@ PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 PORTDOCS=	CHANGELOG.*.txt README.*.txt
 
-gtk2_CONFLICTS_INSTALL=	ru-${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL=	ru-${PORTNAME}-gtk2
+gtk2_CONFLICTS_INSTALL=	ru-${PORTNAME}-qt5 ru-${PORTNAME}-qt6
+qt5_CONFLICTS_INSTALL=	ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt6
+qt6_CONFLICTS_INSTALL=	ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt5
 
 OPTIONS_DEFINE=		DOCS PORTAUDIO
 OPTIONS_DEFAULT=	PORTAUDIO

diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	doublecmd
 PORTVERSION=	1.0.11
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-fm
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -24,6 +24,7 @@ GH_TAGNAME=	1.0.10:help
 USE_GNOME=	cairo glib20
 USE_XORG=	x11
 
+LAZARUS_NO_FLAVORS=	qt6
 LAZARUS_PROJECT_FILES=	components/chsdet/chsdet.lpk \
 			components/CmdLine/cmdbox.lpk \
 			components/multithreadprocs/multithreadprocslaz.lpk \