svn commit: r470845 - in head/editors/lazarus: . files

Jose Alonso Cardenas Marquez acm at FreeBSD.org
Fri May 25 15:57:07 UTC 2018 

Author: acm
Date: Fri May 25 15:57:05 2018
New Revision: 470845
URL: https://svnweb.freebsd.org/changeset/ports/470845

Log:
  - Update to 1.8.2
  - Remove obsolete files
  - Modify pkg-message file
  
  Differential Revision:	https://reviews.freebsd.org/D14661

Deleted:
  head/editors/lazarus/Makefile.common
  head/editors/lazarus/files/patch-components-synedit_synedit.pp
Modified:
  head/editors/lazarus/Makefile
  head/editors/lazarus/distinfo
  head/editors/lazarus/files/patch-Makefile
  head/editors/lazarus/files/pkg-message.in

Modified: head/editors/lazarus/Makefile
==============================================================================
--- head/editors/lazarus/Makefile	Fri May 25 15:54:02 2018	(r470844)
+++ head/editors/lazarus/Makefile	Fri May 25 15:57:05 2018	(r470845)
@@ -1,8 +1,8 @@
-# Created by: Shaun Amott <shaun at inerd.com>
 # $FreeBSD$
 
 PORTNAME=	lazarus
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.2
+PKGNAMESUFFIX?=  -gtk2
 PORTREVISION?=	0
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
@@ -10,16 +10,17 @@ MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	acm at FreeBSD.org
-COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler
+COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler (GTK2)
 
-BUILD_DEPENDS?=	#
-RUN_DEPENDS?=	#
+CONFLICTS?=	${PORTNAME}-qt4-* ${PORTNAME}-qt5-*
 
+BUILD_DEPENDS?=	fpcres:lang/fpc-utils
+RUN_DEPENDS?=	fpcres:lang/fpc-utils
+
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		fpc gmake
-USE_GNOME=	#
-USE_FPC?=	cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
+USES=		fpc gettext gmake iconv
+USE_FPC?=	chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
 		fcl-registry fcl-res fcl-web fcl-xml gtk2 ibase iconvenc mysql \
 		numlib odbc openssl oracle pasjpeg postgres regexpr rtl-extra \
 		sqlite x11
@@ -31,37 +32,17 @@ PLIST=		${WRKDIR}/pkg-plist
 WRKSRC?=	${WRKDIR}/${PORTNAME}
 DATADIR?=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 
-.if !defined(PKGNAMESUFFIX)
 OPTIONS_DEFINE=		GDB
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4 QT5
-
 GDB_DESC=		Install a newest version  of gdb
-GTK2_DESC=		Use gtk20 interface
-QT4_DESC=		Use qt4 interface
-QT5_DESC=		Use qt5 interface
-
 OPTIONS_DEFAULT=	GTK2 GDB
-.endif
 
 .include <bsd.port.options.mk>
 
 LAZARUS_ARCH=	${ARCH:S,amd64,x86_64,}
 
 BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
