Date: Wed, 25 Aug 2004 18:55:33 +0200 From: Oliver Lehmann <lehmann@ans-netz.de> To: maho@FreeBSD.org Cc: openoffice@freebsd.org Subject: Re: cvs commit: ports/editors/openoffice-1.1 Makefile ports/editors/openoffice-1.1-devel Makefile Message-ID: <20040825185533.18c13ec2.lehmann@ans-netz.de> In-Reply-To: <20040825181112.5c92255e.lehmann@ans-netz.de> References: <200408230313.i7N3DoRA055940@repoman.freebsd.org> <20040823072038.4148ddec.lehmann@ans-netz.de> <20040825181112.5c92255e.lehmann@ans-netz.de>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Oliver Lehmann wrote: > Oliver Lehmann wrote: > > apache-ant should be moved from general LIB_DEPENDS to: Ok, please find a patch attached for that (And some other) issues... I've just stated a build on a faster (celeron 900) system now... -- Oliver Lehmann http://www.pofo.de/ http://wishlist.ans-netz.de/ [-- Attachment #2 --] Index: Makefile =================================================================== RCS file: /home/pcvs/ports/editors/openoffice-1.1/Makefile,v retrieving revision 1.161 diff -u -r1.161 Makefile --- Makefile 24 Aug 2004 11:51:38 -0000 1.161 +++ Makefile 25 Aug 2004 16:53:34 -0000 @@ -21,14 +21,14 @@ ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \ http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help MASTER_SITE_SUBDIR= stable/${PORTVERSION} -DISTFILES+= OOo_${PORTVERSION}_source.tar.gz gpc231.tar.Z:gpc \ - patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz +DISTFILES+= OOo_${PORTVERSION}_source.tar.gz gpc231.tar.Z:gpc EXTRACT_ONLY= OOo_${PORTVERSION}_source.tar.gz MAINTAINER= openoffice@FreeBSD.org USE_GNOME= gtk20 .if !defined(WITHOUT_MOZILLA) +DISTFILES+= patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz USE_GNOME+= orbit gtk12 .endif @@ -89,7 +89,6 @@ BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ - ${ANT}:${PORTSDIR}/devel/apache-ant \ ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} @@ -100,6 +99,8 @@ freetype.9:${PORTSDIR}/print/freetype2 .if defined(WITHOUT_JAVA) LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt +.else +BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant .endif GNU_CONFIGURE= yes USE_AUTOCONF_VER= 259 @@ -231,12 +231,11 @@ fi .endif -.include <${FILESDIR}/Makefile.mozilla> - .if !defined(WITHOUT_MOZILLA) && ( \ !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIruntime.zip) || \ !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIlib.zip) || \ !exists(${WRKSRC}/../moz/zipped/FREEBSDGCCIinc.zip) ) +.include <${FILESDIR}/Makefile.mozilla> do-build: mozilla .else do-build:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040825185533.18c13ec2.lehmann>