11 files changed, 45 insertions, 97 deletions

diff --git a/editors/lazarus-lcl-gtk/Makefile b/editors/lazarus-lcl-gtk/Makefile
index d3c94904cd29..afc32fd01d08 100644
--- a/editors/lazarus-lcl-gtk/Makefile
+++ b/editors/lazarus-lcl-gtk/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-gtk
 
 COMMENT=	Lazarus components library - GTK backend
@@ -14,5 +14,4 @@ LCL_INTERFACE=	gtk
 
 MASTERDIR=	${.CURDIR}/../../editors/lazarus
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/lazarus-lcl-gtk2/Makefile b/editors/lazarus-lcl-gtk2/Makefile
index bbd5842942b5..a5c953ca3159 100644
--- a/editors/lazarus-lcl-gtk2/Makefile
+++ b/editors/lazarus-lcl-gtk2/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-gtk2
 
 COMMENT=	Lazarus components library - GTK2 backend
@@ -14,7 +14,5 @@ LCL_INTERFACE=	gtk2
 
 MASTERDIR=	${.CURDIR}/../../editors/lazarus
 
-NO_STAGE=	yes
-
 OPT=		#
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/lazarus-lcl-nogui/Makefile b/editors/lazarus-lcl-nogui/Makefile
index ed154dc2d0dd..484aab5a3452 100644
--- a/editors/lazarus-lcl-nogui/Makefile
+++ b/editors/lazarus-lcl-nogui/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-nogui
 
 COMMENT=	Lazarus components library - No gui backend
@@ -12,7 +12,5 @@ LCL_INTERFACE=	nogui
 
 MASTERDIR=	${.CURDIR}/../../editors/lazarus
 
-NO_STAGE=	yes
-
 OPT=		#
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/lazarus-lcl-qt/Makefile b/editors/lazarus-lcl-qt/Makefile
index f8fafa4fc546..3ac3eb072a6e 100644
--- a/editors/lazarus-lcl-qt/Makefile
+++ b/editors/lazarus-lcl-qt/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-qt
 
 COMMENT=	Lazarus components library - QT backend
@@ -14,5 +14,4 @@ LCL_INTERFACE=	qt
 
 MASTERDIR=	${.CURDIR}/../../editors/lazarus
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/lazarus-lcl-units/Makefile b/editors/lazarus-lcl-units/Makefile
index 3b6edd929290..75013b49ff51 100644
--- a/editors/lazarus-lcl-units/Makefile
+++ b/editors/lazarus-lcl-units/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-units
 
 COMMENT=	Lazarus components library units
@@ -12,7 +12,5 @@ LCL_INTERFACE=	#
 
 MASTERDIR=	${.CURDIR}/../../editors/lazarus
 
-NO_STAGE=	yes
-
 OPT	=	"-Fu../../lcl/ -Fu../lcl -Fu../../lcl/forms -Fu../../lcl/nonwin32 -Fu../../lcl/widgetset -Fi../../lcl/include"
 .include "${MASTERDIR}/Makefile"
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 43ce4f3b7ea8..a709e8699775 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lazarus
-PORTVERSION=	1.2
+PORTVERSION=	1.2.4
 PORTREVISION?=	0
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
@@ -27,6 +27,7 @@ OPT?=		"-Sgic "
 MAKE_ENV=	OPT=${OPT}
 PLIST=		${WRKDIR}/pkg-plist
 WRKSRC?=	${WRKDIR}/${PORTNAME}
+DATADIR?=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 
 .if !defined(PKGNAMESUFFIX)
 OPTIONS_DEFINE=		GDB
@@ -41,7 +42,6 @@ QT4_DESC=		Use qt4 interface
 OPTIONS_DEFAULT=	GTK2 GDB
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
@@ -51,7 +51,7 @@ LAZARUS_ARCH=	x86_64
 .endif
 
 BUILDNAME=	${LAZARUS_ARCH}-freebsd
