summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--editors/openoffice-1.1-devel/Makefile8
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile8
2 files changed, 4 insertions, 12 deletions
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 4e7b05f6b731..08d7ab1b5fc8 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -35,7 +35,6 @@ USE_GNOME= orbit
.endif
USE_XLIB= yes
-USE_IMAKE= yes
USE_PERL5= yes
USE_BISON= yes
USE_GMAKE= yes
@@ -111,18 +110,15 @@ CXX= g++32
.endif
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip \
- gcp:${PORTSDIR}/sysutils/coreutils
+ gcp:${PORTSDIR}/sysutils/coreutils \
+ imake:${X_IMAKE_PORT}
.if defined(WITHOUT_JAVA)
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
-.else
-BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.endif
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
-ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
-UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 4e7b05f6b731..08d7ab1b5fc8 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -35,7 +35,6 @@ USE_GNOME= orbit
.endif
USE_XLIB= yes
-USE_IMAKE= yes
USE_PERL5= yes
USE_BISON= yes
USE_GMAKE= yes
@@ -111,18 +110,15 @@ CXX= g++32
.endif
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip \
- gcp:${PORTSDIR}/sysutils/coreutils
+ gcp:${PORTSDIR}/sysutils/coreutils \
+ imake:${X_IMAKE_PORT}
.if defined(WITHOUT_JAVA)
LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt
-.else
-BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant
.endif
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}
CONFIGURE_WRKSRC= ${WRKSRC}/config_office
-ANT?= ${LOCALBASE}/bin/ant
TCSH?= /bin/tcsh
-UNZIP?= ${PREFIX}/bin/unzip
PKGMESSAGE= ${WRKDIR}/pkg-message
NUMOFPROCESSES?= 1