From owner-freebsd-openoffice@FreeBSD.ORG Thu Dec 4 07:03:12 2003 Return-Path: Delivered-To: freebsd-openoffice@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF7F016A4CF; Thu, 4 Dec 2003 07:03:12 -0800 (PST) Received: from smtp.des.no (flood.des.no [217.116.83.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17C6743FDD; Thu, 4 Dec 2003 07:03:06 -0800 (PST) (envelope-from des@des.no) Received: by smtp.des.no (Pony Express, from userid 666) id 0089A530C; Thu, 4 Dec 2003 16:03:04 +0100 (CET) Received: from dwp.des.no (des.no [80.203.228.37]) by smtp.des.no (Pony Express) with ESMTP id E2E1C5308; Thu, 4 Dec 2003 16:02:56 +0100 (CET) Received: by dwp.des.no (Postfix, from userid 2602) id 93E9533C6A; Thu, 4 Dec 2003 16:02:56 +0100 (CET) To: portmgr@freebsd.org From: des@des.no (Dag-Erling =?iso-8859-1?q?Sm=F8rgrav?=) Date: Thu, 04 Dec 2003 16:02:56 +0100 Message-ID: User-Agent: Gnus/5.090024 (Oort Gnus v0.24) Emacs/21.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on flood.des.no X-Spam-Level: X-Spam-Status: No, hits=0.4 required=5.0 tests=RCVD_IN_SORBS,UPPERCASE_25_50 autolearn=no version=2.60 cc: openoffice@freebsd.org Subject: openoffice port is broken wrt gcc and java dependencies X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Dec 2003 15:03:13 -0000 --=-=-= Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Briefly, the problem is that: - openoffice-1.0 unconditionally requires gcc 3.2 from ports, even on systems which already have gcc 3.2 or newer in base - openoffice-1.0 and openoffice-1.1 use hardcoded paths and hand- crafted dependencies on specific Java ports instead of using the existing infrastructure to request a compatible Java version and obtain JAVA_HOME. I have previously submitted a patch addressing these issues, with no apparent result (though it seems the gcc issue has been fixed in openoffice-1.1). I've attached a copy of my patch, dated October 23rd (before the repocopy). It should still apply (possibly with minor modifications) to both openoffice-1.0 and openoffice-1.1 DES --=20 Dag-Erling Sm=F8rgrav - des@des.no --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=openoffice.diff Index: Makefile =================================================================== RCS file: /home/pcvs/ports/editors/openoffice/Makefile,v retrieving revision 1.183 diff -u -r1.183 Makefile --- Makefile 1 Oct 2003 05:53:01 -0000 1.183 +++ Makefile 23 Oct 2003 07:38:00 -0000 @@ -90,25 +90,19 @@ # # OO build is broken with the system gcc on STABLE. # +.if ${OSVERSION} < 501000 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 CC= gcc32 CXX= g++32 USE_GCC=3.2 +.endif EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.bz2 MAINTAINER= openoffice@FreeBSD.org COMMENT?= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser -# -# The JDK dependency needs to be at the first place, so all -# following dependencies use the same JDK. -# -.if !defined(WITH_BSD_JDK) -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13 -.else -BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13 -.endif +USE_JAVA= 1.3+ #.if !defined(USE_GCC) #BUILD_DEPENDS= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport @@ -137,13 +131,6 @@ EXTRACT_CMD_R= ${GZIP_CMD} EXTRACT_REST= gpc231.tar.Z -.if !defined(WITH_BSD_JDK) -JDK13DIR?= ${LOCALBASE}/linux-sun-jdk1.3.1 -.else -JDK13DIR?= ${LOCALBASE}/jdk1.3.1 -.endif -JAVAVM= ${JDK13DIR}/bin/java - GNU_CONFIGURE= yes USE_AUTOCONF= yes WANT_AUTOCONF_VER= 253 @@ -169,7 +156,7 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} -CONFIGURE_ARGS+= --with-jdk-home=${JDK13DIR} \ +CONFIGURE_ARGS+= --with-jdk-home=${JAVA_HOME} \ --with-os-version=${OSVERSION} \ --with-ant-home=${LOCALBASE} --=-=-=--