[pkgsrc/trunk]: pkgsrc/mail/ezmlm Stop trying to share logic with ezmlm-idx. ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mail/ezmlm Stop trying to share logic with ezmlm-idx. ...
From: schmonz <schmonz%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:34:07 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ad6a4357bbfc
branches:  trunk
changeset: 365787:ad6a4357bbfc
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Jul 26 02:02:23 2017 +0000

description:
Stop trying to share logic with ezmlm-idx. Comment patches.

diffstat:

 mail/ezmlm/Makefile                     |  12 ++++++++----
 mail/ezmlm/Makefile.common              |  17 -----------------
 mail/ezmlm/PLIST                        |  22 ++++++++++++++++++++++
 mail/ezmlm/PLIST.common                 |  22 ----------------------
 mail/ezmlm/distinfo                     |  18 +++++++++---------
 mail/ezmlm/patches/patch-MAN            |   4 +++-
 mail/ezmlm/patches/patch-Makefile       |  19 +++++++++++++++++++
 mail/ezmlm/patches/patch-aa             |  17 -----------------
 mail/ezmlm/patches/patch-ezmlm-manage.c |   5 ++++-
 mail/ezmlm/patches/patch-ezmlm-return.c |   5 ++++-
 mail/ezmlm/patches/patch-log.c          |   5 ++++-
 mail/ezmlm/patches/patch-log.h          |   5 ++++-
 mail/ezmlm/patches/patch-readwrite.h    |   5 ++++-
 mail/ezmlm/patches/patch-stralloc.h     |   5 ++++-
 14 files changed, 85 insertions(+), 76 deletions(-)

diffs (258 lines):

diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/Makefile
--- a/mail/ezmlm/Makefile       Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/Makefile       Wed Jul 26 02:02:23 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.25 2014/10/09 14:06:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2017/07/26 02:02:23 schmonz Exp $
 #
 
-.include "../../mail/ezmlm/Makefile.common"
-
-DISTNAME=              ${EZMLM_VERS}
+DISTNAME=              ezmlm-0.53
 PKGREVISION=           2
+CATEGORIES=            mail
+MASTER_SITES=          http://cr.yp.to/software/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://cr.yp.to/ezmlm.html
@@ -13,8 +13,12 @@
 
 CONFLICTS=             ezmlm-idx-[0-9]*
 
+DEPENDS+=              qmail>=1.03:../../mail/qmail
+
 DJB_RESTRICTED=                no
 DJB_CONFIG_CMDS=       ${ECHO} ${DESTDIR:Q} > conf-destdir
+DJB_BUILD_TARGETS=     install
+INSTALL_TARGET=                setup
 
 INSTALLATION_DIRS=     bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat5
 
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/Makefile.common
--- a/mail/ezmlm/Makefile.common        Wed Jul 26 02:01:58 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile.common,v 1.11 2012/03/12 21:52:07 joerg Exp $
-#
-# used by mail/ezmlm/Makefile
-# used by mail/ezmlm-idx/Makefile
-
-EZMLM_VERS=            ezmlm-0.53
-
-MASTER_SITES=          http://cr.yp.to/software/
-CATEGORIES=            mail
-DISTFILES=             ${DISTNAME}.tar.gz
-
-DEPENDS+=              qmail>=1.03:../../mail/qmail
-
-PLIST_SRC=             ../../mail/ezmlm/PLIST.common
-
-BUILD_TARGETS= install
-INSTALL_TARGET=                setup
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ezmlm/PLIST  Wed Jul 26 02:02:23 2017 +0000
@@ -0,0 +1,22 @@
+@comment $NetBSD: PLIST,v 1.3 2017/07/26 02:02:23 schmonz Exp $
+bin/ezmlm-list
+bin/ezmlm-make
+bin/ezmlm-manage
+bin/ezmlm-reject
+bin/ezmlm-return
+bin/ezmlm-send
+bin/ezmlm-sub
+bin/ezmlm-unsub
+bin/ezmlm-warn
+bin/ezmlm-weed
+man/man1/ezmlm-list.1
+man/man1/ezmlm-make.1
+man/man1/ezmlm-manage.1
+man/man1/ezmlm-reject.1
+man/man1/ezmlm-return.1
+man/man1/ezmlm-send.1
+man/man1/ezmlm-sub.1
+man/man1/ezmlm-unsub.1
+man/man1/ezmlm-warn.1
+man/man1/ezmlm-weed.1
+man/man5/ezmlm.5
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/PLIST.common
--- a/mail/ezmlm/PLIST.common   Wed Jul 26 02:01:58 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.2 2012/03/12 21:52:07 joerg Exp $
-bin/ezmlm-list
-bin/ezmlm-make
-bin/ezmlm-manage
-bin/ezmlm-reject
-bin/ezmlm-return
-bin/ezmlm-send
-bin/ezmlm-sub
-bin/ezmlm-unsub
-bin/ezmlm-warn
-bin/ezmlm-weed
-man/man1/ezmlm-list.1
-man/man1/ezmlm-make.1
-man/man1/ezmlm-manage.1
-man/man1/ezmlm-reject.1
-man/man1/ezmlm-return.1
-man/man1/ezmlm-send.1
-man/man1/ezmlm-sub.1
-man/man1/ezmlm-unsub.1
-man/man1/ezmlm-warn.1
-man/man1/ezmlm-weed.1
-man/man5/ezmlm.5
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/distinfo
--- a/mail/ezmlm/distinfo       Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/distinfo       Wed Jul 26 02:02:23 2017 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 23:27:05 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/07/26 02:02:23 schmonz Exp $
 
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b
 SHA512 (ezmlm-0.53.tar.gz) = 0dc1c64168428c531dbf78ca99582de4d4193d10bb38e87d3ee8f33f78083dc696bfd0681e3f2f690d7aa78b55b1b91c4ea6900c109406063445104826ff6d94
 Size (ezmlm-0.53.tar.gz) = 62693 bytes
