From owner-svn-ports-all@FreeBSD.ORG Wed Oct 2 20:37:03 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C0C25591; Wed, 2 Oct 2013 20:37:03 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AE45E2715; Wed, 2 Oct 2013 20:37:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r92Kb3CO018386; Wed, 2 Oct 2013 20:37:03 GMT (envelope-from acm@svn.freebsd.org) Received: (from acm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r92Kb3s7018384; Wed, 2 Oct 2013 20:37:03 GMT (envelope-from acm@svn.freebsd.org) Message-Id: <201310022037.r92Kb3s7018384@svn.freebsd.org> From: Jose Alonso Cardenas Marquez Date: Wed, 2 Oct 2013 20:37:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329106 - head/editors/lazarus X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2013 20:37:03 -0000 Author: acm Date: Wed Oct 2 20:37:03 2013 New Revision: 329106 URL: http://svnweb.freebsd.org/changeset/ports/329106 Log: - Install additional base components when one lcl interface different than default interface is installed. It will be used to build any app with another lcl as requirement. Reported by: Benat Gonzalez Etxepare Modified: head/editors/lazarus/Makefile.common Modified: head/editors/lazarus/Makefile.common ============================================================================== --- head/editors/lazarus/Makefile.common Wed Oct 2 20:12:35 2013 (r329105) +++ head/editors/lazarus/Makefile.common Wed Oct 2 20:37:03 2013 (r329106) @@ -4,7 +4,10 @@ USE_GMAKE= yes EXTRACT_AFTER_ARGS= ${LCLDIR} ${PORTNAME}/packager/registration \ - ${PORTNAME}/components/lazutils + ${PORTNAME}/components/lazutils ${PORTNAME}/ideintf \ + ${PORTNAME}/images ${PORTNAME}/components/synedit \ + ${PORTNAME}/components/lazcontrols + PATCHDIR= ${.CURDIR}/files FILESDIR= ${.CURDIR}/files PLIST_SUB+= BUILDNAME=${BUILDNAME} @@ -30,6 +33,12 @@ do-build: ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} @cd ${WRKDIR}/${PORTNAME}/components/lazutils && \ ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + @cd ${WRKDIR}/${PORTNAME}/ideintf && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + @cd ${WRKDIR}/${PORTNAME}/components/synedit && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} + @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} @cd ${BUILDSRC} && \ ${SETENV} ${MAKE_ENV} ${GMAKE} LCL_PLATFORM=${LCL_INTERFACE} @@ -38,10 +47,26 @@ pre-install: @cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} + @cd ${WRKDIR}/${PORTNAME}/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${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} + @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%/${LCL_INTERFACE}/|' >> ${PLIST} .if ${PKGNAMESUFFIX} != "-lcl-units" @${ECHO_CMD} "@dirrm %%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST} .endif + @${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%%" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/synedit/units" >> ${PLIST} + @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/synedit" >> ${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} + @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/lcl/units/%%BUILDNAME%%" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/lcl/units" >> ${PLIST} @${ECHO_CMD} "@dirrmtry %%DATADIR%%/lcl" >> ${PLIST} @@ -49,5 +74,15 @@ pre-install: do-install: @${MKDIR} ${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE} + @${MKDIR} ${DATADIR}/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} + @${MKDIR} ${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} + @${MKDIR} ${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}/{}" \; + @cd ${WRKDIR}/${PORTNAME}/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \ + ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/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}/{}" \; + @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ + ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}/{}" \;