Indeed.
This builds and installs ok.
I fixed the HOMEPAGE which has the same typo :-)
Makefile.am patch was removed because ... Makefile.in
ok to commit ?
May 3, 2024 11:49 AM, "Stuart Henderson" <s...@spacehopper.org> wrote:
> On 2024/05/02 21:27, gil...@poolp.org wrote:
>
>> Hello,
>>
>> Hopefully I didn't completely mess up this port, I'm a bit rusty.
>>
>> This bumps mlmmj from 1.3.0 to 1.4.5.
>>
>> Tested on the opensmtpd mailing list this afternoon.
>>
>> Gilles
>>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/mail/mlmmj/Makefile,v
>> diff -u -p -r1.26 Makefile
>> --- Makefile 26 Sep 2023 12:28:13 -0000 1.26
>> +++ Makefile 2 May 2024 21:21:28 -0000
>> @@ -1,19 +1,27 @@
>> COMMENT= mailing list manager
>>
>> -DISTNAME= mlmmj-1.3.0
>> +V= 1.4.5
>> REVISION= 0
>
> drop REVISION for updates
>
>> +
>> +DISTNAME= mlmmj-${V}
>> +
>> CATEGORIES= mail
>>
>> -HOMEPAGE= http://mlmmj.org
>> +HOMEPAGE= htts://codeberg.org/mlmmj/mlmmj
>
> typo, htts -> https
>
>> # MIT
>> PERMIT_PACKAGE= Yes
>>
>> WANTLIB += c iconv
>>
>> -SITES= http://mlmmj.org/releases
>> +SITES=
>> https://codeberg.org/mlmmj/mlmmj/releases/download/RELEASE_${V:S/./_/g}
>> +
>> +BUILD_DEPENDS= devel/kyua-cli \
>> + devel/atf
>
> kyua-cli already depends on atf
>
>> LIB_DEPENDS= converters/libiconv
>> +
>> +AUTOCONF_VERSION= 2.69
>
> this isn't used with CONFIGURE_STYLE=gnu
>
> patch-include_mlmmj_h needs removing, PLIST needs an update too
> ("make update-plist"), and the patch filenames don't match what "make
> update-patches" gives you.
>
> Here's a version with those fixes. I don't run mlmmj but with this
> it should be ok.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/mlmmj/Makefile,v
> diff -u -p -r1.26 Makefile
> --- Makefile 26 Sep 2023 12:28:13 -0000 1.26
> +++ Makefile 3 May 2024 09:47:33 -0000
> @@ -1,17 +1,21 @@
> COMMENT= mailing list manager
>
> -DISTNAME= mlmmj-1.3.0
> -REVISION= 0
> +V= 1.4.5
> +
> +DISTNAME= mlmmj-${V}
> +
> CATEGORIES= mail
>
> -HOMEPAGE= http://mlmmj.org
> +HOMEPAGE= htts://codeberg.org/mlmmj/mlmmj
>
> # MIT
> PERMIT_PACKAGE= Yes
>
> WANTLIB += c iconv
>
> -SITES= http://mlmmj.org/releases
> +SITES=
> https://codeberg.org/mlmmj/mlmmj/releases/download/RELEASE_${V:S/./_/g}
> +
> +BUILD_DEPENDS= devel/kyua-cli
>
> LIB_DEPENDS= converters/libiconv
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/mlmmj/distinfo,v
> diff -u -p -r1.12 distinfo
> --- distinfo 28 Nov 2017 03:43:07 -0000 1.12
> +++ distinfo 3 May 2024 09:47:33 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (mlmmj-1.3.0.tar.gz) = dgnQ3YBPDAhMLkg+tYxgAStpi8dkZFN4UqHuH/nG8Ok=
> -SIZE (mlmmj-1.3.0.tar.gz) = 355298
> +SHA256 (mlmmj-1.4.5.tar.gz) = UluUL2mGZmdubon/3KbdvDBlSsNp3ux/z27RBVyH6Aw=
> +SIZE (mlmmj-1.4.5.tar.gz) = 465064
> Index: patches/patch-Makefile_am
> ===================================================================
> RCS file: patches/patch-Makefile_am
> diff -N patches/patch-Makefile_am
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Makefile_am 3 May 2024 09:47:33 -0000
> @@ -0,0 +1,12 @@
> +Index: Makefile.am
> +--- Makefile.am.orig
> ++++ Makefile.am
> +@@ -30,7 +30,7 @@ tests_mlmmj_SOURCES = \
> + tests/mlmmj_tests.c
> + tests_mlmmj_LDADD = \
> + $(top_builddir)/src/libmlmmj.a \
> +- @ATF_LIBS@ -lrt
> ++ @ATF_LIBS@
> +
> + tests_fakesmtpd_SOURCES = \
> + tests/fakesmtpd.c
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Makefile_in 3 May 2024 09:47:33 -0000
> @@ -0,0 +1,12 @@
> +Index: Makefile.in
> +--- Makefile.in.orig
> ++++ Makefile.in
> +@@ -420,7 +420,7 @@ SUBDIRS = src listtexts contrib
> +
> + @WANT_TESTS_TRUE@tests_mlmmj_LDADD = \
> + @WANT_TESTS_TRUE@ $(top_builddir)/src/libmlmmj.a \
> +-@WANT_TESTS_TRUE@ @ATF_LIBS@ -lrt
> ++@WANT_TESTS_TRUE@ @ATF_LIBS@
> +
> + @WANT_TESTS_TRUE@tests_fakesmtpd_SOURCES = \
> + @WANT_TESTS_TRUE@ tests/fakesmtpd.c
> Index: patches/patch-include_mlmmj_h
> ===================================================================
> RCS file: patches/patch-include_mlmmj_h
> diff -N patches/patch-include_mlmmj_h
> --- patches/patch-include_mlmmj_h 11 Mar 2022 19:34:42 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,24 +0,0 @@
> -Fix build with "-fno-common", from FreeBSD.
> -https://gitlab.com/mlmmj/mlmmj/-/merge_requests/2
> -
> -Index: include/mlmmj.h
> ---- include/mlmmj.h.orig
> -+++ include/mlmmj.h
> -@@ -81,7 +81,7 @@ enum subtype {
> - SUB_NONE /* For when an address is not subscribed at all */
> - };
> -
> --char *subtype_strs[7]; /* count matches enum above; defined in
> subscriberfuncs.c */
> -+extern char *subtype_strs[7]; /* count matches enum above; defined in
> subscriberfuncs.c */
> -
> - enum subreason {
> - SUB_REQUEST,
> -@@ -92,7 +92,7 @@ enum subreason {
> - SUB_SWITCH
> - };
> -
> --char * subreason_strs[6]; /* count matches enum above; defined in
> subscriberfuncs.c */
> -+extern char * subreason_strs[6]; /* count matches enum above; defined in
> subscriberfuncs.c */
> -
> - void print_version(const char *prg);
> -
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/mlmmj/pkg/PLIST,v
> diff -u -p -r1.11 PLIST
> --- pkg/PLIST 11 Mar 2022 19:34:42 -0000 1.11
> +++ pkg/PLIST 3 May 2024 09:47:33 -0000
> @@ -49,6 +49,7 @@ share/mlmmj/text.skel/ast/moderate-post
> share/mlmmj/text.skel/ast/notify
> share/mlmmj/text.skel/ast/probe
> share/mlmmj/text.skel/ast/prologue
> +share/mlmmj/text.skel/ast/subrelease
> share/mlmmj/text.skel/ast/wait-post
> share/mlmmj/text.skel/ast/wait-sub
> share/mlmmj/text.skel/cs/
> @@ -66,6 +67,7 @@ share/mlmmj/text.skel/cs/moderate-post
> share/mlmmj/text.skel/cs/notify
> share/mlmmj/text.skel/cs/probe
> share/mlmmj/text.skel/cs/prologue
> +share/mlmmj/text.skel/cs/subrelease
> share/mlmmj/text.skel/cs/wait-post
> share/mlmmj/text.skel/cs/wait-sub
> share/mlmmj/text.skel/de/
> @@ -83,6 +85,7 @@ share/mlmmj/text.skel/de/moderate-post
> share/mlmmj/text.skel/de/notify
> share/mlmmj/text.skel/de/probe
> share/mlmmj/text.skel/de/prologue
> +share/mlmmj/text.skel/de/subrelease
> share/mlmmj/text.skel/de/wait-post
> share/mlmmj/text.skel/de/wait-sub
> share/mlmmj/text.skel/en/
> @@ -100,6 +103,7 @@ share/mlmmj/text.skel/en/moderate-post
> share/mlmmj/text.skel/en/notify
> share/mlmmj/text.skel/en/probe
> share/mlmmj/text.skel/en/prologue
> +share/mlmmj/text.skel/en/subrelease
> share/mlmmj/text.skel/en/wait-post
> share/mlmmj/text.skel/en/wait-sub
> share/mlmmj/text.skel/fi/
> @@ -117,6 +121,7 @@ share/mlmmj/text.skel/fi/moderate-post
> share/mlmmj/text.skel/fi/notify
> share/mlmmj/text.skel/fi/probe
> share/mlmmj/text.skel/fi/prologue
> +share/mlmmj/text.skel/fi/subrelease
> share/mlmmj/text.skel/fi/wait-post
> share/mlmmj/text.skel/fi/wait-sub
> share/mlmmj/text.skel/fr/
> @@ -134,6 +139,7 @@ share/mlmmj/text.skel/fr/moderate-post
> share/mlmmj/text.skel/fr/notify
> share/mlmmj/text.skel/fr/probe
> share/mlmmj/text.skel/fr/prologue
> +share/mlmmj/text.skel/fr/subrelease
> share/mlmmj/text.skel/fr/wait-post
> share/mlmmj/text.skel/fr/wait-sub
> share/mlmmj/text.skel/gr/
> @@ -151,6 +157,7 @@ share/mlmmj/text.skel/gr/moderate-post
> share/mlmmj/text.skel/gr/notify
> share/mlmmj/text.skel/gr/probe
> share/mlmmj/text.skel/gr/prologue
> +share/mlmmj/text.skel/gr/subrelease
> share/mlmmj/text.skel/gr/wait-post
> share/mlmmj/text.skel/gr/wait-sub
> share/mlmmj/text.skel/it/
> @@ -168,6 +175,7 @@ share/mlmmj/text.skel/it/moderate-post
> share/mlmmj/text.skel/it/notify
> share/mlmmj/text.skel/it/probe
> share/mlmmj/text.skel/it/prologue
> +share/mlmmj/text.skel/it/subrelease
> share/mlmmj/text.skel/it/wait-post
> share/mlmmj/text.skel/it/wait-sub
> share/mlmmj/text.skel/pt/
> @@ -185,6 +193,7 @@ share/mlmmj/text.skel/pt/moderate-post
> share/mlmmj/text.skel/pt/notify
> share/mlmmj/text.skel/pt/probe
> share/mlmmj/text.skel/pt/prologue
> +share/mlmmj/text.skel/pt/subrelease
> share/mlmmj/text.skel/pt/wait-post
> share/mlmmj/text.skel/pt/wait-sub
> share/mlmmj/text.skel/sk/
> @@ -202,6 +211,7 @@ share/mlmmj/text.skel/sk/moderate-post
> share/mlmmj/text.skel/sk/notify
> share/mlmmj/text.skel/sk/probe
> share/mlmmj/text.skel/sk/prologue
> +share/mlmmj/text.skel/sk/subrelease
> share/mlmmj/text.skel/sk/wait-post
> share/mlmmj/text.skel/sk/wait-sub
> share/mlmmj/text.skel/zh-cn/
> @@ -219,5 +229,6 @@ share/mlmmj/text.skel/zh-cn/moderate-pos
> share/mlmmj/text.skel/zh-cn/notify
> share/mlmmj/text.skel/zh-cn/probe
> share/mlmmj/text.skel/zh-cn/prologue
> +share/mlmmj/text.skel/zh-cn/subrelease
> share/mlmmj/text.skel/zh-cn/wait-post
> share/mlmmj/text.skel/zh-cn/wait-sub
