Date: Tue, 24 Jan 2017 06:30:15 +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: r432313 - in head/editors/openoffice-4: . files Message-ID: <201701240630.v0O6UFap052518@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Tue Jan 24 06:30:15 2017 New Revision: 432313 URL: https://svnweb.freebsd.org/changeset/ports/432313 Log: Clean up the logic for setting FREEBSD_ENV_SET. Make a guess at the proper value of PACKAGE_MIDDLE for powerpc64 (needed for solver and language packs). A fixup for language packs on powerpc64 that was missed in the previous commit. Modified: head/editors/openoffice-4/Makefile head/editors/openoffice-4/files/Makefile.others Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Tue Jan 24 05:27:01 2017 (r432312) +++ head/editors/openoffice-4/Makefile Tue Jan 24 06:30:15 2017 (r432313) @@ -183,12 +183,12 @@ CPPFLAGS+= -I${LOCALBASE}/include .if ${ARCH} == amd64 FREEBSD_ENV_SET= FreeBSDAMDEnv.Set.sh PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86-64 -.else +.elif ${ARCH} == i386 FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_x86 -.endif -.if ${ARCH} == powerpc64 +.elif ${ARCH} == powerpc64 FREEBSD_ENV_SET= FreeBSDPPC64Env.Set.sh +PACKAGE_MIDDLE= ${PORTVERSION}_${OPSYS}_ppc64 .endif PACKAGE_PREFIX= Apache_OpenOffice Modified: head/editors/openoffice-4/files/Makefile.others ============================================================================== --- head/editors/openoffice-4/files/Makefile.others Tue Jan 24 05:27:01 2017 (r432312) +++ head/editors/openoffice-4/files/Makefile.others Tue Jan 24 06:30:15 2017 (r432313) @@ -21,11 +21,11 @@ languagepack: @${RM} -fr ${WRKDIR}/langpack_tmp @${MKDIR} ${WRKDIR}/langpack_tmp .if defined (LOCALIZED_LANG) - @cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_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/Apache_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?201701240630.v0O6UFap052518>