pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

mailutils: major package overhaul; removed TODO.

Module Name:	pkgsrc-wip
Committed By:	Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By:	vms
Date:		Sun Dec 11 11:19:53 2022 +0100
Changeset:	9b8c3267a7ad3605b1cbc50fd3337ced7a101872

Modified Files:
	mailutils/Makefile
	mailutils/PLIST
	mailutils/distinfo
Added Files:
	mailutils/options.mk
	mailutils/patches/patch-lib_tcpwrap.c
Removed Files:
	mailutils/TODO

Log Message:
mailutils: major package overhaul; removed TODO.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9b8c3267a7ad3605b1cbc50fd3337ced7a101872

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mailutils/Makefile                    |  40 ++++++--
 mailutils/PLIST                       | 168 +++++++++++++++++++++++++++-------
 mailutils/TODO                        |  15 ---
 mailutils/distinfo                    |   1 +
 mailutils/options.mk                  | 160 ++++++++++++++++++++++++++++++++
 mailutils/patches/patch-lib_tcpwrap.c |  19 ++++
 6 files changed, 346 insertions(+), 57 deletions(-)

diffs:
diff --git a/mailutils/Makefile b/mailutils/Makefile
index 66e887009d..2d2b6989ed 100644
--- a/mailutils/Makefile
+++ b/mailutils/Makefile
@@ -9,21 +9,32 @@ HOMEPAGE=	https://mailutils.org/
 COMMENT=	Utilities, daemons, and filters for processing e-mail
 LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
-USE_TOOLS+=	gmake
+CONFLICTS+=	elm-[0-9]*		# bin/frm
+CONFLICTS+=	avenger-[0-9]*		# bin/dotlock
+
+USE_TOOLS+=	gmake yacc
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 
+.include "../../mk/bsd.fast.prefs.mk"
+
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--without-gnutls
-CONFIGURE_ARGS+=	--disable-python
-CONFIGURE_ARGS+=	--without-guile
-CONFIGURE_ARGS+=	--without-gdbm
-CONFIGURE_ARGS+=	--without-tcp-wrappers
-CONFIGURE_ARGS+=	--without-ldap
+CONFIGURE_ARGS+=	--infodir=${PREFIX}/${PKGINFODIR}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	--docdir=${PREFIX}/${DOCDIR}
+CONFIGURE_ARGS+=	--with-mh-bindir=${PREFIX}/libexec/${PKGBASE}
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--with-mail-spool=/var/spool/mail
+.else
+CONFIGURE_ARGS+=	--with-mail-spool=/var/mail
+.endif
+CONFIGURE_ARGS+=	--enable-virtual-domains
+CONFIGURE_ARGS+=	--enable-mh
 
-INFO_FILES=	yes
+PKG_DOCS=	AUTHORS ChangeLog NEWS README* THANKS TODO
+DOCDIR=		share/doc/${PKGBASE}
 
 SUBST_CLASSES+=		iconv
 SUBST_STAGE.iconv=	pre-configure
@@ -31,6 +42,17 @@ SUBST_MESSAGE.iconv=	Do not require lib/charset.alias.
 SUBST_FILES.iconv+=	lib/gnu/Makefile.in
 SUBST_SED.iconv=	-e '/need_charset_alias=/s|true|false|'
 
+.include "options.mk"
+
+INFO_FILES=		yes
+INSTALLATION_DIRS+=	${DOCDIR}
+
+post-install:
+#set-gid files should not be writable by anyone
+	${RUN}${CHMOD} -w ${DESTDIR}${PREFIX}/bin/dotlock
+	${INSTALL_DATA} ${PKG_DOCS:S|^|${WRKSRC}/|} 		\
+		${DESTDIR}${PREFIX}/${DOCDIR}
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
diff --git a/mailutils/PLIST b/mailutils/PLIST
index 04540b3a70..d3a90ca424 100644
--- a/mailutils/PLIST
+++ b/mailutils/PLIST
@@ -3,47 +3,19 @@ bin/decodemail
 bin/dotlock
 bin/frm
 bin/from
