From owner-svn-ports-all@FreeBSD.ORG Wed Mar 26 03:44:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B5019A59; Wed, 26 Mar 2014 03:44:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 953BBF79; Wed, 26 Mar 2014 03:44:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2Q3iD9U059446; Wed, 26 Mar 2014 03:44:13 GMT (envelope-from acm@svn.freebsd.org) Received: (from acm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2Q3iC01059441; Wed, 26 Mar 2014 03:44:12 GMT (envelope-from acm@svn.freebsd.org) Message-Id: <201403260344.s2Q3iC01059441@svn.freebsd.org> From: Jose Alonso Cardenas Marquez Date: Wed, 26 Mar 2014 03:44:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349220 - in head/editors/lazarus: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2014 03:44:13 -0000 Author: acm Date: Wed Mar 26 03:44:12 2014 New Revision: 349220 URL: http://svnweb.freebsd.org/changeset/ports/349220 QAT: https://qat.redports.org/buildarchive/r349220/ Log: - Update to 1.2 - Re-add bigide support. Now lazarus is built like bigide by default - Clean up Modified: head/editors/lazarus/Makefile head/editors/lazarus/Makefile.common 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 Wed Mar 26 03:34:13 2014 (r349219) +++ head/editors/lazarus/Makefile Wed Mar 26 03:44:12 2014 (r349220) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= lazarus -PORTVERSION= 1.0.12 -PORTREVISION?= 1 +PORTVERSION= 1.2 +PORTREVISION?= 0 CATEGORIES= editors devel -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ - ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} \ - SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ + ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} DISTNAME= ${PORTNAME}-${PORTVERSION:S/$/-0/} DIST_SUBDIR= freepascal @@ -17,31 +16,30 @@ COMMENT?= A portable Delphi-like IDE for BUILD_DEPENDS?= # RUN_DEPENDS?= # -PROJECTHOST= bsdistfiles ONLY_FOR_ARCHS= i386 amd64 -#USE_BZIP2= yes +USES= gmake USE_GMAKE= yes USE_GNOME= # -USE_FPC?= fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-res fcl-xml \ - iconvenc pasjpeg x11 -MAKE_ENV= OPT="-Sgic -Fu../lcl -Fu../lcl/widgetset -Fu../lcl/forms -Fu../../lcl \ - -Fu../../lcl/forms -Fu../../lcl/widgetset -Fu../../lcl/nonwin32 \ - -Fu. -Fu${UNITSDIR}/* -Fl${LOCALBASE}/lib -Fl${LOCALBASE}/lib/qt4 \ - ${OPT_EXTRA} -Fi../lcl/include -Fi../../lcl/include \ - -Fu../components/lazutils -Fu../../components/lazutils" +USE_FPC?= fcl-base fcl-db fcl-fpcunit fcl-image fcl-process fcl-registry \ + fcl-res fcl-xml iconvenc numlib pasjpeg x11 +OPT?= "-Sgic " + +MAKE_ENV= OPT=${OPT} PLIST= ${WRKDIR}/pkg-plist WRKSRC?= ${WRKDIR}/${PORTNAME} .if !defined(PKGNAMESUFFIX) +OPTIONS_DEFINE= GDB OPTIONS_SINGLE= LCL OPTIONS_SINGLE_LCL= GTK1 GTK2 QT4 +GDB_DESC= Install a newest version of gdb GTK1_DESC= Use gtk12 interface GTK2_DESC= Use gtk20 interface QT4_DESC= Use qt4 interface -OPTIONS_DEFAULT= GTK2 +OPTIONS_DEFAULT= GTK2 GDB .endif NO_STAGE= yes @@ -70,6 +68,10 @@ MAN1= lazarus-ide.1 lazbuild.1 startlaz SUB_FILES= pkg-message SUB_LIST+= PORTSDIR="${PORTSDIR}" +.if ${PORT_OPTIONS:MGDB} +RUN_DEPENDS+= gdb762:${PORTSDIR}/devel/gdb +.endif + .if ${PORT_OPTIONS:MGTK2} USE_FPC+= gtk2 USE_GNOME= gtk20 gdkpixbuf @@ -104,24 +106,24 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|tools: lcl|tools:|g' -e '2744d' -e '2746d' -e '2747d' ${WRKSRC}/${MAKEFILE} + -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}/ideintf/units ${WRKSRC}/ideintf/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 do-build: @cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} registration lazutils codetools ide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM} + ${SETENV} ${MAKE_ENV} ${GMAKE} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM} @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} tools LCL_PLATFORM=${LCL_PLATFORM} post-build: @cd ${WRKSRC} && \ ${RM} -Rf COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \ - ide/Makefile*.orig ide/Makefile*.bak lcl/units ideintf/units \ + ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \ components/synedit/units components/lazcontrols/lib pre-install: @@ -158,7 +160,7 @@ pre-install: @${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST} do-install: -.for DIRE in components converter debugger designer doceditor ide ideintf images install languages lazarus.app lcl \ +.for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \ packager tools units @${MKDIR} ${DATADIR}/${DIRE} @cd ${WRKSRC}/${DIRE} && \ @@ -188,7 +190,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${DATADIR} ${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${PREFIX}/bin/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/Makefile* ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/Makefile* ${WRKSRC}/fpmake* ${DATADIR} .for FILE in ${MAN1} ${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${MAN1PREFIX}/man/man1 .endfor Modified: head/editors/lazarus/Makefile.common ============================================================================== --- head/editors/lazarus/Makefile.common Wed Mar 26 03:34:13 2014 (r349219) +++ head/editors/lazarus/Makefile.common Wed Mar 26 03:44:12 2014 (r349220) @@ -1,10 +1,7 @@ # $FreeBSD: ports/editors/lazarus/Makefile.common,v 1.3 2012/12/12 21:08:13 svnexp Exp $ -#USE_BZIP2= yes -USE_GMAKE= yes - EXTRACT_AFTER_ARGS= ${LCLDIR} ${PORTNAME}/packager/registration \ - ${PORTNAME}/components/lazutils ${PORTNAME}/ideintf \ + ${PORTNAME}/components/lazutils ${PORTNAME}/components/ideintf \ ${PORTNAME}/images ${PORTNAME}/components/synedit \ ${PORTNAME}/components/lazcontrols @@ -25,7 +22,13 @@ BUILDSRC= ${WRKSRC} .if ${PKGNAMESUFFIX} != "-lcl-units" pre-build: @${MKDIR} ${WRKSRC}/units/${BUILDNAME} - @${LN} -s ${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/* ${WRKDIR}/${LCLDIR}/units/${BUILDNAME}/ + @${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}/ .endif do-build: @@ -33,11 +36,11 @@ do-build: ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} @cd ${WRKDIR}/${PORTNAME}/components/lazutils && \ ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/ideintf && \ + @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols && \ ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/synedit && \ + @cd ${WRKDIR}/${PORTNAME}/components/ideintf && \ ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} - @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols && \ + @cd ${WRKDIR}/${PORTNAME}/components/synedit && \ ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} @cd ${BUILDSRC} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} @@ -47,8 +50,8 @@ pre-install: @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} - @cd ${WRKDIR}/${PORTNAME}/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} + @cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} @cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ @@ -57,10 +60,10 @@ pre-install: .if ${PKGNAMESUFFIX} != "-lcl-units" @${ECHO_CMD} "@dirrm %%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST} .endif - @${ECHO_CMD} "@dirrmtry %%DATADIR%%/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%/ideintf/units/%%BUILDNAME%%" >> ${PLIST} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%/ideintf/units" >> ${PLIST} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%/ideintf" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/ideintf/units/%%BUILDNAME%%" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/ideintf/units" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/ideintf" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/synedit/units/%%BUILDNAME%%" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/synedit/units" >> ${PLIST} @@ -77,14 +80,14 @@ pre-install: do-install: @${MKDIR} ${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE} - @${MKDIR} ${DATADIR}/ideintf/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} @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; - @cd ${WRKDIR}/${PORTNAME}/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/ideintf/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}/{}" \; @cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ Modified: head/editors/lazarus/distinfo ============================================================================== --- head/editors/lazarus/distinfo Wed Mar 26 03:34:13 2014 (r349219) +++ head/editors/lazarus/distinfo Wed Mar 26 03:44:12 2014 (r349220) @@ -1,2 +1,2 @@ -SHA256 (freepascal/lazarus-1.0.12-0.tar.gz) = 542ddd60f4a404d7020ed6962a545db910a1490588a70a26ed60a2b05b80177e -SIZE (freepascal/lazarus-1.0.12-0.tar.gz) = 47687878 +SHA256 (freepascal/lazarus-1.2-0.tar.gz) = 22ddb1ad87fa11d64fe50ef120cfbeb545698ead0672853fa3c5fe40de1bb3a8 +SIZE (freepascal/lazarus-1.2-0.tar.gz) = 51400394 Modified: head/editors/lazarus/files/patch-Makefile ============================================================================== --- head/editors/lazarus/files/patch-Makefile Wed Mar 26 03:34:13 2014 (r349219) +++ head/editors/lazarus/files/patch-Makefile Wed Mar 26 03:44:12 2014 (r349220) @@ -1,11 +1,20 @@ ---- Makefile Fri Sep 15 03:55:16 2006 -+++ Makefile Fri Sep 22 00:40:31 2006 -@@ -238,7 +238,7 @@ +--- Makefile 2014-03-23 19:30:47.000000000 -0500 ++++ Makefile 2014-03-25 19:19:37.000000000 -0500 +@@ -294,7 +294,7 @@ LAZARUS_INSTALL_DIR=C:\lazarus endif ifneq ($(findstring $(OS_TARGET),freebsd),) -LAZARUS_INSTALL_DIR=/usr/local/lazarus +LAZARUS_INSTALL_DIR=%%DATADIR%% endif - ifeq ($(FULL_TARGET),i386-linux) - override TARGET_DIRS+=lcl components packager/registration ideintf designer packager + 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 Wed Mar 26 03:34:13 2014 (r349219) +++ head/editors/lazarus/files/pkg-message.in Wed Mar 26 03:44:12 2014 (r349220) @@ -16,7 +16,10 @@ The Lazarus RAD was installed It could be extracted to your home directory. -4) The lazbuild.cfg file has been removed, it is not necessary anymore. Now +4) You can use %%LOCALBASE%%/bin/gdb762 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 we can use the following ports for aplications that depend of lazarus and these can be built with an interface different than lazarus has compiled by default: @@ -30,6 +33,6 @@ The Lazarus RAD was installed interfaces. Please look at net-p2p/transmission-remote-gui like a example of how use it -5) Enjoy it ;) +6) Enjoy it ;) ###############################################################################