From 788444715ac98c853b1c6d2da5920fca28f22fca Mon Sep 17 00:00:00 2001 From: Jose Alonso Cardenas Marquez Date: Mon, 15 Jun 2015 08:04:25 +0000 Subject: [PATCH] - Update to 1.4.0 --- editors/lazarus/Makefile | 16 +++++++++------- editors/lazarus/Makefile.common | 33 ++++++++++++++++++++++++++++++++- editors/lazarus/distinfo | 4 ++-- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index 68f91dca2e88..6329cb011c0d 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= lazarus -PORTVERSION= 1.2.6 +PORTVERSION= 1.4.0 DISTVERSIONSUFFIX= -0 PORTREVISION?= 0 CATEGORIES= editors devel -MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ +MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION:S/.0//} \ LOCAL/acm/freepascal DIST_SUBDIR= freepascal @@ -105,13 +105,15 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|tools: lcl|tools:|g' -e '2840d' -e '2842d' -e '2843d' -e '2844d' ${WRKSRC}/${MAKEFILE} + -e 's|tools: lcl|tools:|g' -e '3080d' -e '3082d' -e '3083d' -e '3084d' -e '3085d' -e '3086d' ${WRKSRC}/${MAKEFILE} pre-build: - @${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 + @${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} && \ diff --git a/editors/lazarus/Makefile.common b/editors/lazarus/Makefile.common index 60f4b9cd153f..59731ba60b32 100644 --- a/editors/lazarus/Makefile.common +++ b/editors/lazarus/Makefile.common @@ -3,7 +3,12 @@ EXTRACT_AFTER_ARGS= ${LCLDIR} ${PORTNAME}/packager/registration \ ${PORTNAME}/components/lazutils ${PORTNAME}/components/ideintf \ ${PORTNAME}/images ${PORTNAME}/components/synedit \ - ${PORTNAME}/components/lazcontrols + ${PORTNAME}/components/lazcontrols + +.if ${PKGNAMESUFFIX} == "-lcl-nogui" +EXTRACT_AFTER_ARGS+= ${PORTNAME}/components/debuggerintf \ + ${PORTNAME}/components/lazdebuggergdbmi +.endif PATCHDIR= ${.CURDIR}/files FILESDIR= ${.CURDIR}/files @@ -22,13 +27,17 @@ BUILDSRC= ${WRKSRC} .if ${PKGNAMESUFFIX} != "-lcl-units" pre-build: @${MKDIR} ${WRKSRC}/units/${BUILDNAME} + @${MKDIR} ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME} @${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME} @${MKDIR} ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME} @${MKDIR} ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME} + @${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME} @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}/* ${WRKDIR}/${LCLDIR}/units/${BUILDNAME}/ + @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${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}/ + @${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/ .endif do-build: @@ -42,6 +51,12 @@ do-build: ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} @cd ${WRKDIR}/${PORTNAME}/components/synedit && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} +.if ${PKGNAMESUFFIX} == "-lcl-nogui" + @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} + @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} +.endif @cd ${BUILDSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE} @@ -50,6 +65,12 @@ pre-install: @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} +.if ${PKGNAMESUFFIX} == "-lcl-nogui" + @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/ && \ + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/debuggerintf/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST} + @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/ && \ + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazdebuggergdbmi/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST} +.endif @cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} @cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \ @@ -59,12 +80,22 @@ pre-install: do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE} +.if ${PKGNAMESUFFIX} == "-lcl-nogui" + @${MKDIR} ${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME} + @${MKDIR} ${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME} +.endif @${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} "{}" "${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \; +.if ${PKGNAMESUFFIX} == "-lcl-nogui" + @cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME} && \ + ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME}/{}" \; + @cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME} && \ + ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME}/{}" \; +.endif @cd ${WRKDIR}/${PORTNAME}/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} && \ diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo index 88108d9a839e..d992cbf8457e 100644 --- a/editors/lazarus/distinfo +++ b/editors/lazarus/distinfo @@ -1,2 +1,2 @@ -SHA256 (freepascal/lazarus-1.2.6-0.tar.gz) = c0c7e648716f27edd6f1adf908fd5733654c3cd3db6458582ccd4343a8605eea -SIZE (freepascal/lazarus-1.2.6-0.tar.gz) = 51618690 +SHA256 (freepascal/lazarus-1.4.0-0.tar.gz) = 6ceab5d2f176abedd1cebda2f7524812b16f702f010681a6af62c7a6025c12ec +SIZE (freepascal/lazarus-1.4.0-0.tar.gz) = 53055658