summaryrefslogtreecommitdiff
path: root/editors/openoffice-devel/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice-devel/Makefile')
-rw-r--r--editors/openoffice-devel/Makefile15
1 files changed, 9 insertions, 6 deletions
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index f75a044d7623..3394cae01a69 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION= 4
+PORTREVISION= 1
PORTEPOCH= 4
CATEGORIES= editors java
MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
@@ -57,7 +57,6 @@ BUILD_DEPENDS= \
zip:archivers/zip \
ant:devel/apache-ant \
dmake:devel/dmake \
- epm:devel/epm \
${LOCALBASE}/bin/gperf:devel/gperf \
imake:devel/imake \
libunwind>=20211201_1:devel/libunwind \
@@ -127,9 +126,9 @@ AOOVERSION1= 4
AOOVERSION2= 2
AOOVERSION3= 0
# From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD
-AOOTAG= AOO420m4\(Build:9823\)
-GITREVISION= 98a91fccb4
-TIMESTAMP= 1731847285
+AOOTAG= AOO420m6\(Build:9825\)
+GITREVISION= 518a110c8f
+TIMESTAMP= 1750013453
#AOORC=rc3
EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz
@@ -227,6 +226,11 @@ WITH= SDK
.include <bsd.port.pre.mk>
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000
+# nm: '../unxfbsdi.pro/slo/b2dcubicbezier.o': Invalid argument
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nm
+.endif
+
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-symbols
.else
@@ -292,7 +296,6 @@ CONFIGURE_ARGS+= \
--with-system-coinmp \
--with-system-curl \
--with-system-dicts \
- --with-epm=${LOCALBASE}/bin/epm \
--with-system-expat \
--disable-fetch-external \
--without-fonts \