pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

neomutt-git: add package building neomutt git repository



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Thu Sep 30 00:10:34 2021 +0200
Changeset:	fd4dd166c8d36f57e5c3bd7906adfa0890135ce3

Modified Files:
	Makefile
Added Files:
	neomutt-git/DESCR
	neomutt-git/Makefile
	neomutt-git/PLIST
	neomutt-git/distinfo
	neomutt-git/options.mk
	neomutt-git/patches/patch-resize.c

Log Message:
neomutt-git: add package building neomutt git repository

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

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

diffstat:
 Makefile                           |   4 +-
 neomutt-git/DESCR                  |   7 ++
 neomutt-git/Makefile               |  49 +++++++++++
 neomutt-git/PLIST                  | 109 ++++++++++++++++++++++++
 neomutt-git/distinfo               |   7 ++
 neomutt-git/options.mk             | 164 +++++++++++++++++++++++++++++++++++++
 neomutt-git/patches/patch-resize.c |  14 ++++
 7 files changed, 353 insertions(+), 1 deletion(-)

diffs:
diff --git a/Makefile b/Makefile
index 02b4652ad0..b94a687a15 100644
--- a/Makefile
+++ b/Makefile
@@ -1194,6 +1194,7 @@ SUBDIR+=	gnunet-fuse
 SUBDIR+=	gnunet-go
 SUBDIR+=	gnunet-gtk
 SUBDIR+=	gnupoc-makesis
+SUBDIR+=	gnurl
 SUBDIR+=	gnutls-guile
 SUBDIR+=	go-amqp
 SUBDIR+=	go-ansi
@@ -1989,7 +1990,6 @@ SUBDIR+=	lgogdownloader-git
 SUBDIR+=	lha
 SUBDIR+=	lhapdf
 SUBDIR+=	lhs2tex
-SUBDIR+=	libfixposix
 SUBDIR+=	libGenome
 SUBDIR+=	libLLVM
 SUBDIR+=	libLLVM38
@@ -2047,6 +2047,7 @@ SUBDIR+=	libevdev
 SUBDIR+=	libevhtp
 SUBDIR+=	libexact
 SUBDIR+=	libfirm-git
+SUBDIR+=	libfixposix
 SUBDIR+=	libfolks
 SUBDIR+=	libfplll
 SUBDIR+=	libftdi1
@@ -2528,6 +2529,7 @@ SUBDIR+=	necat
 SUBDIR+=	necpp-git
 SUBDIR+=	nehe-opengl-tutorials
 SUBDIR+=	nemo
+SUBDIR+=	neomutt-git
 SUBDIR+=	neovim
 SUBDIR+=	neovim-git
 SUBDIR+=	neovim-qt
