Date: Wed, 7 May 2025 08:54:58 GMT From: Don Lewis <truckman@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 22a227eb90fb - main - editors/openoffice-*: rm epm from BUILD_DEPENDS Message-ID: <202505070854.5478swFt060341@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=22a227eb90fb7ba896d3bbefd4ee567e0a9a2aec commit 22a227eb90fb7ba896d3bbefd4ee567e0a9a2aec Author: Don Lewis <truckman@FreeBSD.org> AuthorDate: 2025-04-12 23:40:22 +0000 Commit: Don Lewis <truckman@FreeBSD.org> CommitDate: 2025-05-07 08:54:48 +0000 editors/openoffice-*: rm epm from BUILD_DEPENDS 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. --- editors/openoffice-4/Makefile | 2 -- editors/openoffice-4/files/patch-configure.ac | 41 +++++++-------------------- editors/openoffice-devel/Makefile | 2 -- 3 files changed, 10 insertions(+), 35 deletions(-) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index a409dab4677a..6241cfb961e5 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -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 \ diff --git a/editors/openoffice-4/files/patch-configure.ac b/editors/openoffice-4/files/patch-configure.ac index 9340d7d40ccf..e7b392f1aea2 100644 --- a/editors/openoffice-4/files/patch-configure.ac +++ b/editors/openoffice-4/files/patch-configure.ac @@ -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 diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index f75a044d7623..573d7754ae6c 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -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 \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505070854.5478swFt060341>