From d09ecf81bad302fa846ad94b33fc34975b378fd0 Mon Sep 17 00:00:00 2001
From: Don Lewis <truckman@FreeBSD.org>
Date: Sat, 20 Jan 2018 00:51:39 +0000
Subject: Remove the CCACHE option and other ccache code from the Makefile and
 use the ccache code in the ports framework handle all of the details.

Don't prepend ${WRKSRC}/solenv/bin to PATH in CONFIGURE_ENV since
it is no longer needed and blocks the framework from adding
CCACHE_WRAPPER_PATH to PATH in CONFIGURE_ENV and MAKE_ENV.

Sanitize MAKE_ENV and export it to the build, similar to what is
done by the default do-build target.  This passes CCACHE_DIR and
HOME (set to WRKDIR) to the build, so the $HOME override in r459363
is no longer needed.  We need to remove the CPPFLAGS setting from
MAKE_ENV before exporting to the build because it breaks the build
of the bundled icu module.  CFLAGS and CXXFLAGS are also removed
because they would interfere with the carefully constructed compiler
flags set by the port.  The include paths are already handled by
the port, and the port also modifies the optmization flags for some
files to work around compiler bugs.

While here, remove files/generate.pl since it has been obsolete for
a long while.

No PORTREVISION bump since the package should be unchanged.

PR:		224276
---
 editors/openoffice-devel/Makefile          | 20 +++------------
 editors/openoffice-devel/files/generate.pl | 40 ------------------------------
 2 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 editors/openoffice-devel/files/generate.pl

(limited to 'editors')

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index cde745d9e89d..0f21376c0384 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -151,7 +151,7 @@ CPE_PRODUCT=	${PORTNAME:S|apache-||}
 CPE_VENDOR=	apache
 
 OPTIONS_DEFINE=		CUPS GNOME GNOMEVFS MMEDIA MYSQL PDFIMPORT \
-			REPORT_BUILDER SDK WIKI_PUBLISHER CCACHE
+			REPORT_BUILDER SDK WIKI_PUBLISHER
 OPTIONS_DEFAULT=	CUPS GNOME GNOMEVFS MMEDIA PDFIMPORT WIKI_PUBLISHER
 GNOME_DESC=		GConf + screensaver presentation control via DBUS
 GNOMEVFS_DESC=		GNOME Virtual File System
@@ -161,7 +161,6 @@ PDFIMPORT_DESC=		Build and install PDF import extension
 REPORT_BUILDER_DESC=	Build and install Report builder extension (Broken)
 SDK_DESC=		Build and install software development kit
 WIKI_PUBLISHER_DESC=	Build and install Wiki Publisher extension
-CCACHE_DESC=		Mimimize compile time of C/C++ programs
 
 CUPS_CONFIGURE_ENABLE=		cups
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
@@ -243,18 +242,7 @@ PACKAGE_PREFIX=		Apache_OpenOffice
 
 LOCALIZED_LANG?=	en-US
 
-.if ${PORT_OPTIONS:MCCACHE} || defined(WITH_CCACHE)
-BUILD_DEPENDS+=	ccache:devel/ccache
-CCACHE_PREFIX=	ccache
-AOOCC=		${CCACHE_PREFIX} ${CC}
-AOOCXX=		${CCACHE_PREFIX} ${CXX}
-.else
-AOOCC=		${CC}
-AOOCXX=		${CXX}
-.endif
-
-CONFIGURE_ENV+=	CC="${AOOCC}" CXX="${AOOCXX}"		\
-		PATH=${WRKSRC}/solenv/bin:$$PATH
+AOO_MAKE_ENV=	${MAKE_ENV:NCPPFLAGS=*:NCFLAGS=*:NCXXFLAGS=*}
 
 GNU_CONFIGURE=	yes
 WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
@@ -449,10 +437,8 @@ do-build:
 	 fi ;								  \
 	fi ;								  \
 	cd ${WRKSRC}/instsetoo_native ;					  \
+	export ${AOO_MAKE_ENV} ;					  \
 	. ../${FREEBSD_ENV_SET} ;					  \
-	if [ -n "${HOME}" -a ! -w "${HOME}" ]; then			  \
-		export HOME=/tmp ;					  \
-	fi ;								  \
 	build.pl --all -P$${numproc} -- -P$${dmproc}
 
 do-install:
diff --git a/editors/openoffice-devel/files/generate.pl b/editors/openoffice-devel/files/generate.pl
deleted file mode 100644
index 4dfa92bad119..000000000000
--- a/editors/openoffice-devel/files/generate.pl
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-# generate full build shell script for Apache OpenOffice
-# Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD$
-
-print "#!/bin/csh\n";
-print "make deinstall clean\n";
-print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk ure languagepack deinstall >& log.en\n";
-print "bzip2 log.en\n";
-#print "rm work/.configure* work/.build* \n";
-#workaround for breakage at odk sdk_oo
-print "make deinstall clean\n";
-
-print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n";
-print "bzip2 log.all\n";
-
-open ( FILE,  "< Makefile.localized") ;
-while(<FILE>){
-@tmp=split (' ',$_);
-@tmp2=split ('"',$tmp[3]);
-if ( $tmp[0] eq ".if" && $tmp[1] eq "\${LOCALIZED_LANG}" ) { $LANG=$tmp2[1]; 
-	print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n";
-	print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes languagepack package package-rename deinstall >& log.$LANG\n";
-	print "bzip2 log.$LANG\n";
-	}
-}
-close FILE;
-$oootag= `cd ..; make -V OOOTAG2`;
-chomp($oootag);
-$md5sumname = "$oootag" . "_md5sums.txt";
-print "md5 OOo* > $md5sumname\n";
-
-$arc= `uname -m`;
-if ($arc == "amd64" ) {
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* $md5sumname build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86-64/\n";
-} else { 
-print "sudo -u `who am i | awk '{print \$1}'` ssh build.good-day.net mkdir -p /home/ftp/pub/OpenOffice.org/contrib/freebsdx86/\n";
-print "sudo -u `who am i | awk '{print \$1}'` scp OOo* $md5sumname build.good-day.net:/home/ftp/pub/OpenOffice.org/contrib/freebsdx86/\n";
-}
-- 
cgit v1.2.3