diff --git a/neomutt-git/DESCR b/neomutt-git/DESCR
new file mode 100644
index 0000000000..922fc06f23
--- /dev/null
+++ b/neomutt-git/DESCR
@@ -0,0 +1,7 @@
+What is NeoMutt?
+
+* NeoMutt is a project of projects.
+* A place to gather all the patches against Mutt.
+* A place for all the developers to gather.
+
+Hopefully this will build the community and reduce duplicated effort.
diff --git a/neomutt-git/Makefile b/neomutt-git/Makefile
new file mode 100644
index 0000000000..61d9d43318
--- /dev/null
+++ b/neomutt-git/Makefile
@@ -0,0 +1,49 @@
+# $NetBSD: Makefile,v 1.67 2021/05/24 19:52:43 wiz Exp $
+
+DISTNAME=		neomutt-20201127
+CATEGORIES=		mail
+MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
+GITHUB_TAG=		${PKGVERSION_NOREV}
+GIT_REPO=		git://github.com/neomutt/neomutt.git
+
+MAINTAINER=		wiz%NetBSD.org@localhost
+HOMEPAGE=		https://www.neomutt.org/
+COMMENT=		Fork of mutt with integrated community patches
+LICENSE=		gnu-gpl-v2 OR gnu-gpl-v3 # or newer
+
+BUILD_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
+BUILD_DEPENDS+=		libxslt-[0-9]*:../../textproc/libxslt
+BUILD_DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+BUILD_DEPENDS+=		w3m-[0-9]*:../../www/w3m
+DEPENDS+=		mime-types-[0-9]*:../../misc/mime-types
+
+USE_TOOLS+=		msgfmt gmake perl:build
+
+HAS_CONFIGURE=		yes
+EXTRACT_USING=		bsdtar
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
+
+CONFIGURE_ARGS.SunOS+=	--disable-inotify
+
+EGDIR=			${PREFIX}/share/examples/neomutt
+CONF_FILES=		${EGDIR}/neomuttrc ${PKG_SYSCONFDIR}/neomuttrc
+INSTALLATION_DIRS+=	${EGDIR}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+# Force sendmail to /usr/sbin to avoid postfix's
+# ${LOCALBASE}/sbin/sendmail.  Should be enabled on all platforms which
+# support mailwrapper.
+CONFIGURE_ENV+=		SENDMAIL=/usr/sbin/sendmail
+.endif
+
+.include "options.mk"
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/neomutt-git/PLIST b/neomutt-git/PLIST
new file mode 100644
index 0000000000..a1ec280678
--- /dev/null
+++ b/neomutt-git/PLIST
@@ -0,0 +1,109 @@
+@comment $NetBSD$
+bin/neomutt
+libexec/neomutt/pgpewrap
+${PLIST.smime}libexec/neomutt/smime_keys
+man/man1/neomutt.1
+man/man1/pgpewrap_neomutt.1
+man/man1/smime_keys_neomutt.1
+man/man5/mbox_neomutt.5
+man/man5/mmdf_neomutt.5
+man/man5/neomuttrc.5
+share/doc/neomutt/AUTHORS.md
+share/doc/neomutt/CODE_OF_CONDUCT.md
+share/doc/neomutt/CONTRIBUTING.md
+share/doc/neomutt/ChangeLog.md
+share/doc/neomutt/INSTALL.md
+share/doc/neomutt/LICENSE.md
+share/doc/neomutt/README.md
+share/doc/neomutt/SECURITY.md
+share/doc/neomutt/advancedusage.html
+share/doc/neomutt/colorschemes/neonwolf-256.neomuttrc
+share/doc/neomutt/colorschemes/solarized-dark-256.neomuttrc
+share/doc/neomutt/colorschemes/vombatidae.neomuttrc
+share/doc/neomutt/colorschemes/zenburn.neomuttrc
+share/doc/neomutt/configuration.html
+share/doc/neomutt/gettingstarted.html
+share/doc/neomutt/hcache-bench/README.md
+share/doc/neomutt/hcache-bench/neomutt-hcache-bench.sh
+share/doc/neomutt/hcache-bench/neomuttrc
+share/doc/neomutt/index.html
+share/doc/neomutt/intro.html
+share/doc/neomutt/keybase/LICENSE
+share/doc/neomutt/keybase/README.md
+share/doc/neomutt/keybase/attachmentView.png
+share/doc/neomutt/keybase/decrypt.sh
+share/doc/neomutt/keybase/install.sh
+share/doc/neomutt/keybase/keybase.py
+share/doc/neomutt/keybase/neomuttrc
+share/doc/neomutt/keybase/pagerMode.png
+share/doc/neomutt/keybase/pgpdecrypt.sh
+share/doc/neomutt/keybase/pgpverify.sh
+share/doc/neomutt/keybase/verify.sh
+share/doc/neomutt/logo/neomutt-128.png
+share/doc/neomutt/logo/neomutt-256.png
+share/doc/neomutt/logo/neomutt-32.png
+share/doc/neomutt/logo/neomutt-64.png
+share/doc/neomutt/logo/neomutt.svg
+share/doc/neomutt/lua/test_lua-api_runner.neomuttrc
+share/doc/neomutt/lua/test_lua-api_spec.lua
+share/doc/neomutt/manual.html
+share/doc/neomutt/manual.txt
+share/doc/neomutt/mime.types
+share/doc/neomutt/mimesupport.html
+share/doc/neomutt/miscellany.html
+share/doc/neomutt/oauth2/mutt_oauth2.py
+share/doc/neomutt/oauth2/mutt_oauth2.py.README
+share/doc/neomutt/optionalfeatures.html
+share/doc/neomutt/reference.html
+share/doc/neomutt/samples/Mush.rc
+share/doc/neomutt/samples/Pine.rc
+share/doc/neomutt/samples/Tin.rc
+share/doc/neomutt/samples/colors.default
+share/doc/neomutt/samples/colors.linux
+share/doc/neomutt/samples/gpg.rc
+share/doc/neomutt/samples/mairix_filter.pl
+share/doc/neomutt/samples/sample.mailcap
+share/doc/neomutt/samples/sample.neomuttrc
+share/doc/neomutt/samples/sample.neomuttrc-starter
+share/doc/neomutt/samples/sample.neomuttrc-tlr
+share/doc/neomutt/samples/smime.rc
+share/doc/neomutt/samples/smime_keys_test.pl
+share/doc/neomutt/security.html
+share/doc/neomutt/smime-notes.txt
+share/doc/neomutt/tuning.html
+share/doc/neomutt/vim-keys/README.md
+share/doc/neomutt/vim-keys/vim-keys.rc
+share/examples/neomutt/neomuttrc
+share/locale/bg/LC_MESSAGES/neomutt.mo
+share/locale/ca/LC_MESSAGES/neomutt.mo
+share/locale/cs/LC_MESSAGES/neomutt.mo
+share/locale/da/LC_MESSAGES/neomutt.mo
+share/locale/de/LC_MESSAGES/neomutt.mo
+share/locale/el/LC_MESSAGES/neomutt.mo
+share/locale/en_GB/LC_MESSAGES/neomutt.mo
+share/locale/eo/LC_MESSAGES/neomutt.mo
+share/locale/es/LC_MESSAGES/neomutt.mo
+share/locale/et/LC_MESSAGES/neomutt.mo
+share/locale/eu/LC_MESSAGES/neomutt.mo
+share/locale/fi/LC_MESSAGES/neomutt.mo
+share/locale/fr/LC_MESSAGES/neomutt.mo
+share/locale/ga/LC_MESSAGES/neomutt.mo
+share/locale/gl/LC_MESSAGES/neomutt.mo
+share/locale/hu/LC_MESSAGES/neomutt.mo
+share/locale/id/LC_MESSAGES/neomutt.mo
+share/locale/it/LC_MESSAGES/neomutt.mo
+share/locale/ja/LC_MESSAGES/neomutt.mo
+share/locale/ko/LC_MESSAGES/neomutt.mo
+share/locale/lt/LC_MESSAGES/neomutt.mo
+share/locale/nb_NO/LC_MESSAGES/neomutt.mo
+share/locale/nl/LC_MESSAGES/neomutt.mo
+share/locale/pl/LC_MESSAGES/neomutt.mo
+share/locale/pt_BR/LC_MESSAGES/neomutt.mo
+share/locale/ru/LC_MESSAGES/neomutt.mo
+share/locale/sk/LC_MESSAGES/neomutt.mo
+share/locale/sr/LC_MESSAGES/neomutt.mo
+share/locale/sv/LC_MESSAGES/neomutt.mo
+share/locale/tr/LC_MESSAGES/neomutt.mo
+share/locale/uk/LC_MESSAGES/neomutt.mo
+share/locale/zh_CN/LC_MESSAGES/neomutt.mo
+share/locale/zh_TW/LC_MESSAGES/neomutt.mo
diff --git a/neomutt-git/distinfo b/neomutt-git/distinfo
new file mode 100644
index 0000000000..20a16e5d8f
--- /dev/null
+++ b/neomutt-git/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.49 2020/12/09 23:10:01 wiz Exp $
+
+SHA1 (neomutt-20201127-20201127.tar.gz) = 414126d5f0c4f4f4d2b530cdf0fca204b0bad45f
+RMD160 (neomutt-20201127-20201127.tar.gz) = 39775af74d2bac31b3f3d6b1197d6318711230b3
+SHA512 (neomutt-20201127-20201127.tar.gz) = 01e45aa00794cfb1c74a45a7f144962c8ab6dee03b0e5ce39a24d0c50817b909cac440a072c5d8b21ee7656c37b77bba4ba818de73710ccc3b0f76fd3ddd71cf
+Size (neomutt-20201127-20201127.tar.gz) = 3456248 bytes
+SHA1 (patch-resize.c) = b747f878459950462d56e01bada2d01b49fca088
diff --git a/neomutt-git/options.mk b/neomutt-git/options.mk
new file mode 100644
index 0000000000..2dc18892a1
--- /dev/null
+++ b/neomutt-git/options.mk
@@ -0,0 +1,164 @@
+# $NetBSD: options.mk,v 1.16 2020/06/22 06:08:35 wiz Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.neomutt
+PKG_OPTIONS_REQUIRED_GROUPS=	display
+PKG_OPTIONS_GROUP.display=	curses ncurses ncursesw slang
+PKG_SUPPORTED_OPTIONS=		debug gpgme gssapi idn ssl smime sasl
+PKG_SUPPORTED_OPTIONS+=		tokyocabinet notmuch lua
+PKG_SUGGESTED_OPTIONS=		gpgme gssapi idn ncursesw sasl smime ssl
+PKG_SUGGESTED_OPTIONS+=		tokyocabinet notmuch
+
+.include "../../mk/bsd.options.mk"
+
+###
+### GSSAPI
+###
+CONFIGURE_ENV+=		ac_cv_path_KRB5CFGPATH=${KRB5_CONFIG}
+.if !empty(PKG_OPTIONS:Mgssapi)
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gss=${KRB5BASE}
+.endif
+
+###
+### Slang
+###
+.if !empty(PKG_OPTIONS:Mslang)
+.  include "../../devel/libslang/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
+.endif
+
+###
+### ncurses
+###
+.if !empty(PKG_OPTIONS:Mncurses)
+USE_NCURSES=		yes
+.  include "../../devel/ncurses/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ncurses=${BUILDLINK_PREFIX.ncurses}
+.endif
+
+###
+### SASLv2
+###
+.if !empty(PKG_OPTIONS:Msasl)
+.  include "../../security/cyrus-sasl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
+.endif
+
+### curses
+###
+.if !empty(PKG_OPTIONS:Mcurses)
+.  include "../../mk/curses.buildlink3.mk"
+OPSYSVARS+=			BUILDLINK_PASSTHRU_DIRS
+BUILDLINK_PASSTHRU_DIRS.SunOS+=	/usr/xpg4
+CONFIGURE_ARGS.SunOS+=		--with-ncurses=/usr/xpg4
+LDFLAGS.SunOS+=			-L/usr/xpg4/lib${LIBABISUFFIX}
+LDFLAGS.SunOS+=			${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
+.endif
+
+###
+### ncursesw
+###
+.if !empty(PKG_OPTIONS:Mncursesw)
+.  include "../../devel/ncursesw/buildlink3.mk"
+.else
+SUBST_CLASSES+=		curse
+SUBST_MESSAGE.curse=	Fixing mutt to avoid ncursesw
+SUBST_STAGE.curse=	pre-configure
+SUBST_FILES.curse=	configure.ac
+SUBST_SED.curse=	-e 's,for lib in ncurses ncursesw,for lib in ncurses,'
+.endif
+
+###
+### SSL
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q}
+.else
+CONFIGURE_ARGS+=	--disable-ssl
+.endif
+
+###
+### S/MIME
+###
+PLIST_VARS+=		smime
+.if !empty(PKG_OPTIONS:Msmime)
+USE_TOOLS+=		perl:run
+REPLACE_PERL+=		*/*.pl contrib/smime_keys
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--smime
+PLIST.smime=		yes
+.else
+CONFIGURE_ARGS+=	--disable-smime
+.endif
+
+###
+### Header cache
+###
+.if !empty(PKG_OPTIONS:Mtokyocabinet)
+.include "../../databases/tokyocabinet/buildlink3.mk"
+CONFIGURE_ARGS+=	--tokyocabinet
+CONFIGURE_ARGS+=	--disable-gdbm
+CONFIGURE_ARGS+=	--disable-bdb
+.else
+BDB_ACCEPTED=		db4 db5
+BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
+.include "../../mk/bdb.buildlink3.mk"
+CONFIGURE_ARGS+=	--bdb
+CONFIGURE_ARGS+=	--disable-gdbm
+# BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
+# since the real -I and -L flags are added by buildlink already.
+CONFIGURE_ENV+=		BDB_INCLUDE_DIR=${BDBBASE}/include
+CONFIGURE_ENV+=		BDB_LIB_DIR=${BDBBASE}/lib
+CONFIGURE_ENV+=		BDB_LIB=${BDB_LIBS:S/^-l//:M*:Q}
+.endif
+
+###
+### Internationalized Domain Names
+###
+.if !empty(PKG_OPTIONS:Midn)
+.  include "../../devel/libidn/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-idn=${BUILDLINK_PREFIX.libidn}
+.else
+CONFIGURE_ARGS+=	--disable-idn
+.endif
+
+###
+### Enable debugging support
+###
+.if !empty(PKG_OPTIONS:Mdebug)
+CFLAGS+=	-g
+.endif
+
+###
+### gpgme support
+###
+.if !empty(PKG_OPTIONS:Mgpgme)
+.  include "../../security/gpgme/buildlink3.mk"
+CONFIGURE_ARGS+=	--gpgme
+CONFIGURE_ARGS+=	--with-gpgme=${BUILDLINK_PREFIX.gpgme}
+.else
+CONFIGURE_ARGS+=	--disable-gpgme
+.endif
+
+###
+### notmuch support
+###
+.if !empty(PKG_OPTIONS:Mnotmuch)
+.include "../../mail/notmuch/buildlink3.mk"
+CONFIGURE_ARGS+=	--notmuch
+.else
+CONFIGURE_ARGS+=	--disable-notmuch
+.endif
+
+###
+### lua support
+###
+.if !empty(PKG_OPTIONS:Mlua)
+.include "../../lang/lua/buildlink3.mk"
+.include "../../lang/lua/tool.mk"
+CONFIGURE_ARGS+=	--lua
+CONFIGURE_ARGS+=	--with-lua=${BUILDLINK_PREFIX.lua}
+.else
+CONFIGURE_ARGS+=	--disable-lua
+.endif
diff --git a/neomutt-git/patches/patch-resize.c b/neomutt-git/patches/patch-resize.c
new file mode 100644
index 0000000000..d91c432e35
--- /dev/null
+++ b/neomutt-git/patches/patch-resize.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-resize.c,v 1.3 2020/01/16 13:52:39 tm Exp $
+
+Required to have the correct struct information for winsize.
+
+--- resize.c.orig	2019-11-29 15:02:20.000000000 +0000
++++ resize.c
+@@ -43,6 +43,7 @@
+ #include <ioctl.h>
+ #endif
+ #endif
++#include <termios.h>
+ 
+ /**
+  * mutt_get_winsize - Use an ioctl to get the window size


Home | Main Index | Thread Index | Old Index