Sat May 21 21:41:09 2022 UTC ()
elm-me: fix pkglint warnings


(rillig)
diff -r1.40 -r1.41 pkgsrc/mail/elm-me/Makefile
diff -r1.10 -r1.11 pkgsrc/mail/elm-me/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/mail/elm-me/patches/patch-aa
diff -r1.1.1.1 -r1.2 pkgsrc/mail/elm-me/patches/patch-ac
diff -r1.3 -r1.4 pkgsrc/mail/elm-me/patches/patch-ad

cvs diff -r1.40 -r1.41 pkgsrc/mail/elm-me/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/elm-me/Makefile 2021/05/24 19:52:39 1.40
+++ pkgsrc/mail/elm-me/Makefile 2022/05/21 21:41:09 1.41
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.40 2021/05/24 19:52:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.41 2022/05/21 21:41:09 rillig Exp $
2 2
3DISTNAME= elm-2.4ME+93 3DISTNAME= elm-2.4ME+93
4PKGNAME= elm-me-2.4.93 4PKGNAME= elm-me-2.4.93
5PKGREVISION= 7 5PKGREVISION= 7
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ 7MASTER_SITES= http://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.instinct.org/elm/ 10HOMEPAGE= http://www.instinct.org/elm/
11COMMENT= ELM Mail User Agent with ME extensions 11COMMENT= ELM Mail User Agent with ME extensions
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15CONFLICTS= elm-[0-9]* 15CONFLICTS= elm-[0-9]*
16 16
17WRKSRC= ${WRKDIR}/elm2.4.ME+.93 17WRKSRC= ${WRKDIR}/elm2.4.ME+.93
18HAS_CONFIGURE= YES 18HAS_CONFIGURE= YES
19CONFIGURE_ENV+= PREFIX=${PREFIX:Q} RUN_AS_BATCH=yes 19CONFIGURE_ENV+= PREFIX=${PREFIX:Q} RUN_AS_BATCH=yes
20CONFIG_SHELL= ksh 20CONFIG_SHELL= ksh
21CONFIGURE_SCRIPT= ./Configure 21CONFIGURE_SCRIPT= ./Configure
22CONFIGURE_ARGS+= -S 22CONFIGURE_ARGS+= -S
23 23
24INSTALL_DIRS= ${WRKSRC} nls 24INSTALL_DIRS= . nls
25INSTALLATION_DIRS= share/nls/C 25INSTALLATION_DIRS= share/nls/C
26 26
27CONF_FILES= ${PREFIX}/lib/elm.mimetypes-dist \ 27CONF_FILES= ${PREFIX}/lib/elm.mimetypes-dist \
28 ${PREFIX}/lib/elm.mimetypes 28 ${PREFIX}/lib/elm.mimetypes
29 29
30USE_TOOLS+= ksh 30USE_TOOLS+= ksh
31 31
32SUBST_CLASSES+= errno 32SUBST_CLASSES+= errno
33SUBST_STAGE.errno= pre-configure 33SUBST_STAGE.errno= pre-configure
34SUBST_MESSAGE.errno= Fixing declaration of errno. 34SUBST_MESSAGE.errno= Fixing declaration of errno.
35SUBST_FILES.errno= */*.c 35SUBST_FILES.errno= */*.c
36SUBST_SED.errno= -e 's,^extern int errno;,\#include <errno.h>,' 36SUBST_SED.errno= -e 's,^extern int errno;,\#include <errno.h>,'
37 37

