CVS commit: pkgsrc/mail/elm-me

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat May 21 21:41:09 UTC 2022

Modified Files:
        pkgsrc/mail/elm-me: Makefile distinfo
        pkgsrc/mail/elm-me/patches: patch-aa patch-ac patch-ad

Log Message:
elm-me: fix pkglint warnings


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/mail/elm-me/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/elm-me/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/mail/elm-me/patches/patch-aa \
    pkgsrc/mail/elm-me/patches/patch-ac
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/elm-me/patches/patch-ad

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

Modified files:

Index: pkgsrc/mail/elm-me/Makefile
diff -u pkgsrc/mail/elm-me/Makefile:1.40 pkgsrc/mail/elm-me/Makefile:1.41
--- pkgsrc/mail/elm-me/Makefile:1.40    Mon May 24 19:52:39 2021
+++ pkgsrc/mail/elm-me/Makefile Sat May 21 21:41:09 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2021/05/24 19:52:39 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2022/05/21 21:41:09 rillig Exp $
 
 DISTNAME=              elm-2.4ME+93
 PKGNAME=               elm-me-2.4.93
@@ -21,7 +21,7 @@ CONFIG_SHELL=         ksh
 CONFIGURE_SCRIPT=      ./Configure
 CONFIGURE_ARGS+=       -S
 
-INSTALL_DIRS=          ${WRKSRC} nls
+INSTALL_DIRS=          . nls
 INSTALLATION_DIRS=     share/nls/C
 
 CONF_FILES=            ${PREFIX}/lib/elm.mimetypes-dist                \

Index: pkgsrc/mail/elm-me/distinfo
diff -u pkgsrc/mail/elm-me/distinfo:1.10 pkgsrc/mail/elm-me/distinfo:1.11
--- pkgsrc/mail/elm-me/distinfo:1.10    Tue Oct 26 10:53:59 2021
+++ pkgsrc/mail/elm-me/distinfo Sat May 21 21:41:09 2022
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:53:59 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/05/21 21:41:09 rillig Exp $
 
 BLAKE2s (elm-2.4ME+93.tar.gz) = 8968bd2b8a9aa00ac64e1727652aa2d754ad6349c628ed2c1c965187c8937205
 SHA512 (elm-2.4ME+93.tar.gz) = cc1e3c2d5e12baae4b43426e9b7239ef460a4bc0bbbb6279cda716454fcb5042f5143312ce144d9b5cf3ad8fd0c1282a637748a2d1be3f90eb3ed9458b63d7f2
 Size (elm-2.4ME+93.tar.gz) = 1569204 bytes
-SHA1 (patch-aa) = 22f5b0219ada56c90cd26b47e9f5beac3af00c4a
+SHA1 (patch-aa) = 4c190411962ebaa990372b6ed179d27519c6db62
 SHA1 (patch-ab) = 6445b6573934c9497c15050917da6738e883c576
-SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59
-SHA1 (patch-ad) = 73875671aa53548e1cbe1bfae56acb4792ee4b24
+SHA1 (patch-ac) = 3c1def372731a5f7bf35e8ead7a77026f94c7c92
+SHA1 (patch-ad) = af7d4b4e34dc1b5e5de61c7a066b82949a633b79
 SHA1 (patch-ae) = d8b63984cf2bc367e311904f6d98e2b8790d3592
 SHA1 (patch-bb) = d85e9625b327b766bcbea2d9063f76a7bc1ddd5d
 SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f

Index: pkgsrc/mail/elm-me/patches/patch-aa
diff -u pkgsrc/mail/elm-me/patches/patch-aa:1.1.1.1 pkgsrc/mail/elm-me/patches/patch-aa:1.2
--- pkgsrc/mail/elm-me/patches/patch-aa:1.1.1.1 Wed Jul 18 19:59:14 2001
+++ pkgsrc/mail/elm-me/patches/patch-aa Sat May 21 21:41:09 2022
@@ -1,17 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
+$NetBSD: patch-aa,v 1.2 2022/05/21 21:41:09 rillig Exp $
 
-*** nls/LANGS.old      Sun Jun 28 04:32:25 1992
---- nls/LANGS  Fri Jul 28 06:48:31 1995
-***************
-*** 1,5 ****
-  # LANGS file
-  
-! C/C/C                        /usr/local/nls/msg/C
-! english/us/ascii     /usr/local/nls/msg/english
-! french/canada/8859   /usr/local/nls/msg/french
---- 1,5 ----
-  # LANGS file
-  
-! C/C/C                   __PREFIX/share/nls/C
-! english/us/ascii        __PREFIX/share/nls/en_US.ISO_8859-1
-! french/canada/8859      __PREFIX/share/nls/fr_FR.ISO_8859-1
+--- nls/LANGS.orig     2001-06-19 17:03:18.000000000 +0000
++++ nls/LANGS
+@@ -1,5 +1,5 @@
+ # LANGS file
+ 
+-C/C/C                 /usr/local/nls/msg/C
+-english/us/ascii      /usr/local/nls/msg/english
+-french/canada/8859    /usr/local/nls/msg/french
++C/C/C                   __PREFIX/share/nls/C
++english/us/ascii        __PREFIX/share/nls/en_US.ISO_8859-1
++french/canada/8859      __PREFIX/share/nls/fr_FR.ISO_8859-1
Index: pkgsrc/mail/elm-me/patches/patch-ac
diff -u pkgsrc/mail/elm-me/patches/patch-ac:1.1.1.1 pkgsrc/mail/elm-me/patches/patch-ac:1.2
--- pkgsrc/mail/elm-me/patches/patch-ac:1.1.1.1 Wed Jul 18 19:59:14 2001
+++ pkgsrc/mail/elm-me/patches/patch-ac Sat May 21 21:41:09 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
+$NetBSD: patch-ac,v 1.2 2022/05/21 21:41:09 rillig Exp $
 
 --- Configure.orig     Sun Jun  4 17:21:26 2000
 +++ Configure  Sun Jun  4 17:22:17 2000
-@@ -15,7 +15,7 @@
+@@ -16,7 +16,7 @@
  PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
  export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
  

Index: pkgsrc/mail/elm-me/patches/patch-ad
diff -u pkgsrc/mail/elm-me/patches/patch-ad:1.3 pkgsrc/mail/elm-me/patches/patch-ad:1.4
--- pkgsrc/mail/elm-me/patches/patch-ad:1.3     Sat Jan  5 19:21:00 2008
+++ pkgsrc/mail/elm-me/patches/patch-ad Sat May 21 21:41:09 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2008/01/05 19:21:00 rillig Exp $
+$NetBSD: patch-ad,v 1.4 2022/05/21 21:41:09 rillig Exp $
 
 --- src/pgp.c.orig     Tue Jun 19 19:03:47 2001
 +++ src/pgp.c  Wed Jul 18 19:22:05 2001
-@@ -161,7 +159,7 @@ static int GetPGPKey (name, target, targ
+@@ -159,7 +159,7 @@ static int GetPGPKey (name, target, targ
                char *path;
            case pgp2:  
                
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.3 2008/01/05 19:21
                      pgp2_path,"+verbose=0", "+language=en", "-kv", c, 
                      (char *)0);
                tmp = errno;
-@@ -169,14 +167,14 @@ static int GetPGPKey (name, target, targ
+@@ -167,14 +167,14 @@ static int GetPGPKey (name, target, targ
                break;
            case pgp5:
                path = elm_message(FRM("%s/pgpk"),pgp5_dir);