-LCL_UNITS_DIR=	${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}
+LCL_UNITS_DIR=	${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
 
 .if !defined(PKGNAMESUFFIX)
 BUILD_DEPENDS+=	fpcres:${PORTSDIR}/lang/fpc-utils \
@@ -68,7 +68,7 @@ SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR="${PORTSDIR}"
 
 .if ${PORT_OPTIONS:MGDB}
-RUN_DEPENDS+=	gdb762:${PORTSDIR}/devel/gdb
+RUN_DEPENDS+=	gdb771:${PORTSDIR}/devel/gdb
 .endif
 
 .if ${PORT_OPTIONS:MGTK2}
@@ -108,10 +108,10 @@ post-patch:
 			-e 's|tools: lcl|tools:|g' -e '2840d' -e '2842d' -e '2843d' -e '2844d' ${WRKSRC}/${MAKEFILE}
 
 pre-build:
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}/lcl/units ${WRKSRC}/lcl/units
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}/components/ideintf/units ${WRKSRC}/components/ideintf/units
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}/components/synedit/units ${WRKSRC}/components/synedit/units
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib
+	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units
+	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units
+	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units
+	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib
 
 do-build:
 	@cd ${WRKSRC} && \
@@ -161,42 +161,40 @@ pre-install:
 do-install:
 .for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \
 	packager tools units
-		@${MKDIR} ${DATADIR}/${DIRE}
+		@${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE}
 		@cd ${WRKSRC}/${DIRE} && \
