Please either send directly to the maintainer, or at least CC the maintainer,
on ports changes.
On 2020/08/09 12:03, Olivier Taïbi wrote:
> diff -uNpr /usr/ports/mail/neomutt/Makefile
> /build/usr/ports/mail/neomutt/Makefile
Not sure what went wrong, but the emailed diff doesn't apply with patch(1).
> --- /usr/ports/mail/neomutt/Makefile Tue Jul 28 23:54:23 2020
> +++ /build/usr/ports/mail/neomutt/Makefile Fri Aug 7 23:46:50 2020
> @@ -26,7 +26,7 @@ BUILD_DEPENDS+= textproc/docbook-xsl \
> DEBUG_PACKAGES= ${BUILD_PACKAGES}
>
> SEPARATE_BUILD= Yes
> -FLAVORS= gpgme sasl
> +FLAVORS= gpgme sasl notmuch
> FLAVOR?=
>
> CONFIGURE_STYLE= simple
> @@ -63,6 +63,12 @@ WANTLIB+= assuan gpg-error gpgme sqlite3
> CONFIGURE_ARGS+= --sasl
> LIB_DEPENDS+= security/cyrus-sasl2
> WANTLIB+= sasl2
> +.endif
> +
> +.if ${FLAVOR:Mnotmuch}
> +CONFIGURE_ARGS+= --notmuch
> +LIB_DEPENDS+= mail/notmuch/notmuch,-main
> +WANTLIB+= notmuch
> .endif
>
> post-install:
> diff -uNpr /usr/ports/mail/neomutt/patches/patch-notmuch_private_h
> /build/usr/ports/mail/neomutt/patches/patch-notmuch_private_h
> --- /usr/ports/mail/neomutt/patches/patch-notmuch_private_h Thu Jan 1
> 01:00:00 1970
> +++ /build/usr/ports/mail/neomutt/patches/patch-notmuch_private_h Fri Aug
> 7 23:40:05 2020
> @@ -0,0 +1,20 @@
> +$OpenBSD$
> +
> +Index: notmuch/private.h
> +--- notmuch/private.h.orig
> ++++ notmuch/private.h
> +@@ -34,11 +34,7 @@
> + #endif
> +
> + /* The definition in <notmuch.h> is broken */
Funny because it looks like notmuch.h has the same
LIBNOTMUCH_CHECK_VERSION macro, just with different whitespace..
> +-#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro)
> \
> +- (LIBNOTMUCH_MAJOR_VERSION > (major) ||
> \
> +- (LIBNOTMUCH_MAJOR_VERSION == (major) && LIBNOTMUCH_MINOR_VERSION >
> (minor)) || \
> +- (LIBNOTMUCH_MAJOR_VERSION == (major) &&
> \
> +- LIBNOTMUCH_MINOR_VERSION == (minor) && LIBNOTMUCH_MICRO_VERSION >=
> (micro)))
> ++#define LIBNOTMUCH_CHECK_VERSION(major, minor, micro) (1>0)
This suggests that the way the so version was set in notmuch isn't
ideal, perhaps it would be better to do this instead so the check
should then work as expected?
Index: notmuch/Makefile
===================================================================
RCS file: /cvs/ports/mail/notmuch/notmuch/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- notmuch/Makefile 19 May 2020 20:45:49 -0000 1.2
+++ notmuch/Makefile 9 Aug 2020 22:03:09 -0000
@@ -6,6 +6,8 @@ COMMENT-emacs = Emacs bindings for notm
PKGNAME-main = notmuch-${V}
PKGNAME-emacs = notmuch-emacs-${V}
+REVISION-main = 0
+
SHARED_LIBS += notmuch 0.0
MULTI_PACKAGES = -main -emacs
@@ -68,7 +70,7 @@ post-extract:
# Avoid conflict with C++20 <version>, also see patches
pre-configure:
cd ${WRKSRC}; mv version version.txt; \
- ${SUBST_CMD} lib/notmuch.h
+ ${SUBST_CMD} configure
ln -s ${PREFIX}/bin/sphinx-build${MODPY_BIN_SUFFIX}
${WRKDIR}/bin/sphinx-build
post-install:
Index: notmuch/patches/patch-configure
===================================================================
RCS file: /cvs/ports/mail/notmuch/notmuch/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- notmuch/patches/patch-configure 16 May 2020 11:43:51 -0000 1.2
+++ notmuch/patches/patch-configure 9 Aug 2020 22:03:09 -0000
@@ -24,3 +24,25 @@ Index: configure
printf "Yes.\n"
have_zlib=1
zlib_cflags=$(pkg-config --cflags zlib)
+@@ -1076,18 +1076,18 @@ vpath %.rst \$(srcdir)
+ # the library interface, (such as the deletion of an API or a major
+ # semantic change that breaks formerly functioning code).
+ #
+-LIBNOTMUCH_VERSION_MAJOR = ${libnotmuch_version_major}
++LIBNOTMUCH_VERSION_MAJOR = ${LIBnotmuch_MAJOR}
+
+ # The minor version of the library interface. This should be incremented at
+ # the time of release for any additions to the library interface,
+ # (and when it is incremented, the release version of the library should
+ # be reset to 0).
+-LIBNOTMUCH_VERSION_MINOR = ${libnotmuch_version_minor}
++LIBNOTMUCH_VERSION_MINOR = ${LIBnotmuch_MINOR}
+
+ # The release version the library interface. This should be incremented at
+ # the time of release if there have been no changes to the interface, (but
+ # simply compatible changes to the implementation).
+-LIBNOTMUCH_VERSION_RELEASE = ${libnotmuch_version_release}
++LIBNOTMUCH_VERSION_RELEASE = 0
+
+ # These are derived from the VERSION macros in lib/notmuch.h so
+ # if you have to change them, something is wrong.
Index: notmuch/patches/patch-lib_notmuch_h
===================================================================
RCS file: notmuch/patches/patch-lib_notmuch_h
diff -N notmuch/patches/patch-lib_notmuch_h
--- notmuch/patches/patch-lib_notmuch_h 15 May 2020 08:58:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-lib_notmuch_h,v 1.1.1.1 2020/05/15 08:58:14 sthen Exp $
-
-Index: lib/notmuch.h
---- lib/notmuch.h.orig
-+++ lib/notmuch.h
-@@ -57,8 +57,8 @@ NOTMUCH_BEGIN_DECLS
- * The library version number. This must agree with the soname
- * version in Makefile.local.
- */
--#define LIBNOTMUCH_MAJOR_VERSION 5
--#define LIBNOTMUCH_MINOR_VERSION 2
-+#define LIBNOTMUCH_MAJOR_VERSION ${LIBnotmuch_MAJOR}
-+#define LIBNOTMUCH_MINOR_VERSION ${LIBnotmuch_MINOR}
- #define LIBNOTMUCH_MICRO_VERSION 0
-
-
> +
> + extern const int NmUrlProtocolLen;
> +
> diff -uNpr /usr/ports/mail/neomutt/pkg/PLIST
> /build/usr/ports/mail/neomutt/pkg/PLIST
> --- /usr/ports/mail/neomutt/pkg/PLIST Fri May 15 10:19:08 2020
> +++ /build/usr/ports/mail/neomutt/pkg/PLIST Sat Aug 8 22:34:35 2020
Any change that results in a different package or PLIST and
the REVISION must be bumped.
> @@ -88,8 +88,6 @@ 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/
> -share/locale/en_GB/LC_MESSAGES/
> share/locale/en_GB/LC_MESSAGES/neomutt.mo
> share/locale/eo/LC_MESSAGES/neomutt.mo
> share/locale/es/LC_MESSAGES/neomutt.mo
> @@ -104,8 +102,6 @@ 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/
> -share/locale/lt/LC_MESSAGES/
> share/locale/lt/LC_MESSAGES/neomutt.mo
> share/locale/nl/LC_MESSAGES/neomutt.mo
> share/locale/pl/LC_MESSAGES/neomutt.mo
>
