Date: Mon, 19 Jan 2015 17:45:18 +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: r377444 - in head/editors/openoffice-4: . files Message-ID: <201501191745.t0JHjIuk049229@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: truckman Date: Mon Jan 19 17:45:17 2015 New Revision: 377444 URL: https://svnweb.freebsd.org/changeset/ports/377444 QAT: https://qat.redports.org/buildarchive/r377444/ Log: The sdk and package-canonical targets were suffering from bit rot. Unbreak. [1] The port build fails with gcc 4.9, convert to USE_GCC=4.8. [2] Differential Revision: https://reviews.freebsd.org/D1557 Submitted by: pfg [1] Submitted by: gerald [2] Reviewed by: pfg 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 Mon Jan 19 17:43:57 2015 (r377443) +++ head/editors/openoffice-4/Makefile Mon Jan 19 17:45:17 2015 (r377444) @@ -90,7 +90,7 @@ USE_XORG= x11 ice xaw xau xext xrender x xi xt xcursor xdamage xcomposite xfixes USE_GL= gl glu USE_GSTREAMER= yes -USE_GCC= yes +USE_GCC= 4.8 USES+= bison desktop-file-utils gmake perl5 pkgconfig python tar:bzip2 USE_PERL5= build WITHOUT_CPU_CFLAGS= true Modified: head/editors/openoffice-4/files/Makefile.others ============================================================================== --- head/editors/openoffice-4/files/Makefile.others Mon Jan 19 17:43:57 2015 (r377443) +++ head/editors/openoffice-4/files/Makefile.others Mon Jan 19 17:45:17 2015 (r377444) @@ -16,14 +16,14 @@ package-rename: package-canonical: @${ECHO_MSG} "===> Canonical packaging for Apache OpenOffice"; - @${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/${PACKAGE_PREFI}* . + @${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/${PACKAGE_PREFIX}* ${WRKDIR}/../. sdk: @${ECHO_MSG} "===> Make SDK of Apache OpenOffice" @${RM} -fr ${WRKDIR}/sdk_tmp @${MKDIR} ${WRKDIR}/sdk_tmp @cd ${WRKDIR}/sdk_tmp ; \ - ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice_*SDK*.tar.gz + ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice_SDK/archive/install/${LOCALIZED_LANG}/Apache_OpenOffice-*SDK*.tar.gz @cd ${WRKDIR}/sdk_tmp/Apache_*/openoffice* ; \ ${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \ ${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501191745.t0JHjIuk049229>