-SHA1 (patch-MAN) = 4becf683f615bacf236abedee3ab6574bdcc0e10
-SHA1 (patch-aa) = c10560c71a137b138af325c6382e498ec466ec06
-SHA1 (patch-ezmlm-manage.c) = 8345b8849d16884bfd0d87df7bbc4c14762bd41d
-SHA1 (patch-ezmlm-return.c) = 3fd771df609ab0d8de59df6b656ad5d98d7315c3
-SHA1 (patch-log.c) = a402c27d45f8b534e4dabbe9c65ad16db3c9dea2
-SHA1 (patch-log.h) = a6deca4e422d2b2ef2c0ebb9e7e0ffa2e43709ca
-SHA1 (patch-readwrite.h) = 7038c0cf68f928700bb657fb856817af2171627b
-SHA1 (patch-stralloc.h) = 25285f91f2c39d244e62fb76c588d4db12fdc4c7
+SHA1 (patch-MAN) = df107f569c8d67b0a379c108153ea91ba97283e4
+SHA1 (patch-Makefile) = 7ad560d4005e737fb97166e89114a72eb65bbb82
+SHA1 (patch-ezmlm-manage.c) = 727d313baa5c38e784096fb9fb3354e53d0338d9
+SHA1 (patch-ezmlm-return.c) = a3af924b10cc61b703abe2b10f572292505325c3
+SHA1 (patch-log.c) = 1b155a4d3a36d23c2bdbc0b9ecd755f68b7ae9ca
+SHA1 (patch-log.h) = ef7f4795b7a6d14a8038c06300c738c76a3cdf4f
+SHA1 (patch-readwrite.h) = 5b64a802b1d4491ed9e64cde42fe04703b410d6e
+SHA1 (patch-stralloc.h) = ef799fa6f17bb1543f8d51f0ccc1e843a20d645b
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-MAN
--- a/mail/ezmlm/patches/patch-MAN      Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/patches/patch-MAN      Wed Jul 26 02:02:23 2017 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-MAN,v 1.1 2012/03/12 21:52:07 joerg Exp $
+$NetBSD: patch-MAN,v 1.2 2017/07/26 02:02:23 schmonz Exp $
+
+Don't install catpages.
 
 --- MAN.orig   1997-06-30 03:11:54.000000000 +0000
 +++ MAN
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/ezmlm/patches/patch-Makefile Wed Jul 26 02:02:23 2017 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile,v 1.1 2017/07/26 02:02:23 schmonz Exp $
+
+DESTDIR support, and don't install catpages.
+
+--- Makefile.orig      1997-06-30 03:11:54.000000000 +0000
++++ Makefile
+@@ -610,9 +610,9 @@ compile seek_set.c seek_set.c seek.h see
+       ./compile seek_set.c
+ 
+ setup: \
+-it man install conf-bin conf-man
+-      ./install "`head -1 conf-bin`" < BIN
+-      ./install "`head -1 conf-man`" < MAN
++it install conf-bin conf-man conf-destdir
++      ./install "`head -1 conf-destdir``head -1 conf-bin`" < BIN
++      ./install "`head -1 conf-destdir``head -1 conf-man`" < MAN
+ 
+ sgetopt.0: \
+ sgetopt.3
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-aa
--- a/mail/ezmlm/patches/patch-aa       Wed Jul 26 02:01:58 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/03/12 21:52:07 joerg Exp $
-
---- Makefile.orig      1997-06-30 03:11:54.000000000 +0000
-+++ Makefile
-@@ -610,9 +610,9 @@ compile seek_set.c seek_set.c seek.h see
-       ./compile seek_set.c
- 
- setup: \
--it man install conf-bin conf-man
--      ./install "`head -1 conf-bin`" < BIN
--      ./install "`head -1 conf-man`" < MAN
-+it install conf-bin conf-man conf-destdir
-+      ./install "`head -1 conf-destdir``head -1 conf-bin`" < BIN
-+      ./install "`head -1 conf-destdir``head -1 conf-man`" < MAN
- 
- sgetopt.0: \
- sgetopt.3
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-ezmlm-manage.c
--- a/mail/ezmlm/patches/patch-ezmlm-manage.c   Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/patches/patch-ezmlm-manage.c   Wed Jul 26 02:02:23 2017 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-ezmlm-manage.c,v 1.1 2013/02/26 11:26:03 joerg Exp $
+$NetBSD: patch-ezmlm-manage.c,v 1.2 2017/07/26 02:02:23 schmonz Exp $
+
+Add some prototypes, missing headers and redefine log() to not conflict
+with libm.
 
 --- ezmlm-manage.c.orig        2013-02-25 16:48:08.000000000 +0000
 +++ ezmlm-manage.c
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-ezmlm-return.c
--- a/mail/ezmlm/patches/patch-ezmlm-return.c   Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/patches/patch-ezmlm-return.c   Wed Jul 26 02:02:23 2017 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-ezmlm-return.c,v 1.1 2013/02/26 11:26:03 joerg Exp $
+$NetBSD: patch-ezmlm-return.c,v 1.2 2017/07/26 02:02:23 schmonz Exp $
+
+Add some prototypes, missing headers and redefine log() to not conflict
+with libm.
 
 --- ezmlm-return.c.orig        2013-02-25 16:48:52.000000000 +0000
 +++ ezmlm-return.c
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-log.c
--- a/mail/ezmlm/patches/patch-log.c    Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/patches/patch-log.c    Wed Jul 26 02:02:23 2017 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-log.c,v 1.1 2013/02/26 11:26:03 joerg Exp $
+$NetBSD: patch-log.c,v 1.2 2017/07/26 02:02:23 schmonz Exp $
+
+Add some prototypes, missing headers and redefine log() to not conflict
+with libm.
 
 --- log.c.orig 2013-02-25 16:47:16.000000000 +0000
 +++ log.c
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-log.h
--- a/mail/ezmlm/patches/patch-log.h    Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/patches/patch-log.h    Wed Jul 26 02:02:23 2017 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-log.h,v 1.1 2013/02/26 11:26:03 joerg Exp $
+$NetBSD: patch-log.h,v 1.2 2017/07/26 02:02:23 schmonz Exp $
+
+Add some prototypes, missing headers and redefine log() to not conflict
+with libm.
 
 --- log.h.orig 2013-02-25 16:47:13.000000000 +0000
 +++ log.h
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-readwrite.h
--- a/mail/ezmlm/patches/patch-readwrite.h      Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/patches/patch-readwrite.h      Wed Jul 26 02:02:23 2017 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-readwrite.h,v 1.1 2013/02/26 11:26:03 joerg Exp $
+$NetBSD: patch-readwrite.h,v 1.2 2017/07/26 02:02:23 schmonz Exp $
+
+Add some prototypes, missing headers and redefine log() to not conflict
+with libm.
 
 --- readwrite.h.orig   2013-02-25 16:49:34.000000000 +0000
 +++ readwrite.h
diff -r e84db41cec73 -r ad6a4357bbfc mail/ezmlm/patches/patch-stralloc.h
--- a/mail/ezmlm/patches/patch-stralloc.h       Wed Jul 26 02:01:58 2017 +0000
+++ b/mail/ezmlm/patches/patch-stralloc.h       Wed Jul 26 02:02:23 2017 +0000
@@ -1,4 +1,7 @@
-$NetBSD: patch-stralloc.h,v 1.1 2013/02/26 11:26:03 joerg Exp $
+$NetBSD: patch-stralloc.h,v 1.2 2017/07/26 02:02:23 schmonz Exp $
+
+Add some prototypes, missing headers and redefine log() to not conflict
+with libm.
 
 --- stralloc.h.orig    2013-02-25 16:49:07.000000000 +0000
 +++ stralloc.h
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc + p5-List-SomeUtils-XS-0.55, p5-Mojolicious-7.37, ...
Next by Date: [pkgsrc/trunk]: pkgsrc/sysutils Changes for 3.2.7:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc + p5-List-SomeUtils-XS-0.55, p5-Mojolicious-7.37, ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/sysutils Changes for 3.2.7:
Indexes:
Home | Main Index | Thread Index | Old Index