git: 1e7b7d4e9ea7 - main - mail/mu4e: Remove port

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Tue, 21 Oct 2025 22:03:49 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1e7b7d4e9ea7a9844215f86958d490f6cf4e3884

commit 1e7b7d4e9ea7a9844215f86958d490f6cf4e3884
Author:     RwN <rwn@mailo.com>
AuthorDate: 2025-10-21 21:58:29 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-10-21 22:03:02 +0000

    mail/mu4e: Remove port
    
    mu4e has become integrated as default to its backend port mail/mu. So
    point users of mail/mu4e to mail/mu.
    
    PR:             289593
    Reported by:    RwN <rwn@mailo.com>
    Tested by:      Trenton Schulz <trueos@norwegianrockcat.com>
    Approved by:    hrs (maintainer, timeout >5 weeks)
---
 MOVED                                  |   1 +
 mail/mu4e/Makefile                     |  50 -------------
 mail/mu4e/distinfo                     |   3 -
 mail/mu4e/files/byte-compile.mk        |  17 -----
 mail/mu4e/files/patch-configure.ac     | 133 ---------------------------------
 mail/mu4e/files/patch-mu4e_Makefile.am |  11 ---
 mail/mu4e/pkg-descr                    |   2 -
 mail/mu4e/pkg-plist                    |  51 -------------
 8 files changed, 1 insertion(+), 267 deletions(-)

diff --git a/MOVED b/MOVED
index 27dcbf9b55f8..d279225c783a 100644
--- a/MOVED
+++ b/MOVED
@@ -4826,3 +4826,4 @@ textproc/rubygem-cucumber-gherkin30|textproc/rubygem-cucumber-gherkin|2025-10-18
 textproc/rubygem-cucumber-gherkin32|textproc/rubygem-cucumber-gherkin|2025-10-18|Remove obsoleted port. Use textproc/rubygem-cucumber-gherkin instead
 devel/gocritic|devel/go-critic|2025-10-19|Commands renamed up stream
 net/asterisk18||2025-10-21|Has expired: Migrate to newer asterisk, security support ends soon