+${PLIST.guile}bin/guimb
 bin/mail
 bin/mailutils
 bin/mailutils-config
 bin/messages
 bin/mimeview
 bin/movemail
-bin/mu-mh/ali
-bin/mu-mh/anno
-bin/mu-mh/burst
-bin/mu-mh/comp
-bin/mu-mh/fmtcheck
-bin/mu-mh/folder
-bin/mu-mh/folders
-bin/mu-mh/forw
-bin/mu-mh/inc
-bin/mu-mh/install-mh
-bin/mu-mh/mark
-bin/mu-mh/mhl
-bin/mu-mh/mhn
-bin/mu-mh/mhparam
-bin/mu-mh/mhpath
-bin/mu-mh/mhseq
-bin/mu-mh/msgchk
-bin/mu-mh/next
-bin/mu-mh/pick
-bin/mu-mh/prev
-bin/mu-mh/prompter
-bin/mu-mh/refile
-bin/mu-mh/repl
-bin/mu-mh/rmf
-bin/mu-mh/rmm
-bin/mu-mh/scan
-bin/mu-mh/send
-bin/mu-mh/show
-bin/mu-mh/sortm
-bin/mu-mh/whatnow
-bin/mu-mh/whom
 bin/popauth
 bin/putmail
 bin/readmsg
 bin/sieve
+${PLIST.guile}guile/3.0/share/guile/site/3.0/mailutils/guile-procedures.txt
+${PLIST.guile}guile/3.0/share/guile/site/3.0/mailutils/mailutils.scm
 include/mailutils/acl.h
 include/mailutils/address.h
 include/mailutils/alloc.h
@@ -177,6 +149,7 @@ include/mailutils/version.h
 include/mailutils/wordsplit.h
 include/mailutils/yyloc.h
 info/mailutils.info
+${PLIST.guile}lib/libguile-mailutils-v-3.15.so
 lib/libmailutils.la
 lib/libmu_auth.la
 lib/libmu_dbm.la
@@ -187,6 +160,16 @@ lib/libmu_mailer.la
 lib/libmu_mbox.la
 lib/libmu_mh.la
 lib/libmu_pop.la
+${PLIST.python}lib/libmu_py.a
+${PLIST.python}lib/libmu_py.la
+${PLIST.python}lib/libmu_py.so
+${PLIST.python}lib/libmu_py.so.9
+${PLIST.python}lib/libmu_py.so.9.0.0
+${PLIST.guile}lib/libmu_scm.a
+${PLIST.guile}lib/libmu_scm.la
+${PLIST.guile}lib/libmu_scm.so
+${PLIST.guile}lib/libmu_scm.so.9
+${PLIST.guile}lib/libmu_scm.so.9.0.0
 lib/libmu_sieve.la
 lib/libmuaux.la
 lib/mailutils/editheader.la
@@ -197,6 +180,16 @@ lib/mailutils/pipe.la
 lib/mailutils/spamd.la
 lib/mailutils/timestamp.la
 lib/mailutils/vacation.la
+libexec/mailutils/ali
+libexec/mailutils/anno
+libexec/mailutils/burst
+libexec/mailutils/comp
+libexec/mailutils/fmtcheck
+libexec/mailutils/folder
+libexec/mailutils/folders
+libexec/mailutils/forw
+libexec/mailutils/inc
+libexec/mailutils/install-mh
 libexec/mailutils/mailutils-acl
 libexec/mailutils/mailutils-cflags
 libexec/mailutils/mailutils-dbm
@@ -213,6 +206,27 @@ libexec/mailutils/mailutils-send
 libexec/mailutils/mailutils-smtp
 libexec/mailutils/mailutils-stat
 libexec/mailutils/mailutils-wicket