-LCL_UNITS_DIR=	${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
+LCL_PLATFORM?=	gtk2
 
-.if !defined(PKGNAMESUFFIX)
-BUILD_DEPENDS+=	fpcres:lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
-RUN_DEPENDS+=	fpcres:lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
-
-USES+=		gettext iconv
-USE_FPC+=	chm
-
 MAN1S=		lazarus-ide.1 lazbuild.1 startlazarus.1
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR="${PORTSDIR}"
@@ -70,27 +51,11 @@ SUB_LIST+=	PORTSDIR="${PORTSDIR}"
 RUN_DEPENDS+=	${LOCALBASE}/bin/gdb:devel/gdb
 .endif
 
-.if ${PORT_OPTIONS:MGTK2}
+.if ${PKGNAMESUFFIX} == "-gtk2"
+USES+=		gnome
 USE_GNOME=	cairo gtk20 gdkpixbuf2
-LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
-RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
 .endif
 
-.if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
-LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-.endif
-
-.if ${PORT_OPTIONS:MQT5}
-LIB_DEPENDS+=   libQt5Pas.so:x11-toolkits/qt5pas
-LCL_PLATFORM=   qt5
-BUILD_DEPENDS+= ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5
-RUN_DEPENDS+=   ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5
-.endif
-
 post-extract:
 	@${MKDIR} ${WRKDIR}/man1
 	@${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/
@@ -100,28 +65,18 @@ post-extract:
 	@${MV} ${WRKSRC}/docs ${WRKDIR}/docs
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
-			-e 's|tools: lcl|tools:|g' -e '3267d' -e '3269d' -e '3270d' -e '3271d' -e '3272d' -e '3273d' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${MAKEFILE}
 
-pre-build:
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib ${WRKSRC}/components/debuggerintf/lib
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib ${WRKSRC}/components/lazdebuggergdbmi/lib
-
 do-build:
 	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM}
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} bigide LCL_PLATFORM=${LCL_PLATFORM}
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM}
 
 post-build:
 	@cd ${WRKSRC} && \
 		${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
-			ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \
-				components/synedit/units components/lazcontrols/lib
+			ide/Makefile*.orig ide/Makefile*.bak
 
 pre-install:
 	@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
@@ -129,7 +84,6 @@ pre-install:
 	@${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper
 
 	@${RM} ${PLIST}
-	@${RM} ${WRKSRC}/lcl/units
 	@${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS
@@ -186,9 +140,5 @@ do-install:
 	${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
 	${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild
-
-.else
-.include "${MASTERDIR}/Makefile.common"
-.endif
 
 .include <bsd.port.mk>

Modified: head/editors/lazarus/distinfo
==============================================================================
--- head/editors/lazarus/distinfo	Fri May 25 15:54:02 2018	(r470844)
+++ head/editors/lazarus/distinfo	Fri May 25 15:57:05 2018	(r470845)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513100874
-SHA256 (freepascal/lazarus-1.8.0.tar.gz) = 320888ba1af17295b8d3993d50c31780d137e363e05797e3575eee90f3b3a844
-SIZE (freepascal/lazarus-1.8.0.tar.gz) = 62114372
+TIMESTAMP = 1520354258
+SHA256 (freepascal/lazarus-1.8.2.tar.gz) = 252861f86b7e49487fa925195b78e8ab6a68528d3e6059cf68630fb5bc6d5219
+SIZE (freepascal/lazarus-1.8.2.tar.gz) = 62935678

Modified: head/editors/lazarus/files/patch-Makefile
==============================================================================
--- head/editors/lazarus/files/patch-Makefile	Fri May 25 15:54:02 2018	(r470844)
+++ head/editors/lazarus/files/patch-Makefile	Fri May 25 15:57:05 2018	(r470845)
@@ -1,6 +1,6 @@
---- Makefile	2014-03-23 19:30:47.000000000 -0500
-+++ Makefile	2014-03-25 19:19:37.000000000 -0500
-@@ -294,7 +294,7 @@
+--- Makefile.orig	2018-02-25 03:49:41.000000000 -0500
++++ Makefile	2018-03-06 15:24:00.905598000 -0500
+@@ -339,7 +339,7 @@
  LAZARUS_INSTALL_DIR=C:\lazarus
  endif
  ifneq ($(findstring $(OS_TARGET),freebsd),)
@@ -9,12 +9,3 @@
  endif
  ifneq ($(findstring $(OS_TARGET),win32 win64),)
  IDEVERSION=$(shell .\tools\install\get_lazarus_version.bat)
-@@ -2848,7 +2848,7 @@
- examples:
- 	$(MAKE) -C examples
- all: lazbuild lcl basecomponents ide starter
--bigide: lazbuild lcl basecomponents bigidecomponents idebig starter lhelp
-+bigide: lazbuild bigidecomponents idebig starter lhelp
- cleanide:
- 	$(MAKE) -C ide cleanide
- cleanlaz: cleanide

Modified: head/editors/lazarus/files/pkg-message.in
==============================================================================
--- head/editors/lazarus/files/pkg-message.in	Fri May 25 15:54:02 2018	(r470844)
+++ head/editors/lazarus/files/pkg-message.in	Fri May 25 15:57:05 2018	(r470845)
@@ -24,12 +24,11 @@ The Lazarus RAD was installed
    and these can be built with an interface different than lazarus has compiled
    by default:
 
-   editors/lazarus-lcl-nogui
-   editors/lazarus-lcl-gtk2
-   editors/lazarus-lcl-qt
-   editors/lazarus-lcl-qt5
+   editors/lazarus
+   editors/lazarus-qt4
+   editors/lazarus-qt5
 
-   You can added those ports if you want support for nogui, gtk2, qt or qt5
+   You can added those ports if you want support for gtk2, qt4 or qt5
    interfaces. Please look at net-p2p/transmission-remote-gui like a example of
    how use it

More information about the svn-ports-head mailing list