svn commit: r329389 - in head/editors: lazarus lazarus-lcl-units

[Jose Alonso Cardenas Marquez]

Author: acm
Date: Fri Oct  4 21:31:39 2013
New Revision: 329389
URL: http://svnweb.freebsd.org/changeset/ports/329389

Log:
  - 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>

Modified:
  head/editors/lazarus-lcl-units/Makefile
  head/editors/lazarus/Makefile
  head/editors/lazarus/Makefile.common

Modified: head/editors/lazarus-lcl-units/Makefile
==============================================================================
--- head/editors/lazarus-lcl-units/Makefile	Fri Oct  4 21:08:28 2013	(r329388)
+++ head/editors/lazarus-lcl-units/Makefile	Fri Oct  4 21:31:39 2013	(r329389)
@@ -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=	#
 

Modified: head/editors/lazarus/Makefile
==============================================================================
--- head/editors/lazarus/Makefile	Fri Oct  4 21:08:28 2013	(r329388)
+++ head/editors/lazarus/Makefile	Fri Oct  4 21:31:39 2013	(r329389)
@@ -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

Modified: head/editors/lazarus/Makefile.common
==============================================================================
--- head/editors/lazarus/Makefile.common	Fri Oct  4 21:08:28 2013	(r329388)
+++ head/editors/lazarus/Makefile.common	Fri Oct  4 21:31:39 2013	(r329389)
@@ -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}