aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2004-10-24 03:54:44 +0000
committerMaho Nakata <maho@FreeBSD.org>2004-10-24 03:54:44 +0000
commit44597bdbd241b363db6754da228043f5ebb7f32f (patch)
treefe4f8793c191eeb5c976eb520194b2ace3834176
parentf6ffb7500204a0a370e3bcd87b5b3fc834e60078 (diff)
downloadports-44597bdbd241b363db6754da228043f5ebb7f32f.tar.gz
ports-44597bdbd241b363db6754da228043f5ebb7f32f.zip
Notes
-rw-r--r--editors/openoffice-1.1-devel/Makefile17
-rw-r--r--editors/openoffice-1.1/Makefile20
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile17
-rw-r--r--editors/openoffice.org-1.1/Makefile20
4 files changed, 52 insertions, 22 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index b5323b1e22c9..27bad47e3276 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -36,8 +36,9 @@ USE_REINPLACE= yes
USE_BZIP2= yes
.if !defined(WITHOUT_JAVA)
-USE_JAVA= 1.4+
-NO_RUN_DEPENDS_JAVA= yes
+USE_JAVA= yes
+JAVA_VERSION= 1.4+
+JAVA_BUILD= jdk
.endif
.include <bsd.port.pre.mk>
@@ -72,8 +73,18 @@ RELEASE_NR= 1.1.4
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
DIST_SUBDIR= openoffice1.1
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
+
+# FIXME (Somehow INDEX build fails)
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX= ${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?= -${LANG_SUFFIX}
+.endif
+
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-# FIXME
+
+# FIXME (correctly add ccache before gcc and g++)
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
CC= ccache gcc32
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 60935c0e9cb9..6ff77b698952 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -38,8 +38,9 @@ USE_GMAKE= yes
USE_REINPLACE= yes
.if !defined(WITHOUT_JAVA)
-USE_JAVA= 1.4+
-NO_RUN_DEPENDS_JAVA= yes
+USE_JAVA= yes
+JAVA_VERSION= 1.4+
+JAVA_BUILD= jdk
.endif
.include <bsd.port.pre.mk>
@@ -74,15 +75,18 @@ RELEASE_NR= ${PORTVERSION}
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
DIST_SUBDIR= openoffice1.1
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX= ${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX?= -${LANG_SUFFIX}
+
+# FIXME (Somehow INDEX build fails)
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX= ${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?= -${LANG_SUFFIX}
.endif
+
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-# FIXME
+# FIXME (correctly add ccache before gcc and g++)
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
CC= ccache gcc32
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index b5323b1e22c9..27bad47e3276 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -36,8 +36,9 @@ USE_REINPLACE= yes
USE_BZIP2= yes
.if !defined(WITHOUT_JAVA)
-USE_JAVA= 1.4+
-NO_RUN_DEPENDS_JAVA= yes
+USE_JAVA= yes
+JAVA_VERSION= 1.4+
+JAVA_BUILD= jdk
.endif
.include <bsd.port.pre.mk>
@@ -72,8 +73,18 @@ RELEASE_NR= 1.1.4
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
DIST_SUBDIR= openoffice1.1
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
+
+# FIXME (Somehow INDEX build fails)
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX= ${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?= -${LANG_SUFFIX}
+.endif
+
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-# FIXME
+
+# FIXME (correctly add ccache before gcc and g++)
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
CC= ccache gcc32
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 60935c0e9cb9..6ff77b698952 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -38,8 +38,9 @@ USE_GMAKE= yes
USE_REINPLACE= yes
.if !defined(WITHOUT_JAVA)
-USE_JAVA= 1.4+
-NO_RUN_DEPENDS_JAVA= yes
+USE_JAVA= yes
+JAVA_VERSION= 1.4+
+JAVA_BUILD= jdk
.endif
.include <bsd.port.pre.mk>
@@ -74,15 +75,18 @@ RELEASE_NR= ${PORTVERSION}
INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR}
DIST_SUBDIR= openoffice1.1
SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//'
-.if defined(LANG_PKGNAME)
-PKGNAMEPREFIX= ${LANG_PKGNAME}-
-.endif
-.if defined(LANG_SUFFIX)
-PKGNAMESUFFIX?= -${LANG_SUFFIX}
+
+# FIXME (Somehow INDEX build fails)
+.if defined(LANG_PKGNAME)
+PKGNAMEPREFIX= ${LANG_PKGNAME}-
+.endif
+.if defined(LANG_SUFFIX)
+PKGNAMESUFFIX?= -${LANG_SUFFIX}
.endif
+
BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
-# FIXME
+# FIXME (correctly add ccache before gcc and g++)
.if defined(WITH_CCACHE)
BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache
CC= ccache gcc32