- Update to 0.9.26.2

- Add support for QT4 interface

4 files changed, 41 insertions, 7 deletions

diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 691bba9ca5f4..1579da978335 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lazarus
-PORTVERSION=	0.9.26
+PORTVERSION=	0.9.26.2
 CATEGORIES=	editors devel
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/$/-0/}
@@ -24,16 +24,21 @@ USE_GMAKE=	yes
 USE_GNOME=	#
 WANT_FPC_ALL=	yes
 
-MAKE_ENV=	OPT="-Sgic -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib" LCL_PLATFORM=${LCL_PLATFORM}
+MAKE_ENV=	OPT="-Sgic -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib ${OPT_EXTRA}"
 MAN1=		lazarus-ide.1 lazbuild.1 startlazarus.1
 PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS=	GTK2	"Use gtk20 interface instead of gtk12"	off \
+		QT4	"Use qt4 interface" off \
 		BIGIDE	"Compile additional components"	off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_GTK2) && defined(WITH_QT4)
+IGNORE=		Please select only one option QT4 or GTK2, don't select both options
+.endif
+
 .if defined(WITH_GTK2)
 USE_GNOME=	gtk20
 LCL_PLATFORM=	gtk2
@@ -42,6 +47,12 @@ USE_GNOME=	gtk12 gdkpixbuf
 LCL_PLATFORM=	gtk
 .endif
 
+.if defined(WITH_QT4)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/qt4/libqt4intf.so:${PORTSDIR}/x11-toolkits/qt4pas
+LCL_PLATFORM=	qt
+OPT_EXTRA=	"-dUSE_QT_44"
+.endif
+
 .if defined(WITH_BIGIDE)
 LAZARUS_TARGET=	bigide lazbuilder
 .endif
@@ -60,11 +71,12 @@ post-patch:
 
 do-build:
 	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${LAZARUS_TARGET}
+		${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_PLATFORM} ${LAZARUS_TARGET}
 
 post-build:
 	@cd ${WRKSRC} && \
-		${RM} -Rf COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app
+		${RM} -Rf COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
+			ide/Makefile*.orig ide/Makefile*.bak
 
 pre-install:
 	@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
@@ -106,6 +118,7 @@ do-install:
 			${FIND} * -type d -exec ${MKDIR} "${DATADIR}/${DIRE}/{}" \; && \
 				${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/${DIRE}/{}" \;
 .endfor
+	@${CHMOD} +x ${DATADIR}/tools/svn2revisioninc
 
 .for FILE in lazarus startlazarus lazbuild
 	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${DATADIR}
diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo
index f1cf2e0357b8..a8bf218eaa26 100644
--- a/editors/lazarus/distinfo
+++ b/editors/lazarus/distinfo
@@ -1,3 +1,3 @@
-MD5 (freepascal/lazarus-0.9.26-0.tgz) = f1a7b2f89d1e6a246f25abb235880594
-SHA256 (freepascal/lazarus-0.9.26-0.tgz) = d4c2dc8e8c797049d45d0c01aff51ea94fcae489efab7d4529afb6aeca8066dd
-SIZE (freepascal/lazarus-0.9.26-0.tgz) = 12641854
+MD5 (freepascal/lazarus-0.9.26.2-0.tgz) = 357fd9f6e9d410f3c74ff493fce7f75a
+SHA256 (freepascal/lazarus-0.9.26.2-0.tgz) = 5b582685c0447034580fe17c60b8fc84a8b097b6f31ff9b4583cf0eb741297cc
+SIZE (freepascal/lazarus-0.9.26.2-0.tgz) = 14223431
diff --git a/editors/lazarus/files/patch-ide_Makefile b/editors/lazarus/files/patch-ide_Makefile
new file mode 100644
index 000000000000..e5a2e453dcdc
--- /dev/null
+++ b/editors/lazarus/files/patch-ide_Makefile
@@ -0,0 +1,11 @@
+--- ide/Makefile	2009-04-29 13:16:15.000000000 -0500
++++ ide/Makefile	2009-04-29 13:23:38.000000000 -0500
+@@ -1021,7 +1021,7 @@
+ override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../debugger/frames ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) frames .
+ endif
+ ifeq ($(FULL_TARGET),i386-freebsd)
+-override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../debugger/frames ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) frames .
++override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../debugger/frames ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) frames .
+ endif
+ ifeq ($(FULL_TARGET),i386-beos)
+ override COMPILER_UNITDIR+=../lcl/units/$(CPU_TARGET)-$(OS_TARGET) ../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) ../components/custom ../components/mpaslex ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) ../debugger ../debugger/frames ../converter ../packager ../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../units/$(CPU_TARGET)-$(OS_TARGET) frames .
diff --git a/editors/lazarus/files/patch-ide_Makefile.fpc b/editors/lazarus/files/patch-ide_Makefile.fpc
new file mode 100644
index 000000000000..e0af5f004ed3
--- /dev/null
+++ b/editors/lazarus/files/patch-ide_Makefile.fpc
@@ -0,0 +1,10 @@
+--- ide/Makefile.fpc	2009-04-29 13:07:55.000000000 -0500
++++ ide/Makefile.fpc	2009-04-29 13:15:23.000000000 -0500
+@@ -22,6 +22,7 @@
+         ../components/synedit/units/$(CPU_TARGET)-$(OS_TARGET) \
+         ../components/custom \
+         ../components/mpaslex \
++        ../ideintf \
+         ../ideintf/units/$(CPU_TARGET)-$(OS_TARGET) \
+         ../designer ../designer/jitform/units/$(CPU_TARGET)-$(OS_TARGET) \
+         ../debugger \