cvs diff -r1.10 -r1.11 pkgsrc/mail/elm-me/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/elm-me/distinfo 2021/10/26 10:53:59 1.10
+++ pkgsrc/mail/elm-me/distinfo 2022/05/21 21:41:09 1.11
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.10 2021/10/26 10:53:59 nia Exp $ 1$NetBSD: distinfo,v 1.11 2022/05/21 21:41:09 rillig Exp $
2 2
3BLAKE2s (elm-2.4ME+93.tar.gz) = 8968bd2b8a9aa00ac64e1727652aa2d754ad6349c628ed2c1c965187c8937205 3BLAKE2s (elm-2.4ME+93.tar.gz) = 8968bd2b8a9aa00ac64e1727652aa2d754ad6349c628ed2c1c965187c8937205
4SHA512 (elm-2.4ME+93.tar.gz) = cc1e3c2d5e12baae4b43426e9b7239ef460a4bc0bbbb6279cda716454fcb5042f5143312ce144d9b5cf3ad8fd0c1282a637748a2d1be3f90eb3ed9458b63d7f2 4SHA512 (elm-2.4ME+93.tar.gz) = cc1e3c2d5e12baae4b43426e9b7239ef460a4bc0bbbb6279cda716454fcb5042f5143312ce144d9b5cf3ad8fd0c1282a637748a2d1be3f90eb3ed9458b63d7f2
5Size (elm-2.4ME+93.tar.gz) = 1569204 bytes 5Size (elm-2.4ME+93.tar.gz) = 1569204 bytes
6SHA1 (patch-aa) = 22f5b0219ada56c90cd26b47e9f5beac3af00c4a 6SHA1 (patch-aa) = 4c190411962ebaa990372b6ed179d27519c6db62
7SHA1 (patch-ab) = 6445b6573934c9497c15050917da6738e883c576 7SHA1 (patch-ab) = 6445b6573934c9497c15050917da6738e883c576
8SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59 8SHA1 (patch-ac) = 3c1def372731a5f7bf35e8ead7a77026f94c7c92
9SHA1 (patch-ad) = 73875671aa53548e1cbe1bfae56acb4792ee4b24 9SHA1 (patch-ad) = af7d4b4e34dc1b5e5de61c7a066b82949a633b79
10SHA1 (patch-ae) = d8b63984cf2bc367e311904f6d98e2b8790d3592 10SHA1 (patch-ae) = d8b63984cf2bc367e311904f6d98e2b8790d3592
11SHA1 (patch-bb) = d85e9625b327b766bcbea2d9063f76a7bc1ddd5d 11SHA1 (patch-bb) = d85e9625b327b766bcbea2d9063f76a7bc1ddd5d
12SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f 12SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f
13SHA1 (patch-ca) = 5a395f9f085999ea7b225cf5fc97c4b031218b08 13SHA1 (patch-ca) = 5a395f9f085999ea7b225cf5fc97c4b031218b08
14SHA1 (patch-cb) = ba7c02eb16746f04c2abf264dd73ed73bcdad8ba 14SHA1 (patch-cb) = ba7c02eb16746f04c2abf264dd73ed73bcdad8ba
15SHA1 (patch-cc) = 59cae75adfd90c2a14f6c55e83b36bc701cbed97 15SHA1 (patch-cc) = 59cae75adfd90c2a14f6c55e83b36bc701cbed97
16SHA1 (patch-cd) = f734efccc0f0c99637a3a527a920e6aa5543da48 16SHA1 (patch-cd) = f734efccc0f0c99637a3a527a920e6aa5543da48
17SHA1 (patch-ce) = 862968b558af3a30b2a523566f5e327d579e3f87 17SHA1 (patch-ce) = 862968b558af3a30b2a523566f5e327d579e3f87
18SHA1 (patch-cf) = 4a5c2a09d90358bde1697bb79e09944014a3da72 18SHA1 (patch-cf) = 4a5c2a09d90358bde1697bb79e09944014a3da72
19SHA1 (patch-cg) = 75e26fab55016ccbe6b1c248d7fd31150971f36d 19SHA1 (patch-cg) = 75e26fab55016ccbe6b1c248d7fd31150971f36d
20SHA1 (patch-src_date.c) = da93d6d562f8f78138df927162f696b4e0a2f936 20SHA1 (patch-src_date.c) = da93d6d562f8f78138df927162f696b4e0a2f936

cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/elm-me/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/mail/elm-me/patches/patch-aa 2001/07/18 19:59:14 1.1.1.1
+++ pkgsrc/mail/elm-me/patches/patch-aa 2022/05/21 21:41:09 1.2
@@ -1,17 +1,13 @@ @@ -1,17 +1,13 @@
1$NetBSD: patch-aa,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $ 1$NetBSD: patch-aa,v 1.2 2022/05/21 21:41:09 rillig Exp $
2 2
3*** nls/LANGS.old Sun Jun 28 04:32:25 1992 3--- nls/LANGS.orig 2001-06-19 17:03:18.000000000 +0000
4--- nls/LANGS Fri Jul 28 06:48:31 1995 4+++ nls/LANGS
5*************** 5@@ -1,5 +1,5 @@
6*** 1,5 **** 6 # LANGS file
7 # LANGS file 7
8  8-C/C/C /usr/local/nls/msg/C
9! C/C/C /usr/local/nls/msg/C 9-english/us/ascii /usr/local/nls/msg/english
10! english/us/ascii /usr/local/nls/msg/english 10-french/canada/8859 /usr/local/nls/msg/french
11! french/canada/8859 /usr/local/nls/msg/french 11+C/C/C __PREFIX/share/nls/C
12--- 1,5 ---- 12+english/us/ascii __PREFIX/share/nls/en_US.ISO_8859-1
13 # LANGS file 13+french/canada/8859 __PREFIX/share/nls/fr_FR.ISO_8859-1
14  
15! C/C/C __PREFIX/share/nls/C 
16! english/us/ascii __PREFIX/share/nls/en_US.ISO_8859-1 
17! french/canada/8859 __PREFIX/share/nls/fr_FR.ISO_8859-1 

cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/elm-me/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/elm-me/patches/patch-ac 2001/07/18 19:59:14 1.1.1.1
+++ pkgsrc/mail/elm-me/patches/patch-ac 2022/05/21 21:41:09 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $ 1$NetBSD: patch-ac,v 1.2 2022/05/21 21:41:09 rillig Exp $
2 2
3--- Configure.orig Sun Jun 4 17:21:26 2000 3--- Configure.orig Sun Jun 4 17:21:26 2000
4+++ Configure Sun Jun 4 17:22:17 2000 4+++ Configure Sun Jun 4 17:22:17 2000
5@@ -15,7 +15,7 @@ 5@@ -16,7 +16,7 @@
6 PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin" 6 PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
7 export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$) 7 export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)
8  8
9-if test ! -t 0; then 9-if test ! -t 0; then
10+if test "X$RUN_AS_BATCH" = "X" -a ! -t 0; then 10+if test "X$RUN_AS_BATCH" = "X" -a ! -t 0; then
11 echo "Say 'sh Configure', not 'sh <Configure'" 11 echo "Say 'sh Configure', not 'sh <Configure'"
12 exit 1 12 exit 1
13 fi 13 fi

cvs diff -r1.3 -r1.4 pkgsrc/mail/elm-me/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/mail/elm-me/patches/patch-ad 2008/01/05 19:21:00 1.3
+++ pkgsrc/mail/elm-me/patches/patch-ad 2022/05/21 21:41:09 1.4
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1$NetBSD: patch-ad,v 1.3 2008/01/05 19:21:00 rillig Exp $ 1$NetBSD: patch-ad,v 1.4 2022/05/21 21:41:09 rillig Exp $
2 2
3--- src/pgp.c.orig Tue Jun 19 19:03:47 2001 3--- src/pgp.c.orig Tue Jun 19 19:03:47 2001
4+++ src/pgp.c Wed Jul 18 19:22:05 2001 4+++ src/pgp.c Wed Jul 18 19:22:05 2001
5@@ -161,7 +159,7 @@ static int GetPGPKey (name, target, targ 5@@ -159,7 +159,7 @@ static int GetPGPKey (name, target, targ
6 char *path; 6 char *path;
7 case pgp2:  7 case pgp2:
8  8
9- execl(pgp2_path,  9- execl(pgp2_path,
10+ execlp(pgp2_path,  10+ execlp(pgp2_path,
11 pgp2_path,"+verbose=0", "+language=en", "-kv", c,  11 pgp2_path,"+verbose=0", "+language=en", "-kv", c,
12 (char *)0); 12 (char *)0);
13 tmp = errno; 13 tmp = errno;
14@@ -169,14 +167,14 @@ static int GetPGPKey (name, target, targ 14@@ -167,14 +167,14 @@ static int GetPGPKey (name, target, targ
15 break; 15 break;
16 case pgp5: 16 case pgp5:
17 path = elm_message(FRM("%s/pgpk"),pgp5_dir); 17 path = elm_message(FRM("%s/pgpk"),pgp5_dir);
18- execl(path, 18- execl(path,
19+ execlp(path, 19+ execlp(path,
20 path, "+verbose=0","+language=en",  20 path, "+verbose=0","+language=en",
21 "-l", c, (char *)0);  21 "-l", c, (char *)0);
22 tmp = errno; 22 tmp = errno;
23 perror(path); 23 perror(path);
24 break; 24 break;
25 case gpg: 25 case gpg:
26- execl(gpg_path,  26- execl(gpg_path,
27+ execlp(gpg_path,  27+ execlp(gpg_path,