From owner-svn-ports-all@FreeBSD.ORG Tue Dec 9 21:18:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBD0DA4B; Tue, 9 Dec 2014 21:18:33 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BCEBD751; Tue, 9 Dec 2014 21:18:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB9LIXJe003395; Tue, 9 Dec 2014 21:18:33 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB9LIXAe003392; Tue, 9 Dec 2014 21:18:33 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412092118.sB9LIXAe003392@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 9 Dec 2014 21:18:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374429 - in head/editors: lazarus lazarus-lcl-units 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.18-1 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: Tue, 09 Dec 2014 21:18:34 -0000 Author: antoine Date: Tue Dec 9 21:18:32 2014 New Revision: 374429 URL: https://svnweb.freebsd.org/changeset/ports/374429 QAT: https://qat.redports.org/buildarchive/r374429/ Log: - Cleanup lazarus* plist - Bump lazarus-lcl-units PORTREVISION as previously generated plist was buggy 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 Tue Dec 9 20:09:01 2014 (r374428) +++ head/editors/lazarus-lcl-units/Makefile Tue Dec 9 21:18:32 2014 (r374429) @@ -1,7 +1,7 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -lcl-units COMMENT= Lazarus components library units Modified: head/editors/lazarus/Makefile ============================================================================== --- head/editors/lazarus/Makefile Tue Dec 9 20:09:01 2014 (r374428) +++ head/editors/lazarus/Makefile Tue Dec 9 21:18:32 2014 (r374429) @@ -132,6 +132,9 @@ pre-install: @${RM} -f ${PLIST} @${RM} -f ${WRKSRC}/lcl/units + @${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \ + ${WRKSRC}/lazarus.app/Contents/MacOS \ + ${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS . for FILE in bin/lazarus bin/lazbuild @${ECHO_CMD} ${FILE} >> ${PLIST} @@ -142,20 +145,16 @@ pre-install: @${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST} @cd ${WRKDIR}/docs && \ - ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST} && \ - ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DOCSDIR%%/|' >> ${PLIST} - @${ECHO_CMD} "@dirrm %%DOCSDIR%%" >> ${PLIST} + ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST} @${ECHO_CMD} "%%DATADIR%%/examples" >> ${PLIST} @cd ${WRKDIR}/examples && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%EXAMPLESDIR%%/|' >> ${PLIST} && \ - ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%EXAMPLESDIR%%/|' >> ${PLIST} - @${ECHO_CMD} "@dirrm %%EXAMPLESDIR%%" >> ${PLIST} + ${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%EXAMPLESDIR%%/|' >> ${PLIST} @cd ${WRKSRC} && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \ - ${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrmtry %%DATADIR%%/|' >> ${PLIST} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST} + ${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST} do-install: .for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \ Modified: head/editors/lazarus/Makefile.common ============================================================================== --- head/editors/lazarus/Makefile.common Tue Dec 9 20:09:01 2014 (r374428) +++ head/editors/lazarus/Makefile.common Tue Dec 9 21:18:32 2014 (r374429) @@ -57,27 +57,6 @@ pre-install: @cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \ ${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} -.endif - @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}" >> ${PLIST} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/ideintf/units/%%BUILDNAME%%" >> ${PLIST} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/ideintf/units" >> ${PLIST} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%/components/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} - @${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} - @${ECHO_CMD} "@dirrmtry %%DATADIR%%" >> ${PLIST} - do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE} @${MKDIR} ${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}