From 2f235b2e0abe75721cfdb50e6651ea6622c0e040 Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Mon, 4 Mar 2002 21:48:29 +0000
Subject: Update to 641c source build

---
 editors/openoffice/Makefile | 25 +++++++++++++------------
 editors/openoffice/distinfo |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'editors/openoffice')

diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 6c68d25c5f1f..8733e58525a4 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	6.0.641
+PORTVERSION=	641c
 CATEGORIES=	editors
-MASTER_SITES=	http://sf1.mirror.openoffice.org/641b/ \
+MASTER_SITES=	http://sf1.mirror.openoffice.org/641c/ \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/ \
 		ftp://ftp.netbsd.org/pub/NetBSD/misc/mrauch/ 
-DISTFILES=	oo_641_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
-EXTRACT_ONLY=	oo_641_src.tar.bz2
+DISTFILES=	oo_${PORTVERSION}_src.tar.bz2 gpc231.tar.Z oo_moz_641.tar.gz
+EXTRACT_ONLY=	oo_${PORTVERSION}_src.tar.bz2
 EXTRACT_REST=	gpc231.tar.Z oo_moz_641.tar.gz
 
 MAINTAINER=	mbr@FreeBSD.org
@@ -24,18 +24,18 @@ EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
 EXTRACT_CMD_R= ${GZIP_CMD}
 
 GCC_VERSION!=	${CC} --version
-JDK13DIR?=	${LOCALBASE}/jdk1.3.1
-JAVAVM=		${JDK13DIR}/bin/java
+JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
+JAVAVM=         ${JDK13DIR}/bin/java
 
-BUILD_DEPENDS=	stlport:${PORTSDIR}/devel/stlport
+BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison
 BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
-BUILD_DEPENDS+=	pth-config:${PORTSDIR}/devel/pth
+BUILD_DEPENDS+= pth-config:${PORTSDIR}/devel/pth
 
 GNU_CONFIGURE=	yes
-WRKSRC=	${WRKDIR}/oo_641_src/config_office
+WRKSRC=	${WRKDIR}/oo_${PORTVERSION}_src/config_office
 
 CONFIGURE_ARGS+=	--with-stlport4-home=${PREFIX} \
 			--with-jdk-home=${JDK13DIR}
@@ -80,10 +80,11 @@ post-extract:
 	${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/
 
 do-build:
-	@cd ${WRKDIR}/oo_641_src && ./bootstrap
-	@cd ${WRKDIR}/oo_641_src && /bin/tcsh -c 'source FreeBSDEnv.Set && dmake'
+	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
+	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
+		tcsh -c 'source FreeBSDEnv.Set && dmake'
 
 do-install:
-	@cd ${WRKDIR}/oo_641_src && ./setup -r:oo_setup.resp
+	@cd ${WRKSRC}/.. && ./setup -r:oo_setup.resp
 
 .include <bsd.port.post.mk>
diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo
index 8427c7bc977f..c06fd33343bd 100644
--- a/editors/openoffice/distinfo
+++ b/editors/openoffice/distinfo
@@ -1,3 +1,3 @@
-MD5 (oo_641_src.tar.bz2) = b3e380ede6b1c4248872ba57ccb1fac0
+MD5 (oo_641c_src.tar.bz2) = 937fbe2534da2cb95a941945553ba7c4
 MD5 (gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 MD5 (oo_moz_641.tar.gz) = 548568503c05c58f1e8f0c90bf3f75a9
-- 
cgit v1.2.3