editors/lazarus* (5 ports): Upgrade version 1.4.2 => 1.6RC2

PR:		206147
Submitted by:	takefu (airport.fm)

7 files changed, 20 insertions, 14 deletions

diff --git a/editors/lazarus-lcl-gtk2/Makefile b/editors/lazarus-lcl-gtk2/Makefile
index 99aa72b..8d41b0f 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=	3
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-gtk2
 
 COMMENT=	Lazarus components library - GTK2 backend
diff --git a/editors/lazarus-lcl-nogui/Makefile b/editors/lazarus-lcl-nogui/Makefile
index 9e7a524..484aab5 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=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-nogui
 
 COMMENT=	Lazarus components library - No gui backend
diff --git a/editors/lazarus-lcl-qt/Makefile b/editors/lazarus-lcl-qt/Makefile
index 349c5a8..7870a04 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=	4
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-qt
 
 COMMENT=	Lazarus components library - QT backend
diff --git a/editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas b/editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas
new file mode 100644
index 0000000..0f1fdf1
--- /dev/null
+++ b/editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas
@@ -0,0 +1,11 @@
+--- interfaces/qt/qt45.pas.orig	2014-02-05 12:08:29 UTC
++++ interfaces/qt/qt45.pas
+@@ -45,7 +45,7 @@ const
+ {$ENDIF}
+ 
+ {$IFNDEF QTOPIA}
+-  {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD)}
++  {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD) or DEFINED(DRAGONFLY)}
+     {$DEFINE BINUX}
+     Qt4PasLib = 'libQt4Pas.so.5';
+   {$ENDIF}
diff --git a/editors/lazarus-lcl-units/Makefile b/editors/lazarus-lcl-units/Makefile
index 7e6db53..1a79613 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=	3
+PORTREVISION=	0
 PKGNAMESUFFIX=	-lcl-units
 
 COMMENT=	Lazarus components library units
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 46e0898..f84cb87 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	lazarus
-PORTVERSION=	1.4.2
+PORTVERSION=	1.6RC2
 DISTVERSIONSUFFIX=	-0
-PORTREVISION?=	3
+PORTREVISION?=	0
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION:S/.0//} \
 		LOCAL/acm/freepascal
@@ -44,11 +44,7 @@ OPTIONS_DEFAULT=	GTK2 GDB
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "i386"
-LAZARUS_ARCH=	i386
-.elif ${ARCH} == "amd64"
-LAZARUS_ARCH=	x86_64
-.endif
+LAZARUS_ARCH=	${ARCH:S,amd64,x86_64,}
 
 BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_UNITS_DIR=	${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
@@ -84,7 +80,6 @@ LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
 LCL_PLATFORM=	qt
 BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
 RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
-#OPT_EXTRA=	"-dUSE_QT_45"
 .endif
 
 post-extract:
diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo
index d5bd9d1..0501f3a 100644
--- a/editors/lazarus/distinfo
+++ b/editors/lazarus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freepascal/lazarus-1.4.2-0.tar.gz) = ba0d2279fefba24f8fd1d9086b10fad8cd7076d6e267afd050908c6a375733e8
-SIZE (freepascal/lazarus-1.4.2-0.tar.gz) = 53106286
+SHA256 (freepascal/lazarus-1.6RC2-0.tar.gz) = d01685fdf618c3eecd83ecc63ffbd585ebb46c1abcffd3ba7eb3616fe5d75981
+SIZE (freepascal/lazarus-1.6RC2-0.tar.gz) = 55896213