diff options
| author | truckman <truckman@FreeBSD.org> | 2017-01-24 14:30:15 +0800 |
|---|---|---|
| committer | truckman <truckman@FreeBSD.org> | 2017-01-24 14:30:15 +0800 |
| commit | 24531eccc8f258e6a0b8bd42c10e3c0f5999ed2d (patch) | |
| tree | 8d2d877914f277a3699e04e63cd79765c2f2788d /editors | |
| parent | 8fa68b27253b97c33a0f9d83c49cf82a6482ac9a (diff) | |
| download | freebsd-ports-gnome-24531eccc8f258e6a0b8bd42c10e3c0f5999ed2d.tar.gz freebsd-ports-gnome-24531eccc8f258e6a0b8bd42c10e3c0f5999ed2d.tar.zst freebsd-ports-gnome-24531eccc8f258e6a0b8bd42c10e3c0f5999ed2d.zip | |
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.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-4/Makefile | 6 | ||||
| -rw-r--r-- | editors/openoffice-4/files/Makefile.others | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index fd1286b6b9fa..1c3b9e101368 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -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 diff --git a/editors/openoffice-4/files/Makefile.others b/editors/openoffice-4/files/Makefile.others index a8838f2deb93..408e29c41e3e 100644 --- a/editors/openoffice-4/files/Makefile.others +++ b/editors/openoffice-4/files/Makefile.others @@ -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} ; \ |