+libexec/mailutils/mark
+libexec/mailutils/mhl
+libexec/mailutils/mhn
+libexec/mailutils/mhparam
+libexec/mailutils/mhpath
+libexec/mailutils/mhseq
+libexec/mailutils/msgchk
+libexec/mailutils/next
+libexec/mailutils/pick
+libexec/mailutils/prev
+libexec/mailutils/prompter
+libexec/mailutils/refile
+libexec/mailutils/repl
+libexec/mailutils/rmf
+libexec/mailutils/rmm
+libexec/mailutils/scan
+libexec/mailutils/send
+libexec/mailutils/show
+libexec/mailutils/sortm
+libexec/mailutils/whatnow
+libexec/mailutils/whom
 man/man1/imap4d.1
 man/man1/mail.1
 man/man1/pop3d.1
@@ -223,8 +237,29 @@ sbin/lmtpd
 sbin/mda
 sbin/pop3d
 share/aclocal/mailutils.m4
-share/emacs/site-lisp/mailutils-mh.el
-share/emacs/site-lisp/mailutils-mh.elc
+share/doc/mailutils/AUTHORS
+share/doc/mailutils/ChangeLog
+share/doc/mailutils/NEWS
+share/doc/mailutils/README
+share/doc/mailutils/THANKS
+share/doc/mailutils/TODO
+${PLIST.emacs}share/emacs/site-lisp/mailutils-mh.el
+${PLIST.emacs}share/emacs/site-lisp/mailutils-mh.elc
+${PLIST.nls}share/locale/ca/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/da/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/fi/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/id/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/sr/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/mailutils.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/mailutils.mo
 share/mailutils/mh/components
 share/mailutils/mh/forwcomps
 share/mailutils/mh/mailutils-mh.el
