summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjdolecek <jdolecek>2002-08-07 12:22:21 +0000
committerjdolecek <jdolecek>2002-08-07 12:22:21 +0000
commit2aa1d5f63e99863882702578df3fc4c9cb349562 (patch)
treebdecade19a0792d394042addfc5916b73d15ebed /misc
parent949852db0366399676f21fd0ce799a2b6b60441b (diff)
downloadpkgsrc-2aa1d5f63e99863882702578df3fc4c9cb349562.tar.gz
this package really requires sun-jdk13, won't build with sun-jdk14; set
PKG_JVM appropriately slight whitespace cleanup for do-build target
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index e04cda7fff4..6a9d6c272b5 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/08/03 15:11:40 jdolecek Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/07 12:22:21 jdolecek Exp $
DISTNAME= openoffice-0.0.0.641
PKGREVISION= 1
@@ -31,7 +31,7 @@ BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
BUILD_DEPENDS+= stlport>=4.0nb1:../../devel/stlport
USE_JAVA= build
-PKG_JVM= sun-jdk
+PKG_JVM= sun-jdk13
CONFLICTS= staroffice-[0-9]*
@@ -75,8 +75,8 @@ DISPLAY= ':2'
pre-build: checkforx
do-build:
- ${_ULIMIT_CMD}tcsh -c "setenv DISPLAY '${DISPLAY}'; cd ${WRKSRC}/..&& \
- ./bootstrap&& source *.Set&& dmake"
+ ${_ULIMIT_CMD}tcsh -c "setenv DISPLAY '${DISPLAY}'; \
+ cd ${WRKSRC}/.. && ./bootstrap && source *.Set && dmake"
pre-install: checkforx
${SH} -c "cd ${WRKSRC}/../instsetoo/*.pro/01/normal; \