Date: Wed, 21 Jan 2015 09:03:10 +0000 (UTC) From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377578 - in head/editors/openoffice-4: . files Message-ID: <201501210903.t0L93AKX077438@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Wed Jan 21 09:03:09 2015 New Revision: 377578 URL: https://svnweb.freebsd.org/changeset/ports/377578 QAT: https://qat.redports.org/buildarchive/r377578/ Log: Unbreak languagepack target (package-rename and ure targets are still broken). plist fixes: * Don't add @dirrm to generated plist * Don't add a blank line to generated plist * Don't truncate ${TMPPLIST} (from mat@) * Don't add @dirrm to generated plist * Add @dir for empty directories Makefile diff reduction vs. upcoming openoffice-devel update. Differential Revision: https://reviews.freebsd.org/D1561 Approved by: mat (mentor) Modified: head/editors/openoffice-4/Makefile head/editors/openoffice-4/files/Makefile.others Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Wed Jan 21 07:35:41 2015 (r377577) +++ head/editors/openoffice-4/Makefile Wed Jan 21 09:03:09 2015 (r377578) @@ -66,17 +66,18 @@ RUN_DEPENDS= \ ${JAVALIBDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ ${LOCALBASE}/lib/X11/fonts/ChromeOS/Arimo-Bold.ttf:${PORTSDIR}/x11-fonts/croscorefonts-fonts-ttf -AOOVERSION1= 4 -AOOVERSION2= 1 -AOOVERSION3= 1 -AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} -AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} -SVNREVISION= 1617669 -OOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX} -EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140918.tar.gz +AOOVERSION1= 4 +AOOVERSION2= 1 +AOOVERSION3= 1 +SVNREVISION= 1617669 +EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20140918.tar.gz + +AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} +AOOXXX= ${AOOVERSION1}${AOOVERSION2}${AOOVERSION3} +AOOSUFFIX= ${PORTVERSION} +OOOSRC= apache-openoffice-${AOOVERSION}-r${SVNREVISION}-src${EXTRACT_SUFX} OOODIR= openoffice${AOOVERSION1} -AOOSUFFIX= ${PORTVERSION} INSTALLATION_BASEDIR?= openoffice-${AOOSUFFIX} EXECBASE?= openoffice-${AOOSUFFIX} DIST_SUBDIR= openoffice @@ -280,8 +281,6 @@ do-install: ${REINPLACE_CMD} -e 's/USERINSTALLATION/UserInstallation=$$SYSUSERCONFIG\/\.openoffice\.org-devel\/${AOOVERSION1}/' ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/bootstraprc ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ cd ${WRKSRC}/solver/${AOOXXX}/unxfbsd?.pro/bin/ ; ${INSTALL_DATA} ${OOOEXTENSIONS} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/extensions/ - -post-install: ${FIND} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program -type f \( -name '*.so*' -or -name '*.bin' \) -print0 | ${XARGS} -0 -n1 ${STRIP_CMD} for prog in crashrep pagein uri-encode javaldx regmerge regview; do \ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${INSTALLATION_BASEDIR}/${OOODIR}/program/$${prog}; \ @@ -304,14 +303,10 @@ post-install: ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-smath ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-spadmin ${LN} -fs ${EXECBASE} ${STAGEDIR}${PREFIX}/bin/${EXECBASE}-swriter - ${ECHO_CMD} "" > ${TMPPLIST} - ${ECHO_CMD} "share/licenses/${PKGNAME}/catalog.mk" >> ${TMPPLIST} - ${ECHO_CMD} "share/licenses/${PKGNAME}/LICENSE" >> ${TMPPLIST} - ${ECHO_CMD} "share/licenses/${PKGNAME}/APACHE20" >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} ; ${FIND} -s bin \( -type f -or -type l \) -name "${EXECBASE}*" >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} \( -type f -or -type l \) >> ${TMPPLIST} - cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d | ${SORT} -r | \ - ${XARGS} -n 1 ${ECHO_CMD} @dirrm >> ${TMPPLIST} + cd ${STAGEDIR}${PREFIX} ; ${FIND} ${INSTALLATION_BASEDIR} -type d -empty | ${SORT} -r | \ + ${XARGS} -n 1 ${ECHO_CMD} @dir >> ${TMPPLIST} for app in base calc draw impress math writer; do \ ${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \ -e "s/^Icon.*/Icon=${EXECBASE}-$${app}.png/" \ Modified: head/editors/openoffice-4/files/Makefile.others ============================================================================== --- head/editors/openoffice-4/files/Makefile.others Wed Jan 21 07:35:41 2015 (r377577) +++ head/editors/openoffice-4/files/Makefile.others Wed Jan 21 09:03:09 2015 (r377578) @@ -39,6 +39,7 @@ ure: ${MKDIR} ../${INSTALLATION_BASEDIR} ; \ ${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \ ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-URE_${PACKAGE_MIDDLE}_install_en-US.tbz ${INSTALLATION_BASEDIR} + solver: @${ECHO_MSG} "===> Make Solver of Apache OpenOffice" @cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_PREFIX}-solver_${PACKAGE_MIDDLE}.tar.bz2 solver @@ -50,16 +51,15 @@ languagepack: .else @cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}' .endif - .if !defined (ALL_LOCALIZED_LANGS) @${RM} -fr ${WRKDIR}/langpack_tmp @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) - @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/archive/install/${LOCALIZED_LANG} ; ls Apache_OpenOffice*tar.* > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK + @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_languagepack/archive/install/${LOCALIZED_LANG} ; ls Apache_OpenOffice*tar.* > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK @cd ${WRKDIR}/langpack_tmp ; \ for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \ ${ECHO_CMD} "extracting $$i" ; \ - cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/archive/install/${LOCALIZED_LANG}/$$i ; \ + cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_languagepack/archive/install/${LOCALIZED_LANG}/$$i ; \ done @cd ${WRKDIR}/langpack_tmp/Apache_OpenOffice*/ ; \ ${MKDIR} ../${INSTALLATION_BASEDIR} ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501210903.t0L93AKX077438>