Date: Sat, 28 Jun 2014 11:46:14 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359685 - head/editors/lazarus Message-ID: <201406281146.s5SBkEdh018119@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Jun 28 11:46:13 2014 New Revision: 359685 URL: http://svnweb.freebsd.org/changeset/ports/359685 QAT: https://qat.redports.org/buildarchive/r359685/ Log: Fix a bit, man pages were not packaged on some links were pointing to STAGEDIR Pointyhat: acm@ With hat: portmgr Modified: head/editors/lazarus/Makefile head/editors/lazarus/Makefile.common Modified: head/editors/lazarus/Makefile ============================================================================== --- head/editors/lazarus/Makefile Sat Jun 28 10:47:12 2014 (r359684) +++ head/editors/lazarus/Makefile Sat Jun 28 11:46:13 2014 (r359685) @@ -3,7 +3,7 @@ PORTNAME= lazarus PORTVERSION= 1.2.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= editors devel MASTER_SITES= SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \ ${MASTER_SITE_LOCAL:S|$|acm/freepascal/|} @@ -63,7 +63,7 @@ RUN_DEPENDS+= fpcres:${PORTSDIR}/lang/fp USES+= gettext iconv -MAN1= lazarus-ide.1 lazbuild.1 startlazarus.1 +MAN1S= lazarus-ide.1 lazbuild.1 startlazarus.1 SUB_FILES= pkg-message SUB_LIST+= PORTSDIR="${PORTSDIR}" @@ -136,6 +136,9 @@ pre-install: . for FILE in bin/lazarus bin/lazbuild @${ECHO_CMD} ${FILE} >> ${PLIST} . endfor +. for m in ${MAN1S} + @${ECHO_CMD} man/man1/${m}.gz >> ${PLIST} +. endfor .if !defined(NOPORTDOCS) @${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST} @@ -177,23 +180,23 @@ do-install: @cd ${WRKDIR}/docs && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \; - @${LN} -s ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}/docs + @${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/docs .endif .if !defined(NOPORTEXAMPLES) @cd ${WRKDIR}/examples && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${EXAMPLESDIR}/{}" \; - @${LN} -s ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples + @${LN} -s ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples .endif ${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} +.for FILE in ${MAN1S} ${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1 .endfor - ${LN} -s ${STAGEDIR}${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild + ${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild .else .include "${MASTERDIR}/Makefile.common" Modified: head/editors/lazarus/Makefile.common ============================================================================== --- head/editors/lazarus/Makefile.common Sat Jun 28 10:47:12 2014 (r359684) +++ head/editors/lazarus/Makefile.common Sat Jun 28 11:46:13 2014 (r359685) @@ -49,13 +49,13 @@ pre-install: @${RM} -f ${PLIST} @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${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} + ${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} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST} .if ${PKGNAMESUFFIX} != "-lcl-units" @${ECHO_CMD} "@dirrm %%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406281146.s5SBkEdh018119>