@@ -240,3 +275,70 @@ share/mailutils/mh/scan.mailx
 share/mailutils/mh/scan.size
 share/mailutils/mh/scan.time
 share/mailutils/mh/scan.timely
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__init__.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/__init__.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/__init__.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/address.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/address.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/attribute.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/attribute.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/auth.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/auth.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/body.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/body.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/envelope.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/envelope.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/error.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/error.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/filter.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/filter.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/folder.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/folder.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/header.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/header.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/mailbox.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/mailbox.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/mailcap.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/mailcap.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/mailer.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/mailer.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/message.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/message.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/mime.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/mime.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/nls.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/nls.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/registrar.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/registrar.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/secret.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/secret.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/sieve.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/sieve.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/stream.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/stream.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/url.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/url.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/util.cpython-310.opt-1.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/__pycache__/util.cpython-310.pyc
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/address.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/attribute.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/auth.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/body.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/c_api.la
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/envelope.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/error.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/filter.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/folder.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/header.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/mailbox.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/mailcap.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/mailer.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/message.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/mime.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/nls.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/registrar.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/secret.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/sieve.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/stream.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/url.py
+${PLIST.python}lib/python${PYVERSSUFFIX}/site-packages/mailutils/util.py
diff --git a/mailutils/TODO b/mailutils/TODO
deleted file mode 100644
index 96e64dbdb6..0000000000
--- a/mailutils/TODO
+++ /dev/null
@@ -1,15 +0,0 @@
--  The bin/ directory should not have subdirectories.
-   A possible workaround would be to install bin/mh/* executables in
-   ${PREFIX}/mh/bin and symlink the folder to ${PREFIX}/bin. 
-
-- Patch for libwrap missing `allow_severity', `deny_severity' ints. 
-  This would fix building with TCP wrappers. Include <tcpd.h> where
-  needed.
-
-- Add options.mk to handle: 
-* Python/C++/Guile parsing (disabled by default). I would have included
-  C++ support, but it's marked as experimental in more recent versions. 
-* GnuTLS/SASL (enabled by default). Currently disabled in the Makefile.
-* GDBM (disabled by default)
-* LDAP (disabled by default)
-* NLS (disabled by default). Probably requires a PLIST.NLS.
diff --git a/mailutils/distinfo b/mailutils/distinfo
index 2f406e345a..c9ecb2b690 100644
--- a/mailutils/distinfo
+++ b/mailutils/distinfo
@@ -4,3 +4,4 @@ BLAKE2s (mailutils-3.15.tar.gz) = 7d43b6ee9d826345421bec5173010ad8706966e694eae7
 SHA512 (mailutils-3.15.tar.gz) = 418d9a657caf583ae1b9060a9ea8dcb1bf88965af3cc6d1e4558b6c3cb3e14cec181913335168e22b4870546d717945ada3de58892ccf0572c02424c50199bf1
 Size (mailutils-3.15.tar.gz) = 7453542 bytes
 SHA1 (patch-frm_frm.h) = 8ed8ae4b64b3b6b30d0572d06b35165b2e1d7e3e
+SHA1 (patch-lib_tcpwrap.c) = a0133dd8726ca08f5c194c583a638bb318f08a76
diff --git a/mailutils/options.mk b/mailutils/options.mk
new file mode 100644
index 0000000000..35f994c394
--- /dev/null
+++ b/mailutils/options.mk
@@ -0,0 +1,160 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mailutils
+
+PKG_OPTIONS_REQUIRED_GROUPS=	dbm
+PKG_OPTIONS_GROUP.dbm=		ndbm bdb gdbm
+
+PKG_SUPPORTED_OPTIONS+=	bdb emacs fribidi gdbm gnutls gsasl gssapi
+PKG_SUPPORTED_OPTIONS+=	guile ldap mysql ndbm nls pgsql python
+PKG_SUGGESTED_OPTIONS=	gnutls gsasl gssapi
+
+.if exists(/usr/include/ndbm.h) && (${OPSYS:M*BSD} != "" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly")
+PKG_SUGGESTED_OPTIONS+=	ndbm
+.else
+PKG_SUGGESTED_OPTIONS+=	gdbm
+.endif
+
+PLIST_VARS+=		emacs guile nls python
+
+.include "../../mk/bsd.options.mk"
+
+# UNIX databases
+## New DBM
+.if !empty(PKG_OPTIONS:Mndbm)
+CONFIGURE_ARGS+=	--with-ndbm
+.else
+CONFIGURE_ARGS+=    	--without-ndbm
+.endif
+## Berkeley DB
+.if !empty(PKG_OPTIONS:Mbdb)
+BDB_ACCEPTED=		db3 db4 db5 db6
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.  include "../../mk/bdb.buildlink3.mk"
+CONFIGURE_ARGS+=        --with-berkeley-db=${BDB_TYPE}
+.else
+CONFIGURE_ARGS+=	--without-berkeley-db
+.endif
+# GDBM
+.if !empty(PKG_OPTIONS:Mgdbm)
+.  include "../../databases/gdbm/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gdbm
+.else
+CONFIGURE_ARGS+=    	--without-gdbm
+.endif
+
+# Native Language Support
+.if	!empty(PKG_OPTIONS:Mnls)
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt msgmerge xgettext
+CONFIGURE_ARGS+=	--enable-nls
+CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
+CONFIGURE_ENV+=		gt_cv_func_gnugettext_libintl=yes
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/gettext-tools/buildlink3.mk"
+PLIST.nls=		yes
+.else
+CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=	--without-libintl-prefix
+.endif
+
+# GSSAPI (Kerberos5) authentication
+.if !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-gssapi==${KRB5BASE:Q}
+CONFIGURE_ENV+=		GSSAPI_IMPL=${GSSIMPL.${KRB5_TYPE}}
+GSSIMPL.heimdal=	heimdal
+GSSIMPL.mit-krb5=	mit
+.else
+CONFIGURE_ARGS+=       --without-gssapi
+.endif
+
+# GnuTLS
+.if !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=    --with-gnutls
+.else
+CONFIGURE_ARGS+=    --without-gnutls
+.endif
+
+# GNUsasl
+.if !empty(PKG_OPTIONS:Mgsasl)
+.  include "../../security/gsasl/buildlink3.mk"
+CONFIGURE_ARGS+=    --with-gsasl
+.else
+CONFIGURE_ARGS+=    --without-gsasl
+.endif
+
+# EmacsLisp
+.if !empty(PKG_OPTIONS:Memacs)
+.include "../../editors/emacs/modules.mk"
+CONFIGURE_ENV+=			ac_cv_prog_EMACS=${EMACS_BIN:Q}
+PKGSRC_MAKE_ENV+=		EMACS=${EMACS:Q}
+CONFIGURE_ARGS+=    		--with-lispdir=${EMACS_LISPPREFIX:Q}
+PLIST.emacs=			yes
+.else
+CONFIGURE_ENV+=			ac_cv_prog_EMACS=no
+PKGSRC_MAKE_ENV+=		EMACS=${FALSE:Q}
+.endif
+
+# MySQL
+.if !empty(PKG_OPTIONS:Mmysql)
+.  include "../../mk/mysql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
+LDFLAGS+=		${BUILDLINK_LDFLAGS.mysql-client}
+.else
+CONFIGURE_ARGS+=	--without-mysql
+.endif
+
+# PostgreSQL
+.if !empty(PKG_OPTIONS:Mpgsql)
+.  include "../../mk/pgsql.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-postgres
+.else
+CONFIGURE_ARGS+=    	--without-postgres
+.endif
+
+# LDAP
+.if !empty(PKG_OPTIONS:Mldap)
+.  include "../../databases/openldap-client/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ldap
+LDFLAGS+=		${BUILDLINK_LDFLAGS.openldap-client}
+.else
+CONFIGURE_ARGS+=    	--without-ldap
+.endif
+
+# GNU FriBidi
+.if !empty(PKG_OPTIONS:Mfribidi)
+.  include "../../converters/fribidi/buildlink3.mk"
+CONFIGURE_ARGS+=    --with-fribidi
+.else
+CONFIGURE_ARGS+=    --without-fribidi
+.endif
+
+# GNU Guile
+.if !empty(PKG_OPTIONS:Mguile)
+USE_TOOLS+=		makeinfo pkg-config
+.  include "../../lang/guile30/buildlink3.mk"
+CONFIGURE_ARGS+=    	--with-guile
+PLIST.guile=      	yes
+.else
+CONFIGURE_ARGS+=	--without-guile
+.endif
+
+# Python
+.if !empty(PKG_OPTIONS:Mpython)
+PYTHON_VERSIONS_INCOMPATIBLE=	  27
+.include "../../lang/python/application.mk"
+CONFIGURE_ENV+=	PYTHON_CONFIG=${PREFIX}/bin/python${PYVERSSUFFIX}-config
+CONFIGURE_ARGS+=	--enable-python
+PLIST.python=		yes
+PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
+.else
+CONFIGURE_ARGS+=	--disable-python
+.endif
+
+## C++ support is marked as experimental.
+#.if !empty(PKG_OPTIONS:Mc++)
+#CONFIGURE_ARGS+=	--enable-experimental
+#CONFIGURE_ARGS+=	--enable-cxx
+#.endif c
diff --git a/mailutils/patches/patch-lib_tcpwrap.c b/mailutils/patches/patch-lib_tcpwrap.c
new file mode 100644
index 0000000000..51f664ffb8
--- /dev/null
+++ b/mailutils/patches/patch-lib_tcpwrap.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Define '[allow|deny]_severity' on NetBSD.
+
+--- lib/tcpwrap.c.orig	2022-02-12 15:20:43.000000000 +0000
++++ lib/tcpwrap.c
+@@ -35,6 +35,12 @@ const char *mu_tcp_wrapper_daemon;
+ 
+ #ifdef WITH_LIBWRAP
+ # include <tcpd.h>
++# include <syslog.h>
++# if defined (__NetBSD__)
++#  include <syslog.h>
++   int allow_severity = LOG_INFO;
++   int deny_severity = LOG_WARNING;
++# endif
+ 
+ int
+ mu_tcpwrapper_access (int fd)
Home | Main Index | Thread Index | Old Index