diff options
| author | maho <maho@FreeBSD.org> | 2004-10-24 03:54:44 +0000 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2004-10-24 03:54:44 +0000 |
| commit | fcb58a1d3e2001a04dbf77fa0c7c07758b5e275d (patch) | |
| tree | 6940d0cafbadb466d05567e397da89808f0b4d7f | |
| parent | 5475b5e39a35f2ea258d6b1aac165d379ed6e798 (diff) | |
| download | FreeBSD-ports-fcb58a1d3e2001a04dbf77fa0c7c07758b5e275d.zip FreeBSD-ports-fcb58a1d3e2001a04dbf77fa0c7c07758b5e275d.tar.gz | |
[1] Use bsd.java.mk 2.0 features
[2] Cosmetic clean ups (still portlint complains, though)
PR: 71451 [1]
Submitted by: hq [1]
| -rw-r--r-- | editors/openoffice-1.1-devel/Makefile | 17 | ||||
| -rw-r--r-- | editors/openoffice-1.1/Makefile | 20 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1-devel/Makefile | 17 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1/Makefile | 20 |
4 files changed, 52 insertions, 22 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index b5323b1..27bad47 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 60935c0..6ff77b6 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 b5323b1..27bad47 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 60935c0..6ff77b6 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 |
