Date: Wed, 18 Jun 2014 20:51:40 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358314 - in head/editors: lazarus lazarus-lcl-gtk lazarus-lcl-gtk2 lazarus-lcl-nogui lazarus-lcl-qt lazarus-lcl-units lazarus/files Message-ID: <201406182051.s5IKpeux062833@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Wed Jun 18 20:51:39 2014 New Revision: 358314 URL: http://svnweb.freebsd.org/changeset/ports/358314 QAT: https://qat.redports.org/buildarchive/r358314/ Log: - Update to 1.2.4 - Remove obsolete patch files - Re-installation or update of lazarus should work fine from now - STAGEDIR support Deleted: head/editors/lazarus/files/patch-lcl-interfaces-carbon_carbonstrings.pp head/editors/lazarus/files/patch-lcl-interfaces-qt_qtprivate.pp Modified: head/editors/lazarus-lcl-gtk/Makefile head/editors/lazarus-lcl-gtk2/Makefile head/editors/lazarus-lcl-nogui/Makefile head/editors/lazarus-lcl-qt/Makefile head/editors/lazarus-lcl-units/Makefile head/editors/lazarus/Makefile head/editors/lazarus/Makefile.common head/editors/lazarus/distinfo head/editors/lazarus/files/pkg-message.in Modified: head/editors/lazarus-lcl-gtk/Makefile ============================================================================== --- head/editors/lazarus-lcl-gtk/Makefile Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus-lcl-gtk/Makefile Wed Jun 18 20:51:39 2014 (r358314) @@ -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" Modified: head/editors/lazarus-lcl-gtk2/Makefile ============================================================================== --- head/editors/lazarus-lcl-gtk2/Makefile Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus-lcl-gtk2/Makefile Wed Jun 18 20:51:39 2014 (r358314) @@ -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" Modified: head/editors/lazarus-lcl-nogui/Makefile ============================================================================== --- head/editors/lazarus-lcl-nogui/Makefile Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus-lcl-nogui/Makefile Wed Jun 18 20:51:39 2014 (r358314) @@ -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" Modified: head/editors/lazarus-lcl-qt/Makefile ============================================================================== --- head/editors/lazarus-lcl-qt/Makefile Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus-lcl-qt/Makefile Wed Jun 18 20:51:39 2014 (r358314) @@ -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" Modified: head/editors/lazarus-lcl-units/Makefile ============================================================================== --- head/editors/lazarus-lcl-units/Makefile Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus-lcl-units/Makefile Wed Jun 18 20:51:39 2014 (r358314) @@ -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" Modified: head/editors/lazarus/Makefile ============================================================================== --- head/editors/lazarus/Makefile Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus/Makefile Wed Jun 18 20:51:39 2014 (r358314) @@ -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 Modified: head/editors/lazarus/Makefile.common ============================================================================== --- head/editors/lazarus/Makefile.common Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus/Makefile.common Wed Jun 18 20:51:39 2014 (r358314) @@ -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}/{}" \; Modified: head/editors/lazarus/distinfo ============================================================================== --- head/editors/lazarus/distinfo Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus/distinfo Wed Jun 18 20:51:39 2014 (r358314) @@ -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 Modified: head/editors/lazarus/files/pkg-message.in ============================================================================== --- head/editors/lazarus/files/pkg-message.in Wed Jun 18 20:18:33 2014 (r358313) +++ head/editors/lazarus/files/pkg-message.in Wed Jun 18 20:51:39 2014 (r358314) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406182051.s5IKpeux062833>