From owner-svn-ports-all@freebsd.org Tue Jan 24 06:30:16 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D33B3CBC722; Tue, 24 Jan 2017 06:30:16 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 88F1BCB8; Tue, 24 Jan 2017 06:30:16 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0O6UFqP052520; Tue, 24 Jan 2017 06:30:15 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0O6UFap052518; Tue, 24 Jan 2017 06:30:15 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201701240630.v0O6UFap052518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Tue, 24 Jan 2017 06:30:15 +0000 (UTC) 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 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.23 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, 24 Jan 2017 06:30:16 -0000 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} ; \