-			${FIND} * -type d -exec ${MKDIR} "${DATADIR}/${DIRE}/{}" \; && \
-				${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/${DIRE}/{}" \;
+			${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \
+				${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/${DIRE}/{}" \;
 .endfor
-	@${CHMOD} +x ${DATADIR}/tools/svn2revisioninc ${DATADIR}/tools/lazres ${DATADIR}/tools/lrstolfm \
-		${DATADIR}/tools/updatepofiles
+	@${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \
+		${STAGEDIR}${DATADIR}/tools/updatepofiles
 
 .for FILE in lazarus startlazarus lazbuild
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR}
 .endfor
 
 .if !defined(NOPORTDOCS)
 	@cd ${WRKDIR}/docs && \
-		${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
-	@${LN} -s ${DOCSDIR} ${DATADIR}/docs
+		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
+			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \;
+	@${LN} -s ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}/docs
 .endif
 
 .if !defined(NOPORTEXAMPLES)
 	@cd ${WRKDIR}/examples && \
-		${FIND} * -type d -exec ${MKDIR} "${EXAMPLESDIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${EXAMPLESDIR}/{}" \;
-	@${LN} -s ${EXAMPLESDIR} ${DATADIR}/examples
+		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \
+			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${EXAMPLESDIR}/{}" \;
+	@${LN} -s ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 .endif
 
-	${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA}	${WRKSRC}/Makefile* ${WRKSRC}/fpmake*  ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA}	${WRKSRC}/Makefile* ${WRKSRC}/fpmake*  ${STAGEDIR}${DATADIR}
 .for FILE in ${MAN1}
-	${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
-	${LN} -s ${DATADIR}/lazbuild ${PREFIX}/bin/lazbuild
+	${LN} -s ${STAGEDIR}${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
 .else
 .include "${MASTERDIR}/Makefile.common"
 .endif
diff --git a/editors/lazarus/Makefile.common b/editors/lazarus/Makefile.common
index 11951d8a6cce..9e42fe771fc2 100644
--- a/editors/lazarus/Makefile.common
+++ b/editors/lazarus/Makefile.common
@@ -25,10 +25,10 @@ pre-build:
 	@${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}
 	@${MKDIR} ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}
 	@${MKDIR} ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}/lcl/units/${BUILDNAME}/* ${WRKDIR}/${LCLDIR}/units/${BUILDNAME}/
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}/components/ideintf/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}/components/synedit/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/
+	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}/* ${WRKDIR}/${LCLDIR}/units/${BUILDNAME}/
+	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/
+	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/
+	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/
 .endif
 
 do-build:
@@ -79,16 +79,16 @@ pre-install:
 	@${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST}
 
 do-install:
-	@${MKDIR} ${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}
-	@${MKDIR} ${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}
-	@${MKDIR} ${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}
-	@${MKDIR} ${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}
 
 	@cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
 	@cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
 	@cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
 	@cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo
index 7790bdd5e6fe..296cdb96f7c0 100644
--- a/editors/lazarus/distinfo
+++ b/editors/lazarus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freepascal/lazarus-1.2-0.tar.gz) = 22ddb1ad87fa11d64fe50ef120cfbeb545698ead0672853fa3c5fe40de1bb3a8
-SIZE (freepascal/lazarus-1.2-0.tar.gz) = 51400394
+SHA256 (freepascal/lazarus-1.2.4-0.tar.gz) = e8622f2b29988514c9b7b7ff6cf2058a8b73e9ef0fd7998c82e1e958d2347d28
+SIZE (freepascal/lazarus-1.2.4-0.tar.gz) = 51606253
diff --git a/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp b/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp
deleted file mode 100644
index 98a2eb24a39d..000000000000
--- a/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp
+++ /dev/null
@@ -1,31 +0,0 @@
---- lcl/interfaces/carbon/carbonstrings.pp	2014-03-25 21:13:32.000000000 -0500
-+++ lcl/interfaces/carbon/carbonstrings.pp	2014-03-25 21:15:20.000000000 -0500
-@@ -18,6 +18,10 @@
- // defines
- {$I carbondefines.inc}
- 
-+{$if (FPC_FULLVERSION>=20701) OR (FPC_FULLVERSION>=20603)}
-+{$define HAS_INHERITED_INSERTITEM}
-+{$endif}
-+
- uses
-  // rtl+ftl
-   Classes, SysUtils,
-@@ -34,7 +38,7 @@
-     FOwner: TCarbonComboBox;  // Carbon combo box control owning strings
-   protected
-     procedure Put(Index: Integer; const S: string); override;
--    {$IF FPC_FULLVERSION<20701}
-+    {$IFNDEF HAS_INHERITED_INSERTITEM}
-     // before fpc 2.7.1 InsertItem(Index,S) did not call InsertItem(Index,S,nil)
-     procedure InsertItem(Index: Integer; const S: string); override;
-     {$ENDIF}
-@@ -113,7 +117,7 @@
-   FOwner.Insert(Index, S);
- end;
- 
--{$IF FPC_FULLVERSION<20701}
-+{$IFNDEF HAS_INHERITED_INSERTITEM}
- {------------------------------------------------------------------------------
-   Method:  TCarbonComboBoxStrings.InsertItem
-   Params:  Index - Line index
diff --git a/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp b/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp
deleted file mode 100644
index ced64075c484..000000000000
--- a/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp
+++ /dev/null
@@ -1,11 +0,0 @@
---- lcl/interfaces/qt/qtprivate.pp	2014-03-25 21:10:58.000000000 -0500
-+++ lcl/interfaces/qt/qtprivate.pp	2014-03-25 21:12:20.000000000 -0500
-@@ -23,7 +23,7 @@
- 
- // todo: check if build macros can handle this and define it
- // in package LCL instead (it's needed for several widgetsets)
--{$if (FPC_FULLVERSION>=20701)}
-+{$if (FPC_FULLVERSION>=20701) OR (FPC_FULLVERSION=20603)}
- {$define HAS_INHERITED_INSERTITEM}
- {$endif}
- 
diff --git a/editors/lazarus/files/pkg-message.in b/editors/lazarus/files/pkg-message.in
index d4dc2f452ee4..859105e8062f 100644
--- a/editors/lazarus/files/pkg-message.in
+++ b/editors/lazarus/files/pkg-message.in
@@ -16,7 +16,7 @@ The Lazarus RAD was installed
 
    It could be extracted to your home directory.
 
-4) You can use %%LOCALBASE%%/bin/gdb762 debugger instead of gdb installed deugger
+4) You can use %%LOCALBASE%%/bin/gdb771 debugger instead of gdb installed deugger
    installed from base system. Lazarus works better with this version.
 
 5) The lazbuild.cfg file has been removed, it is not necessary anymore. Now