freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

editors/openoffice-*: rm epm from BUILD_DEPENDS

Browse Source 
epm is not needed for building on FreeBSD, so remove it from
BUILD_DEPENDS.

Since the package is not changed, there is no PORT_REVISION bump.
This commit is contained in:
Don Lewis 2025-04-12 16:40:22 -07:00
parent 0db16b1766
commit 22a227eb90
3 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editors/openoffice-4/Makefile
View File

@ -56,7 +56,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 \
@ -258,7 +257,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 \

41
editors/openoffice-4/files/patch-configure.ac
View File

@ -1,32 +1,11 @@
--- configure.ac.orig 2019-11-12 05:10:21 UTC
--- configure.ac.orig 2025-04-12 20:16:51 UTC
+++ configure.ac
@@ -367,11 +367,11 @@ AC_ARG_WITH(bundled-extension-blobs,
and comply with their distribution requirements by updating the
files LICENSE_aggregated and NOTICE_aggregated accordingly
],,)
-#AC_ARG_WITH(bundled-prereg-extensions,
-#[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
-# are to be bundled as pre-registered extensions. Make sure to only bundle
-# extensions which can be installed without requiring a license dialog
-#],,)
+AC_ARG_WITH(bundled-prereg-extensions,
+[ --with-bundled-prereg-extensions Whitespace seperated list of files in the tarball directory that
+ are to be bundled as pre-registered extensions. Make sure to only bundle
+ extensions which can be installed without requiring a license dialog
+],,)
AC_ARG_ENABLE(bundled-dictionaries,
[ --enable-bundled-dictionaries Download dictionaries (spelling, hyphenation, thesaurus)
according to main/extensions.lst and bundle them. Make sure to
@@ -1538,9 +1538,9 @@ else
fi
AC_SUBST(BUNDLED_EXTENSION_BLOBS)
-#dnl ===================================================================
-#dnl Check extensions that are to be bundled as pre-registerd
-#dnl ===================================================================
+dnl ===================================================================
+dnl Check extensions that are to be bundled as pre-registerd
+dnl ===================================================================
if test -n "$with_bundled_prereg_extensions"; then
BUNDLED_PREREG_EXTENSIONS="$with_bundled_prereg_extensions"
else
@@ -3377,7 +3377,7 @@ if test "$enable_epm" = "yes"; then
dnl ===================================================================
dnl Check for epm - not needed for windows
dnl ===================================================================
- if test "$_os" != "WINNT"; then
+ if test "$_os" != "WINNT" -a "$with_package_format" != "archive"; then
if test -n "$with_epm"; then
EPM=$with_epm
else

2
editors/openoffice-devel/Makefile
View File

@ -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 \
@ -292,7 +291,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 \