+mail/mu4e|mail/mu|2025-10-21|Becomes integrated as default to its backend port mail/mu
diff --git a/mail/mu4e/Makefile b/mail/mu4e/Makefile
deleted file mode 100644
index 5ba88a110e77..000000000000
--- a/mail/mu4e/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-PORTNAME=	mu4e
-PORTVERSION=	1.8.13
-PORTREVISION=	12
-DISTVERSIONPREFIX=	v
-CATEGORIES=	mail
-PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
-
-MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	Emacs frontend for Mu
-WWW=		https://www.djcbsoftware.nl/code/mu/
-
-LICENSE=	GPLv3+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-RUN_DEPENDS=	mu:mail/mu
-
-USES=		autoreconf emacs makeinfo pkgconfig
-USE_GITHUB=	yes
-GH_PROJECT=	mu
-GH_ACCOUNT=	djcb
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-guile \
-		--disable-readline \
-		--docdir="${DOCSDIR}" \
-		--enable-mu4e
-INFO=		${PORTNAME}
-BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
-INSTALL_WRKSRC=	${WRKSRC}/${PORTNAME}
-INSTALL_TARGET=	install-strip
-
-MAKE_JOBS_UNSAFE=	yes
-
-OPTIONS_DEFINE=		DOCS
-OPTIONS_SUB=		yes
-
-post-extract:
-	${INSTALL_DATA} ${WRKSRC}/mu4e/obsolete/org-mu4e.el \
-	    ${WRKSRC}/mu4e/org-mu4e.el
-
-post-configure:
-	${REINPLACE_CMD} -e '/.el.elc/,/^$$/d' ${BUILD_WRKSRC}/Makefile && \
-	    ${ECHO_CMD} '.include "${FILESDIR}/byte-compile.mk"' \
-	    >> ${BUILD_WRKSRC}/Makefile
-
-post-install:
-	cd ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/mu4e && \
-	    ${GZIP_CMD} *.el
-
-.include <bsd.port.mk>
diff --git a/mail/mu4e/distinfo b/mail/mu4e/distinfo
deleted file mode 100644
index d673f70428d6..000000000000
--- a/mail/mu4e/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1672775272
-SHA256 (djcb-mu-v1.8.13_GH0.tar.gz) = bb95143f6b153637c3d2551b81d82a04fea0227aa470df863abfa4e2b6474e7e
-SIZE (djcb-mu-v1.8.13_GH0.tar.gz) = 734397
diff --git a/mail/mu4e/files/byte-compile.mk b/mail/mu4e/files/byte-compile.mk
deleted file mode 100644
index 134dc98e9f46..000000000000
--- a/mail/mu4e/files/byte-compile.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-.el.elc:
-	if test '$(EMACS)' != no; then \
-	  am__dir=. am__subdir_includes=''; \
-	  case $@ in */*) \
-	    am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
-	    am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
-	  esac; \
-	  test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
-	  $(EMACS) --batch \
-	    $(AM_ELCFLAGS) $(ELCFLAGS) \
-	    $$am__subdir_includes -L $(builddir) -L $(srcdir) \
-	    --eval '(setq byte-compile-dest-file-function (lambda (_) "/tmp/$@"))' \
-	    -f batch-byte-compile '$<'; \
-	    if [ -f "/tmp/$@" ]; then \
-		cp /tmp/$@ $@ && rm -f /tmp/$@; \
-	    fi; \
-	else :; fi
diff --git a/mail/mu4e/files/patch-configure.ac b/mail/mu4e/files/patch-configure.ac
deleted file mode 100644
index 55d9363fc128..000000000000
--- a/mail/mu4e/files/patch-configure.ac
+++ /dev/null
@@ -1,133 +0,0 @@
---- configure.ac.orig	2022-12-06 08:23:41 UTC
-+++ configure.ac
-@@ -34,11 +34,11 @@ AC_SUBST(prefix)
- 
- # AC_PROG_CXX *before* AC_PROG_CC, otherwise configure won't error out
- # when a c++ compiler is not found. Weird, huh?
--AC_PROG_CXX
--AC_PROG_CC
--AC_PROG_CPP
-+#AC_PROG_CXX
-+#AC_PROG_CC
-+#AC_PROG_CPP
- AC_PROG_INSTALL
--AC_CHECK_INCLUDES_DEFAULT
-+#AC_CHECK_INCLUDES_DEFAULT
- AC_PROG_EGREP
- 
- 
-@@ -49,22 +49,22 @@ extra_flags="-Wformat-security		\
-          -Wno-bad-function-cast		\
- 	 -Wno-switch-enum"
- 
--AX_CXX_COMPILE_STDCXX_17
--AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])
--AX_APPEND_COMPILE_FLAGS([-Wno-inline],[CXXFLAGS])
--AX_VALGRIND_CHECK
-+#AX_CXX_COMPILE_STDCXX_17
-+#AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])
-+#AX_APPEND_COMPILE_FLAGS([-Wno-inline],[CXXFLAGS])
-+#AX_VALGRIND_CHECK
- 
--LT_INIT
-+#LT_INIT
- 
- AX_CODE_COVERAGE
- 
- AC_PROG_AWK
- AC_CHECK_PROG(SORT,sort,sort)
- 
--AC_CHECK_HEADERS([wordexp.h])
-+#AC_CHECK_HEADERS([wordexp.h])
- 
- # use the 64-bit versions
--AC_SYS_LARGEFILE
-+#AC_SYS_LARGEFILE
- 
- # asan is somewhat similar to valgrind, but has low enough overhead so it
- # can be used during normal operation.
-@@ -134,52 +134,22 @@ PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroo
- m4_ifndef([PKG_PROG_PKG_CONFIG],
-    [m4_fatal([please install pkg-config >= 0.28 before running autoconf/autogen])])
- PKG_PROG_PKG_CONFIG(0.28) # latest version in buildroot
--AS_IF([test -z "$PKG_CONFIG"],
-+AS_IF([test -z "$PKG_CONFIG"],[
-    AC_MSG_ERROR([
-    *** pkg-config with version >= 0.28 could not be found.
-    ***
-    *** Make sure it is in your path, or set the PKG_CONFIG environment variable
-    *** to the full path to pkg-config.])
--)
-+])
- 
- # glib2?
--PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)
--glib_version="$($PKG_CONFIG --modversion glib-2.0)"
-+# PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.58 gobject-2.0 gio-2.0)
-+# glib_version="$($PKG_CONFIG --modversion glib-2.0)"
- 
- # gmime, version 3.0 or higher
--PKG_CHECK_MODULES(GMIME,gmime-3.0)
--gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
-+# PKG_CHECK_MODULES(GMIME,gmime-3.0)
-+# gmime_version="$($PKG_CONFIG --modversion gmime-3.0)"
- 
--# xapian checking - we need 1.4 at least
--PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
--  have_xapian=yes
--  xapian_version=$($PKG_CONFIG xapian-core --modversion)
--  AC_SUBST(XAPIAN_CXXFLAGS,${XAPIAN_CFLAGS})
--],[
--  # fall back to the xapian-config script. Not sure if there are cases where the
--  # pkgconfig does not work, but xapian-config does, so keep this for now.
--  AC_MSG_NOTICE([falling back to xapian-config])
--  AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
--  AS_IF([test "x$XAPIAN_CONFIG" = "xno"],[
--     AC_MSG_ERROR([
--     *** xapian could not be found; please install it
--     *** e.g., in debian/ubuntu the package would be 'libxapian-dev'
--     *** If you compiled it yourself, you should ensure that xapian-config
--     *** is in your PATH.])],
--     [xapian_version=$($XAPIAN_CONFIG --version | sed -e 's/.* //')])
--
--  AS_CASE([$xapian_version],
--      [1.[[4-9]].[[0-9]]*],
--    [AC_MSG_NOTICE([xapian $xapian_version found.])],
--    [AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
--
--  XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
--  XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
--  have_xapian="yes"
--
--  AC_SUBST(XAPIAN_CXXFLAGS)
--  AC_SUBST(XAPIAN_LIBS)
--])
- ###############################################################################
- # we set the set the version of the MuStore (Xapian database) layout
- # here; it will become part of the db name, so we can automatically
-@@ -247,24 +217,10 @@ Makefile
- 
- AC_CONFIG_FILES([
- Makefile
--mu/Makefile
--lib/Makefile
--lib/doxyfile
--lib/thirdparty/Makefile
--lib/utils/Makefile
--lib/message/Makefile
--lib/index/Makefile
- mu4e/Makefile
- mu4e/mu4e-config.el
--guile/Makefile
--guile/mu/Makefile
--guile/examples/Makefile
--guile/scripts/Makefile
--man/Makefile
--m4/Makefile
--contrib/Makefile
- ])
--AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck])
-+# AC_CONFIG_FILES([mu/mu-memcheck], [chmod +x mu/mu-memcheck])
- 
- AC_OUTPUT
- 
diff --git a/mail/mu4e/files/patch-mu4e_Makefile.am b/mail/mu4e/files/patch-mu4e_Makefile.am
deleted file mode 100644
index caae4391af09..000000000000
--- a/mail/mu4e/files/patch-mu4e_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- mu4e/Makefile.am.orig	2021-08-21 13:27:15 UTC
-+++ mu4e/Makefile.am
-@@ -44,7 +44,7 @@ dist_lisp_LISP=			\
- 	mu4e-view-gnus.el	\
- 	mu4e-view-old.el	\
- 	mu4e.el			\
--	obsolete/org-mu4e.el
-+	org-mu4e.el
- 
- 
- EXTRA_DIST=			\
diff --git a/mail/mu4e/pkg-descr b/mail/mu4e/pkg-descr
deleted file mode 100644
index d96ff2835bc5..000000000000
--- a/mail/mu4e/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-mu4e is an Emacs frontend for mu, a tool for dealing with e-mail
-messages stored in the Maildir-format, on Unix-like systems.
diff --git a/mail/mu4e/pkg-plist b/mail/mu4e/pkg-plist
deleted file mode 100644
index e4e363322331..000000000000
--- a/mail/mu4e/pkg-plist
+++ /dev/null
@@ -1,51 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/mu4e-about.org
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-actions.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-bookmarks.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-bookmarks.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-compose.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-config.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-config.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contacts.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contacts.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-context.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-contrib.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-draft.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-folders.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-folders.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-headers.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-helpers.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-helpers.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-icalendar.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-lists.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-main.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-mark.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-message.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-org.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-search.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-search.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-server.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-server.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-speedbar.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-update.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-update.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-vars.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e-view.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/mu4e.elc
-%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.el.gz
-%%EMACS_SITE_LISPDIR%%/mu4e/org-mu4e.elc