diff options
| author | acm <acm@FreeBSD.org> | 2013-10-05 05:31:39 +0800 |
|---|---|---|
| committer | acm <acm@FreeBSD.org> | 2013-10-05 05:31:39 +0800 |
| commit | 51a245e6ed664268841ef8d09df66da613fe8c4f (patch) | |
| tree | 4eb4e8f3d2bcc5756b65c7520ede6360aa622265 /editors | |
| parent | a99601039f934c86b69977e4f7e068bc6c9ede16 (diff) | |
| download | freebsd-ports-gnome-51a245e6ed664268841ef8d09df66da613fe8c4f.tar.gz freebsd-ports-gnome-51a245e6ed664268841ef8d09df66da613fe8c4f.tar.zst freebsd-ports-gnome-51a245e6ed664268841ef8d09df66da613fe8c4f.zip | |
- Fix build [1]. Missing dependency
- Remove identif and basecomponents targets from editors/lazarus. Now it is
installed from lazarus-lcl-[nogui|qt|gtk1|gtk2] ports
- Add some missing directories to PLIST
- Some additional modifications
PR: ports/182647
Submitted by: Pavlo Greenberg <dog at virtual.org.ua>
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/lazarus-lcl-units/Makefile | 2 | ||||
| -rw-r--r-- | editors/lazarus/Makefile | 10 | ||||
| -rw-r--r-- | editors/lazarus/Makefile.common | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/editors/lazarus-lcl-units/Makefile b/editors/lazarus-lcl-units/Makefile index fe13c5311c2c..55ba34fdec01 100644 --- a/editors/lazarus-lcl-units/Makefile +++ b/editors/lazarus-lcl-units/Makefile @@ -6,7 +6,7 @@ PKGNAMESUFFIX= -lcl-units COMMENT= Lazarus components library units -USE_FPC= fcl-base fcl-db fcl-image fcl-process fcl-xml iconvenc +USE_FPC= fcl-base fcl-db fcl-image fcl-process fcl-registry fcl-xml iconvenc LCL_INTERFACE= # diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index 45a97cf1fcd5..67157abb6e43 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -104,21 +104,25 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|tools: lcl|tools:|g' -e '2744d' ${WRKSRC}/${MAKEFILE} + -e 's|tools: lcl|tools:|g' -e '2744d' -e '2746d' -e '2747d' ${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/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 ideintf basecomponents ide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM} + ${SETENV} ${MAKE_ENV} ${GMAKE} registration lazutils codetools ide 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 + ide/Makefile*.orig ide/Makefile*.bak lcl/units ideintf/units \ + components/synedit/units components/lazcontrols/lib pre-install: @${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper diff --git a/editors/lazarus/Makefile.common b/editors/lazarus/Makefile.common index 7ae52cbe2138..b2570232939b 100644 --- a/editors/lazarus/Makefile.common +++ b/editors/lazarus/Makefile.common @@ -57,12 +57,15 @@ 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/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/synedit/units/%%BUILDNAME%%" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/synedit/units" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/synedit" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/lazcontrols/lib" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/lazcontrols" >> ${PLIST} |